:twisted_rightwards_arrows: Merge branch 'master' into channel

src/components/AXDragSortTable/index.js

@@ -32,7 +32,7 @@ class AXDragSortTable extends PureComponent {
   handleRemove = (data, index) => {
     const tmpArray = [...data];
     tmpArray.splice(index, 1);
-    this.props.onChange(tmpArray);
+    this.props.onChange(tmpArray, data[index].id);
   };
 
   render() {

src/components/AXTableSelector/columnsMap.js

@@ -354,15 +354,20 @@ const clMap = {
       title: '标签名称',
       key: 1,
       dataIndex: 'name',
-      width: '40%',
+      width: '25%',
     }, {
-      title: '所属厂商',
+      title: '标签类型',
       key: 2,
+      dataIndex: 'typeCode',
+      width: '25%',
+    }, {
+      title: '所属厂商',
+      key: 3,
       dataIndex: 'merchantName',
-      width: '20%',
+      width: '25%',
     }, {
       title: '标签状态',
-      key: 3,
+      key: 4,
       dataIndex: 'status',
       render: text => renderStatus(text),
     }],

src/routes/Terminal/Auth/AuthList.js

@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import moment from 'moment';
 import { connect } from 'dva';
-import { Modal, Form, Card, Badge, DatePicker, message } from 'antd';
+import { Modal, Form, Card, Badge, Button, DatePicker, message } from 'antd';
 import { StandardTableList } from '../../../components/AXList';
 import Ellipsis from '../../../components/Ellipsis';
 import { addRowKey } from '../../../utils/utils';
@@ -121,7 +121,7 @@ export default class TerminalAuthListPage extends Component {
       title: '产品编号',
       key: 2,
       dataIndex: 'pcode',
-      width: '15%',
+      width: '12%',
       render: text => (
         <Ellipsis tooltip lines={1}>{text}</Ellipsis>
       ),
@@ -129,7 +129,7 @@ export default class TerminalAuthListPage extends Component {
       title: '产品名称',
       key: 3,
       dataIndex: 'pname',
-      width: '18%',
+      width: '13%',
       render: text => (
         <Ellipsis tooltip lines={1}>{text}</Ellipsis>
       ),
@@ -167,6 +167,14 @@ export default class TerminalAuthListPage extends Component {
       render: text => timestamp2Str(text),
       width: '15%',
       align: 'center',
+    }, {
+      title: '操作',
+      key: 7,
+      render: (_, record) => (
+        <Button onClick={() => this.handleEditAuthModalShow(record)} size="small" className="editBtn">修改权限</Button>
+      ),
+      width: '8%',
+      align: 'right',
     }];
     return (
       <Card>