Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/components/ActionList/index.jsx

@@ -6,7 +6,7 @@ import './style.less';
 export default function withActions(actionsRender) {
   return function ActionList(text, record) {
     const actions = actionsRender(text, record);
-    const [Act1, Act2, Act3, ...leftActs] = actions || [];
+    const [Act1, Act2, Act3, ...leftActs] = (actions || []).filter(Boolean);
 
     const menus = (
       <Menu className="actlist-menu">

src/components/ActionList/style.less

@@ -1,8 +1,6 @@
 
 :global{
-  .action-list {
-    display: inline-block;
-  
+  .action-list {  
     span {
       display: inline-block;
       & + span {

src/components/EditIcon/index.jsx

@@ -85,9 +85,8 @@ const spriteInfo = [
 function noop() {}
 
 const EditIcon = ({ text, type, color, position, onClick }) => {
-
-    const icon = spriteInfo.filter(x => x.type === type)[0];
-    const color2 = color || icon.color;
+    const icon = spriteInfo.filter(x => x.type === type)[0] || {};
+    const color2 = color || icon.color || '#ff925c';
     const position2 = position || icon.pos;
 
     const wrappedStyle = useMemo(() => ({ color: `${color2}`, display: 'flex', alignItems: 'center', cursor: 'pointer' }), [color]);
@@ -96,7 +95,7 @@ const EditIcon = ({ text, type, color, position, onClick }) => {
     return (
         <span style={wrappedStyle} onClick={onClick || noop} >
             {text}
-            <span style={iconStyle}></span>
+            {type && <span style={iconStyle}></span>}
         </span>
     )
 };

src/pages/activity/drainage/DrainageList.jsx

@@ -1,16 +1,16 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio } from 'antd';
+import { Form, Input, Button, Select, message, Table, Pagination, Modal, DatePicker, Radio } from 'antd';
 import router from 'umi/router';
-import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import Prompt from 'umi/prompt';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
-import XForm, { FieldTypes } from '../../../components/XForm';
-import moment from 'moment';
 import AuthButton from '../../../components/AuthButton';
 import ImageUploader from '../../../components/XForm/ImageUpload';
 import BuildSelect from '../../../components/SelectButton/BuildSelect2'
-import Prompt from 'umi/prompt';
 
 const toEditList = (row) => () => {
   router.push({
@@ -220,39 +220,31 @@ const header = (props) => {
       title: '操作',
       key: 'action',
       align: 'center',
-      render: (text, datas) => (
-        <>
+      width: 300,
+      render: withActions((text, datas) => [
         <AuthButton name="admin.taDrainage.put" noRight={null}>
-          <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer'}} onClick={() => addshowModal(datas)}>
-            编辑
-          </span>
-        </AuthButton>
-          <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
-            <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
-              删除
-            </span>
-          </AuthButton >
+          <EditIcon type="edit" text="编辑" onClick={() => addshowModal(datas)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
+          <EditIcon type="delete" text="删除" onClick={deleteDrainage(datas.drainageId)} />
+        </AuthButton >,
+
           <AuthButton name="admin.taDrainage.publish" noRight={null}>
-          <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={exchangeDrainage(datas)}>
-            {datas.status === 1 ? '下架' : '上架'}
-          </span>
-          </AuthButton>
+            <EditIcon type={datas.status === 1 ? 'cancel' : 'publish'} text={datas.status === 1 ? '下架' : '上架'} onClick={exchangeDrainage(datas)} />
+          </AuthButton>,
+
           <AuthButton name="admin.taDrainage.data" noRight={null}>
-            <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer', marginLeft: 20  }} onClick={toEditList(datas)}>
-              数据
-            </span>
-          </AuthButton>
-          <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer', marginLeft: 20  }} onClick={toDataReacord(datas)}>
-              数据记录
-            </span>
+            <EditIcon color="#666" text="数据" onClick={toEditList(datas.drainageId)} />
+          </AuthButton>,
+
+          
+          <EditIcon color="#666" type="record" text="数据记录" onClick={toDataReacord(datas)} />,
+
           <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
-            <span>{datas.isMiniapp === false ? "" : <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={newQrcode.bind(this, datas)}>
-              下载二维码
-            </span>}</span>
-            
-          </AuthButton >
-        </>
-      ),
+            <EditIcon color="#666" text="下载二维码" onClick={newQrcode.bind(this, datas)} />
+          </AuthButton >,
+      ]),
     },
   ];
   const Forms = props => {

src/pages/activity/groupActivity/list.jsx

@@ -1,19 +1,19 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
+import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import Prompt from 'umi/prompt';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
-import AuthButton from '@/components/AuthButton';
-import Prompt from 'umi/prompt';
-import Navigate from '@/components/Navigate';
+import styles from '../../style/GoodsList.less';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = props => {
   const [data, setData] = useState({})
@@ -145,31 +145,32 @@ const header = props => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => (
-        <>
-          {row.activityStatus === 0 &&
-            <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
-          }
-          {
-            <AuthButton name="admin.taShareActivity.publish" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
-            </AuthButton>
-          }
-          {
-            <AuthButton name="admin.taShareActivity.tag" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-            </AuthButton>}{
-            <AuthButton name="admin.taShareActivity.top" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-            </AuthButton>}
-          {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.groupActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
-          {(row.activityStatus === 0 || row.activityStatus === 1) &&
+      width: 400,
+      render: withActions((x, row) => [
+        row.activityStatus === 0 ?
+          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
+            <EditIcon type="end" text="结束活动" onClick={endGroupActivity(row)} />
+          </AuthButton> : null,
+
+          <AuthButton name="admin.taShareActivity.publish" noRight={null}>
+            <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '取消发布' : '发布'} onClick={sendOrPublicDynamic.bind(this, row)} />
+          </AuthButton>,
+
+          <AuthButton name="admin.taShareActivity.tag" noRight={null}>
+            <EditIcon type={row.weight === 1 ? 'cancel' : 'add'} text={row.weight === 1 ? '取消标签' : '添加标签'} onClick={topGroupActivity(row, row.weight)} />
+          </AuthButton>,
+            
+          <AuthButton name="admin.taShareActivity.top" noRight={null}>
+            <EditIcon color={row.activityStatus === 0 ? '#666' : undefined} type={row.sort === 1 ? 'cancel' : 'add'} text={row.sort === 1 ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
+          </AuthButton>,
+
+          <EditIcon color="#666" type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,
+
+          (row.activityStatus === 0 || row.activityStatus === 1) ?
             <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
-              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-            </AuthButton>
-          }
-        </>
-      ),
+              <EditIcon color="#666" type="edit" text="编辑" onClick={toEditActivity(row.groupActivityId)} />
+            </AuthButton> : null,
+      ]),
     },
   ];
 

src/pages/activity/liveActivity/list/index.jsx

@@ -1,19 +1,19 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, notification } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
+import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, DatePicker, notification } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import Prompt from 'umi/prompt';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import styles from '../../../style/GoodsList.less';
 import SelectCity from '../../../../components/SelectButton/CitySelect'
 import BuildSelect from '../../../../components/SelectButton/BuildSelect'
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
-import AuthButton from '@/components/AuthButton';
-import Prompt from 'umi/prompt';
 // import SaleBatchListHelpDoc from '../edit/components/SalesBatchListHelpDoc';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -186,18 +186,15 @@ const header = props => {
     },
     {
       title: '操作',
-      dataIndex: '',
-      key: '',
       align: 'center',
-      render: (text, record) => (<>
-     
-        <a style={{ color: '#66B3FF' ,marginRight:20}} onClick={toDataReacord(record)} >数据记录</a>
+      width: 240,
+      render: withActions((text, record) => [     
+        <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />,
  
         <AuthButton name="admin.live.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={toAddLive(record)} >查看详情</a>
-        </AuthButton>
-        </>
-      ),
+          <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />,
+        </AuthButton>,
+      ]),
     },
   ];
   const getSignList = dynamicId => {

src/pages/building/type/index.jsx

@@ -2,14 +2,14 @@ import React, { useState, useEffect } from 'react';
 import { Button, Table, Pagination, Alert, Icon, Tag, notification, Modal } from 'antd'
 import router from 'umi/router';
 import moment from 'moment';
-import Styles from './style.less'
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import AuthButton from '@/components/AuthButton';
+
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
-import AuthButton from '@/components/AuthButton';
-import { debuglog } from 'util';
-import EditIcon from '@/components/EditIcon';
 
-function body() {
+export default function BuildType() {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([{ records: [] }])
 
@@ -36,24 +36,14 @@ function body() {
       title: '操作',
       dataIndex: 'row',
       key: 'row',
-      render: (_, record) => (
-        <span >
-          <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
-            <Button type="link" style={{
-              color: '#FF4A4A', right: '0',
-            }} onClick={() => deleteType(record)}>
-              <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon>
-            </Button>
-          </AuthButton>
-          <AuthButton name="admin.tdBuildingType.update" noRight={null}>
-            <Button type="link" style={{
-              color: '#FF4A4A', right: '0',
-            }} onClick={() => toEdi(record.buildingTypeId)}>
-              <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
-            </Button>
-          </AuthButton>
-        </span>
-      ),
+      render: withActions((_, record) => [
+        <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={() => deleteType(record)} />
+        </AuthButton>,
+        <AuthButton name="admin.tdBuildingType.update" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={() => toEdi(record.buildingTypeId)} />
+        </AuthButton>,
+      ]),
     },
   ];
 
@@ -133,5 +123,3 @@ function body() {
     </>
   )
 }
-
-export default body

src/pages/carouselFigure/advertisingList.jsx

@@ -1,15 +1,15 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request';
-import AuthButton from '@/components/AuthButton';
-import EditIcon from '@/components/EditIcon';
+import styles from '../style/GoodsList.less';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -96,21 +96,17 @@ const header = (props) => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => (
-        <>
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-            <AuthButton name="admin.advert.publish" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={changeStatus(row)}>{row.status === 1 ? <EditIcon text="下架" color='#FF4A4A' type="down"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}</span>
-            </AuthButton>
-            <AuthButton name="admin.advert.put" noRight={null}>
-              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}><EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></span>
-            </AuthButton>
-            <AuthButton name="admin.advert.delete" noRight={null}>
-              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></span>
-            </AuthButton>
-          </div>
-        </>
-      )
+      render: withActions((x, row) => [
+        <AuthButton name="admin.advert.publish" noRight={null}>
+          <EditIcon text={row.status === 1 ? '下架' : '上架'} type={row.status === 1 ? 'down' : 'up'}  onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.advert.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEdit(row.contentId)} />
+        </AuthButton>,
+        <AuthButton name="admin.advert.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)}/>
+        </AuthButton>,
+      ])
     },
   ];
 

src/pages/carouselFigure/carouselFigureList.jsx

@@ -1,15 +1,15 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request';
-import AuthButton from '@/components/AuthButton';
-import EditIcon from '@/components/EditIcon';
+import styles from '../style/GoodsList.less';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -96,21 +96,19 @@ const header = (props) => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => (
-        <>
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-            <AuthButton name="admin.extendContent.publish" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={changeStatus(row)}>{row.status === 1 ? <EditIcon text="下架" color='#FF4A4A' type="down"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}</span>
-            </AuthButton>
-            <AuthButton name="admin.extendContent.id.put" noRight={null}>
-              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}><EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></span>
-            </AuthButton>
-            <AuthButton name="admin.extendContent.delete" noRight={null}>
-              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></span>
-            </AuthButton>
-          </div>
-        </>
-      )
+      render: withActions((x, row) => [
+        <AuthButton name="admin.extendContent.publish" noRight={null}>
+          <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '下架' : '上架'} onClick={changeStatus(row)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.extendContent.id.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEditCarouse(row.contentId)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.extendContent.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
+        </AuthButton>,
+      ])
     },
   ];
 

src/pages/carouselFigure/customImg/list.jsx

@@ -1,15 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
+import { Form, Table } from 'antd';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
-import AuthButton from '@/components/AuthButton';
-import EditIcon from '@/components/EditIcon';
 
-const { Option } = Select;
 const { Column } = Table;
 
 function header(props) {
@@ -68,13 +65,12 @@ function header(props) {
         <Column title="操作"
           dataIndex="handle"
           key="handle"
-          render={(text, record) => (
+          render={withActions((text, record) => [
             <AuthButton name="admin.custom.put" noRight={null}>
-              <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId, record.imgType)}>
-                <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
-              </span>
-            </AuthButton>
-          )} />/>
+              <EditIcon text="编辑" type="edit" onClick={toEditCustom(record.imgId, record.imgType)}></EditIcon>
+            </AuthButton>,
+          ])}
+        />
       </Table>,
     </>
   )

src/pages/carouselFigure/propagandaList.jsx

@@ -1,15 +1,15 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
+import withActions from '@/components/ActionList';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request';
-import AuthButton from '@/components/AuthButton';
-import EditIcon from '@/components/EditIcon';
+import styles from '../style/GoodsList.less';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -96,21 +96,17 @@ const header = (props) => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => (
-        <>
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-            <AuthButton name="admin.propaganda.publish" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={changeStatus(row)}>{row.status === 1 ? <EditIcon text="下架" color='#FF4A4A' type="down"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}</span>
-            </AuthButton>
-            <AuthButton name="admin.propaganda.put" noRight={null}>
-              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}><EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></span>
-            </AuthButton>
-            <AuthButton name="admin.propaganda.delete" noRight={null}>
-              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></span>
-            </AuthButton>
-          </div>
-        </>
-      )
+      render: withActions((x, row) => [
+        <AuthButton name="admin.propaganda.publish" noRight={null}>
+          <EditIcon text={row.status === 1 ? '下架': '上架'} type={row.status === 1 ? 'down': 'up'} onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.propaganda.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEdit(row.contentId)} />
+        </AuthButton>,
+        <AuthButton name="admin.propaganda.delete" noRight={null}>
+          <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
+        </AuthButton>,
+      ])
     },
   ];
 

src/pages/channel/channelList.jsx

@@ -1,31 +1,13 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Pagination } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import channels from './channelList.less';
+import { Button, message, Table } from 'antd';
 import router from 'umi/router';
-import apis from '../../services/apis';
-import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import ChannelSelect from '@/components/SelectButton/channelSelect';
+import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
-
-const { Option } = Select;
-
-// const dataSource = [
-//   {
-//     key: '1',
-//     img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
-//     name: '123',
-//     age: 32,
-//     address: '西湖区湖底公园1号',
-//   },
-//   {
-//     key: '2',
-//     img: '',
-//     age: 42,
-//     address: '西湖区湖底公园1号',
-//   },
-// ];
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import channels from './channelList.less';
 
 const columns = [
   // {
@@ -79,13 +61,11 @@ const columns = [
     dataIndex: '',
     key: '',
     align: 'center',
-    render: (text, record) => (
+    render: withActions((text, record) => [
       <AuthButton name="admin.channel.id.put" noRight={null}>
-        <a style={{ display: 'flex', justifyContent: 'center' }} onClick={() => toedit(record.channelId)} >
-          <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
-        </a>
-      </AuthButton>
-    ),
+        <EditIcon text="编辑" type="edit" onClick={() => toedit(record.channelId)} />
+      </AuthButton>,
+    ]),
   },
 ];
 
@@ -122,7 +102,7 @@ function toBroker(record) {
   });
 }
 
-const header = props => {
+export default function ChannelList (props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ channelNmae: [], result: [] })
   const [channelNmae, setChannelNmae] = useState()
@@ -210,6 +190,3 @@ const header = props => {
     </>
   )
 }
-
-
-export default header

src/pages/integralMall/achieve.jsx

@@ -1,44 +1,41 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Tabs, Row, Col, Table, Pagination, Alert, message, Modal } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
+import { Form, Icon, Tabs, Table, Pagination, message, Modal } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import apis from '../../services/apis';
 import request from '../../utils/request';
-import AuthButton from '@/components/AuthButton';
+import styles from '../style/GoodsList.less';
 
 const { TabPane } = Tabs;
 
-
-
-
 function header(props) {
   const [ carType, setCarType ] = useState({})
   const callback = (key) => {
     setCarType(key)
     getList({ pageNum: 1, pageSize: 10 , type: key});
   }
-  
-// 获取初始化数据
-const [ data, setData ] = useState({})
-
-useEffect(() => {
-  getList({ pageNum: 1, pageSize: 10 , type: 'platform'});
-},[])
-
-// 查询列表
-const getList = (params) => {
-  request({ ...apis.integralMall.tdPointsRules, params: { ...params },}).then((data) => {
-      console.log(data)
-      setData(data)
-  })
-}
+    
+  // 获取初始化数据
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 , type: 'platform'});
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.integralMall.tdPointsRules, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
 
-const changePageNum = (pageNumber) => {
-  getList({ pageNum: pageNumber, pageSize: 10, type: carType })
-}
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, type: carType })
+  }
 
 
   // 提交事件
@@ -51,19 +48,19 @@ const changePageNum = (pageNumber) => {
     });
   }
 
-  const changeStatus = (row) => () => {
+  const changeStatus = row => () => {
     const title = row.status === 1 ? '停用后用户操作将不再发放积分，请确认相关免责声明等文案已修订说明?':'启用后用户操作将发放积分'
 
     Modal.confirm({
-      title: title,
+      title,
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.integralMall.change, data: { ...row },}).then((data) => {
+        request({ ...apis.integralMall.change, data: { ...row }}).then(data => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10, type: carType})
         })
-      }
+      },
     });
   }
 
@@ -114,24 +111,17 @@ const columns = [
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
-        <>
-          <AuthButton name="admin.tdPointsRules.change.put" noRight={null}>
-            <span style={{ color: '#EF273A', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>
-              {row.status == 1?'停用':'启用'}<Icon type="stop" className={styles.shoppingCart} />
-            </span>
-          </AuthButton>
-          <AuthButton name="admin.tdPointsRules.put" noRight={null}>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={updateRules(row)}>
-                编辑{<Icon type="form" className={styles.edit} />} 
-            </span>
-          </AuthButton>
-        </>
-      ),
+      render: withActions((x,row) => [
+        <AuthButton name="admin.tdPointsRules.change.put" noRight={null}>
+          <EditIcon type={row.status === 1 ? 'stop' : 'start'} text={row.status === 1 ? '停用' : '启用'} onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.tdPointsRules.put" noRight={null}>
+          <EditIcon type="edit" text="编辑" onClick={updateRules(row)} />
+        </AuthButton>,
+      ]),
     },
   ];
 
-  const { getFieldDecorator } = props.form
   return (
     <>
       <Tabs onChange={callback} type="card">

src/pages/news/type/NewsType.jsx

@@ -1,18 +1,15 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
+import { Form, Button, message, Table, Pagination, Modal } from 'antd';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect';
 import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
-import EditIcon from '@/components/EditIcon';
-
-const { Option } = Select;
-
+import BuildSelect from '../../../components/SelectButton/BuildSelect';
+import styles from '../../style/GoodsList.less';
 
-function header(props) {
+function NewsType(props) {
   // 获取初始化数据
   const [data, setData] = useState({})
 
@@ -65,7 +62,6 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-
         request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
@@ -103,24 +99,17 @@ function header(props) {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => (
-        <>
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-            <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
-              <span style={{ color: '#EF273A', marginRight: '20px', cursor: 'pointer' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
-                {row.status == 1 ? <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}
-              </span>
-            </AuthButton>
-            <AuthButton name="admin.taNewsType.id.put" noRight={null}>
-              <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditNews(row.newsTypeId)}>
-                <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
-              </span>
-            </AuthButton>
-          </div>
-        </>
-      ),
+      render: withActions((x, row) => [
+        <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
+          <EditIcon text={row.status === 1 ? '删除' : '上架'} type={row.status === 1 ? 'delete' : 'up'} onClick={changeNewsStatus(row, row.newsTypeId)} />
+        </AuthButton>,
+        <AuthButton name="admin.taNewsType.id.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEditNews(row.newsTypeId)} />
+        </AuthButton>,
+      ]),
     },
   ];
+  
   function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10 })
@@ -157,6 +146,7 @@ function header(props) {
     </>
   )
 }
-const WrappedHeader = Form.create({ name: 'header' })(header);
+
+const WrappedHeader = Form.create({ name: 'header' })(NewsType);
 
 export default WrappedHeader

src/pages/staff/list/RoleList.jsx

@@ -1,15 +1,14 @@
 
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
+import { Button, message, Table, Modal } from 'antd';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import router from 'umi/router';
-import { Card, Avatar } from 'antd';
 import request from '../../../utils/request'
 import Styles from './style.less';
 import apis from '../../../services/apis';
 import AuthButton from '../../../components/AuthButton';
-import EditIcon from '@/components/EditIcon';
+import styles from '../../style/GoodsList.less';
 
 const header = props => {
   // function confirm(id) {
@@ -117,25 +116,19 @@ const header = props => {
       key: 'status',
       align: 'center',
 
-      render: (text, record) => <>
-        {record.isAdmin ? "" :
-          <>
-            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-              <AuthButton name="admin.role.publish" noRight={null}>
-                <span style={{ marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{record.status === 1 ? <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon> : ''}
-                </span>
-              </AuthButton>
-              <AuthButton name="admin.role.put" noRight={null}>
-                <span style={{ cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >
-                  <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
-                </span>
-              </AuthButton>
-            </div>
-          </>
-        }
-
-      </>,
-
+      render: withActions((text, record) => {
+        return record.isAdmin ? [] :
+          [
+            record.status === 1 ?
+            <AuthButton name="admin.role.publish" noRight={null}>
+              <EditIcon type="delete" text="删除" onClick={() => stop(record.roleId, record.status)} />
+            </AuthButton> : null,
+
+            <AuthButton name="admin.role.put" noRight={null}>
+              <EditIcon text="编辑" type="edit" onClick={() => toEditRole(record.roleId)} />
+            </AuthButton>,
+          ]
+      }),
     },
   ];