kts-components-document-access-point 1.1.20 → 1.1.24

package/dist/index.esm.js

@@ -2739,7 +2739,7 @@ function modalcomfirm(props) {
             case 0:
               data = selectItems.map(function (item) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
-                  sendPartitionId: targetId,
+                  senderPartitionId: targetId,
                   privateList: [],
                   sendPublic: true
                 });
@@ -2797,7 +2797,7 @@ function modalcomfirm(props) {
     };
   }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Modal, {
-    title: "\u8BF7\u9009\u62E9",
+    title: "\u8BF7\u9009\u62E9\u6211\u53F8\u5BF9\u5E94DID",
     visible: true,
     onOk: handleOk,
     onCancel: handleCancel
@@ -2983,62 +2983,129 @@ var PageHeader = (function () {
     }())();
   }, [controller]);
   useEffect(function () {
-    var obj = {
-      type: "object",
-      properties: {
-        // configNumber: {
-        //     type: "string",
-        //     title: "配置编号",
-        // },
-        configName: {
-          type: "string",
-          title: "配置名称"
-        },
-        attributionList: {
-          type: "string",
-          title: "发送对象",
-          visible: type === 2 ? true : false
-        },
-        type: {
-          type: "string",
-          title: "单据大类",
-          enum: billEnum
-        },
-        profile: {
-          type: "string",
-          title: "单据子类",
-          enum: profileEnum,
-          visible: false
-        },
-        attribution: {
-          type: "string",
-          title: "单据类型",
-          enum: [{
-            "label": "发送方",
-            "value": '1'
-          }, {
-            "label": "接收方",
-            "value": '0'
-          }],
-          'x-props': {
-            mode: "multiple"
+    if (type === 1) {
+      var obj = {
+        type: "object",
+        properties: {
+          configName: {
+            type: "string",
+            title: "配置名称"
+          },
+          attributionList: {
+            type: "string",
+            title: "发送对象",
+            visible: false
+          },
+          type: {
+            type: "string",
+            title: "单据大类",
+            enum: billEnum
+          },
+          profile: {
+            type: "string",
+            title: "单据子类",
+            enum: profileEnum,
+            visible: false
+          },
+          attribution: {
+            type: "string",
+            title: "单据类型",
+            enum: [{
+              "label": "发送方",
+              "value": '1'
+            }, {
+              "label": "接收方",
+              "value": '0'
+            }],
+            'x-props': {
+              mode: "multiple"
+            }
+          },
+          '[beginCreateTime,endCreateTime]': {
+            key: "[beginCreateTime,endCreateTime",
+            name: "[beginCreateTime,endCreateTime",
+            type: "daterange",
+            title: "创建时间"
+          },
+          '[beginSendTime,endSendTime]': {
+            key: "[beginSendTime,endSendTime",
+            name: "[beginSendTime,endSendTime",
+            type: "daterange",
+            title: "更新时间"
           }
-        },
-        '[beginCreateTime,endCreateTime]': {
-          key: "[beginCreateTime,endCreateTime",
-          name: "[beginCreateTime,endCreateTime",
-          type: "daterange",
-          title: "创建时间"
-        },
-        '[beginSendTime,endSendTime]': {
-          key: "[beginSendTime,endSendTime",
-          name: "[beginSendTime,endSendTime",
-          type: "daterange",
-          title: "更新时间"
         }
-      }
-    };
-    setSchema(obj);
+      };
+      setSchema(obj);
+    } else if (type === 2) {
+      var _obj = {
+        type: "object",
+        properties: {
+          configName: {
+            type: "string",
+            title: "配置名称"
+          },
+          biaoshi: {
+            type: "string",
+            title: "标识"
+          },
+          attributionList: {
+            type: "string",
+            title: "发送对象",
+            visible: true
+          },
+          did: {
+            type: "string",
+            title: "我司对应DID"
+          },
+          duixiang: {
+            type: "string",
+            title: "接受对象"
+          },
+          duixianggongsi: {
+            type: "string",
+            title: "接受对象所属公司"
+          },
+          type: {
+            type: "string",
+            title: "单据大类",
+            enum: billEnum
+          },
+          profile: {
+            type: "string",
+            title: "单据子类",
+            enum: profileEnum,
+            visible: false
+          },
+          attribution: {
+            type: "string",
+            title: "单据类型",
+            enum: [{
+              "label": "发送方",
+              "value": '1'
+            }, {
+              "label": "接收方",
+              "value": '0'
+            }],
+            'x-props': {
+              mode: "multiple"
+            }
+          },
+          '[beginCreateTime,endCreateTime]': {
+            key: "[beginCreateTime,endCreateTime",
+            name: "[beginCreateTime,endCreateTime",
+            type: "daterange",
+            title: "创建时间"
+          },
+          '[beginSendTime,endSendTime]': {
+            key: "[beginSendTime,endSendTime",
+            name: "[beginSendTime,endSendTime",
+            type: "daterange",
+            title: "更新时间"
+          }
+        }
+      };
+      setSchema(_obj);
+    }
   }, [billEnum, type, profileEnum]);
   var onCreateType = useCallback(function (category, record) {
     history.push({
@@ -3062,7 +3129,7 @@ var PageHeader = (function () {
       value: 1
     }, "\u5355\u636E\u6821\u9A8C\u89C4\u5219\u914D\u7F6E"), /*#__PURE__*/React.createElement(Radio$1.Button, {
       value: 2
-    }, "\u53D1\u9001\u8BB0\u5F55"))), /*#__PURE__*/React.createElement(AdvancedSearch, {
+    }, "\u53D1\u5E03\u8BB0\u5F55"))), /*#__PURE__*/React.createElement(AdvancedSearch, {
       width: 480,
       height: 44,
       compact: true,
@@ -3076,16 +3143,15 @@ var PageHeader = (function () {
       labelAlign: 'left',
       compact: true,
       schema: schema,
-      defaultValue: _.pick(params, ['configNumber', 'configName', 'type', 'profile', 'attributionList', 'attribution', '[beginCreateTime,endCreateTime]', '[beginSendTime,endSendTime]']),
+      defaultValue: _.pick(params, ['configName', 'type', 'profile', 'attributionList', 'attribution', '[beginCreateTime,endCreateTime]', '[beginSendTime,endSendTime]']),
       effects: function effects($, actions) {
         $(LifeCycleTypes.ON_FIELD_VALUE_CHANGE, 'type').subscribe(function (fieldState) {
           if (fieldState.value) {
-            var value = fieldState.value;
             var target = billEnum.find(function (item) {
-              return item.value === value;
+              return item.value === fieldState.value;
             });
 
-            if (target.profileList) {
+            if (target && target.profileList) {
               actions.setFieldState('profile', function (state) {
                 state.visible = true;
               });
@@ -3111,7 +3177,7 @@ var PageHeader = (function () {
         });
       }
     })));
-  }, [type]);
+  }, [type, schema]);
   var menu = useMemo(function () {
     return /*#__PURE__*/React.createElement(Menu, null, billEnum && billEnum.map(function (item, key) {
       if (item.profileList) {
@@ -3150,7 +3216,7 @@ var PageHeader = (function () {
       style: {
         marginRight: 10
       }
-    }, "\u6279\u91CF\u53D1\u9001"), /*#__PURE__*/React.createElement(Dropdown, {
+    }, "\u6279\u91CF\u53D1\u5E03"), /*#__PURE__*/React.createElement(Dropdown, {
       key: "2",
       overlay: menu
     }, /*#__PURE__*/React.createElement(Button$1, {
@@ -3174,39 +3240,41 @@ var attributionEnum = {
 function validaterule(props) {
   var controller = DocumentsList.useController();
   var history = useHistory();
-  var selectedRowKey = controller.useMemo(function (s) {
-    return s.selectedRowKey;
-  }, []);
   var params = controller.useMemo(function (s) {
     return s.params;
   }, []);
 
   var _useState = useState({
     pageSize: 10,
-    pageNum: 1
+    pageNum: 1,
+    total: 0
   }),
       _useState2 = _slicedToArray(_useState, 2),
       pageMeta = _useState2[0],
-      setPage = _useState2[1];
+      setpageMeta = _useState2[1];
 
-  var visible = controller.useMemo(function (s) {
-    return s.visible;
-  }, []);
-
-  var _useState3 = useState([]),
+  var _useState3 = useState({
+    pageSize: 10,
+    pageNum: 1
+  }),
       _useState4 = _slicedToArray(_useState3, 2),
-      list = _useState4[0],
-      setList = _useState4[1];
+      pageParams = _useState4[0],
+      setpageParams = _useState4[1];
 
-  var _useState5 = useState({}),
+  var _useState5 = useState([]),
       _useState6 = _slicedToArray(_useState5, 2),
-      bill = _useState6[0],
-      setConfig = _useState6[1];
+      list = _useState6[0],
+      setList = _useState6[1];
 
-  var _useState7 = useState([]),
+  var _useState7 = useState({}),
       _useState8 = _slicedToArray(_useState7, 2),
-      billEnum = _useState8[0],
-      setBill = _useState8[1];
+      bill = _useState8[0],
+      setConfig = _useState8[1];
+
+  var _useState9 = useState([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      billEnum = _useState10[0],
+      setBill = _useState10[1];
 
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -3220,7 +3288,7 @@ function validaterule(props) {
               _context.next = 2;
               return (_DocumentsService$ins = DocumentsService.instance.service) === null || _DocumentsService$ins === void 0 ? void 0 : _DocumentsService$ins.call({
                 url: '/dap/schema/config/queryConfigSchemaPage',
-                data: _objectSpread2(_objectSpread2({}, params), pageMeta),
+                data: _objectSpread2(_objectSpread2({}, params), pageParams),
                 type: 'post'
               });
 
@@ -3237,7 +3305,7 @@ function validaterule(props) {
             case 5:
               if (res.res) {
                 setList(res.res.items);
-                setPage(res.res.pageMeta);
+                setpageMeta(res.res.pageMeta);
               }
 
             case 6:
@@ -3247,7 +3315,7 @@ function validaterule(props) {
         }
       }, _callee);
     }))();
-  }, [params]);
+  }, [params, pageParams]);
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var _DocumentsService$ins2;
@@ -3334,17 +3402,13 @@ function validaterule(props) {
   }, []);
 
   var onPageChange = function onPageChange(pageNum, pageSize) {
-    setPage({
+    setpageParams({
       pageNum: pageNum,
       pageSize: pageSize
     });
   };
 
-  var columns = [// {
-  //     title: '配置编号',
-  //     dataIndex: 'configNumber',
-  // },
-  {
+  var columns = [{
     title: '配置名称',
     dataIndex: 'configName'
   }, {
@@ -3399,12 +3463,12 @@ function validaterule(props) {
         onClick: function onClick() {
           onSendCheck(record);
         }
-      }, "\u53D1\u9001"), /*#__PURE__*/React.createElement("a", {
+      }, "\u53D1\u5E03"), record.publishStatus === 1 && /*#__PURE__*/React.createElement("a", {
         className: "tabel-action",
         onClick: function onClick() {
           onBillSendList(record);
         }
-      }, "\u53D1\u9001\u8BB0\u5F55"));
+      }, "\u53D1\u5E03\u8BB0\u5F55"));
     }
   }];
   var rowSelection = useMemo(function () {
@@ -3517,7 +3581,7 @@ function validaterule(props) {
       };
     }())();
   }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AutoTableContainer, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, null), /*#__PURE__*/React.createElement(AutoTableContainer, {
     style: {
       flex: 1,
       padding: '0 20px',
@@ -3620,17 +3684,25 @@ function validaterule$1(props) {
   }),
       _useState4 = _slicedToArray(_useState3, 2),
       pageMeta = _useState4[0],
-      setPage = _useState4[1];
+      setpageMeta = _useState4[1];
 
-  var _useState5 = useState([]),
+  var _useState5 = useState({
+    pageSize: 10,
+    pageNum: 1
+  }),
       _useState6 = _slicedToArray(_useState5, 2),
-      list = _useState6[0],
-      setList = _useState6[1];
+      pageParams = _useState6[0],
+      setpageParams = _useState6[1];
 
-  var _useState7 = useState({}),
+  var _useState7 = useState([]),
       _useState8 = _slicedToArray(_useState7, 2),
-      bill = _useState8[0],
-      setConfig = _useState8[1];
+      list = _useState8[0],
+      setList = _useState8[1];
+
+  var _useState9 = useState({}),
+      _useState10 = _slicedToArray(_useState9, 2),
+      bill = _useState10[0],
+      setConfig = _useState10[1];
 
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -3644,7 +3716,7 @@ function validaterule$1(props) {
               _context.next = 2;
               return (_DocumentsService$ins = DocumentsService.instance.service) === null || _DocumentsService$ins === void 0 ? void 0 : _DocumentsService$ins.call({
                 url: '/dap/schema/config/querySendRecordPage',
-                data: _objectSpread2(_objectSpread2({}, params), pageMeta),
+                data: _objectSpread2(_objectSpread2({}, params), pageParams),
                 type: 'post'
               });
 
@@ -3661,7 +3733,7 @@ function validaterule$1(props) {
             case 5:
               if (res.res) {
                 setList(res.res.items);
-                setPage(res.res.pageMeta);
+                setpageMeta(res.res.pageMeta);
               }
 
             case 6:
@@ -3671,7 +3743,7 @@ function validaterule$1(props) {
         }
       }, _callee);
     }))();
-  }, [params]);
+  }, [params, pageParams]);
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var _DocumentsService$ins2;
@@ -3732,54 +3804,20 @@ function validaterule$1(props) {
     });
   }, []);
   var onPageChange = useCallback(function (pageNum, pageSize) {
-    setPage({
+    setpageParams({
       pageNum: pageNum,
       pageSize: pageSize
-    }); // controller.pipeline(async s => {
-    //     s.params = { pageNum, pageSize }
-    // })()
-  }, []);
-  var onCompanyList = useCallback(function (record) {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-      var _DocumentsService$ins3;
-
-      var res;
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return (_DocumentsService$ins3 = DocumentsService.instance.service) === null || _DocumentsService$ins3 === void 0 ? void 0 : _DocumentsService$ins3.call({
-                url: '/dap/schema/config/showSendCompany',
-                data: {
-                  configNumber: record.configNumber
-                },
-                type: 'get'
-              });
-
-            case 2:
-              res = _context3.sent;
-
-              if (res.res) ;
-
-            case 4:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3);
-    }))();
+    });
   }, []);
   var columns = useMemo(function () {
-    return [// {
-    //     title: '配置编号',
-    //     dataIndex: 'configNumber',
-    // },
-    {
+    return [{
       title: '配置名称',
       dataIndex: 'configName'
     }, {
-      title: '单据大类',
+      title: '使用标识',
+      dataIndex: 'biaoshi'
+    }, {
+      title: '单据类型',
       dataIndex: 'type',
       render: function render(text) {
         return bill[text];
@@ -3799,11 +3837,29 @@ function validaterule$1(props) {
         }
       }
     }, {
-      title: '收发角色',
+      title: '我的收发角色',
       dataIndex: 'attribution',
       render: function render(text) {
         return attributionEnum[text];
       }
+    }, {
+      title: '我司对应DID',
+      dataIndex: 'did',
+      render: function render(text) {
+        return attributionEnum[text];
+      }
+    }, {
+      title: '接受对象',
+      dataIndex: 'object',
+      render: function render(text) {
+        return attributionEnum[text];
+      }
+    }, {
+      title: '接受对象所属公司',
+      dataIndex: 'objectCompany',
+      render: function render(text) {
+        return attributionEnum[text];
+      }
     }, // {
     //     title: '发送对象',
     //     dataIndex: 'sender',
@@ -3812,18 +3868,20 @@ function validaterule$1(props) {
     //     }
     // },
     {
-      title: '创建时间',
+      title: '发布时间',
       dataIndex: 'createAt',
       render: function render(text) {
         return moment(text).format('YYYY-MM-DD hh:mm');
       }
     }, {
-      title: '最近更新时间',
-      dataIndex: 'updateAt',
-      render: function render(text) {
-        return moment(text).format('YYYY-MM-DD hh:mm');
-      }
-    }, {
+      title: '详细内容',
+      dataIndex: 'neirong'
+    }, // {
+    //     title: '最近更新时间',
+    //     dataIndex: 'updateAt',
+    //     render: (text: any) => moment(text).format('YYYY-MM-DD hh:mm')
+    // },
+    {
       title: '操作',
       dataIndex: 'console',
       render: function render(text, record) {
@@ -3836,7 +3894,7 @@ function validaterule$1(props) {
       }
     }];
   }, [bill]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AutoTableContainer, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, null), /*#__PURE__*/React.createElement(AutoTableContainer, {
     style: {
       flex: 1,
       padding: '0 20px',
@@ -3844,7 +3902,7 @@ function validaterule$1(props) {
     }
   }, /*#__PURE__*/React.createElement(Table$1, {
     columns: columns,
-    rowKey: "configNumber",
+    rowKey: "id",
     dataSource: list,
     pagination: false
   })), pageMeta && /*#__PURE__*/React.createElement(Pagination, {
@@ -3911,7 +3969,7 @@ var Main$1 = function Main(props) {
       display: 'flex',
       flexDirection: 'column'
     }
-  }, /*#__PURE__*/React.createElement(PageHeader, null), type === 1 && /*#__PURE__*/React.createElement(validaterule, null), type === 2 && /*#__PURE__*/React.createElement(validaterule$1, null)));
+  }, type === 1 && /*#__PURE__*/React.createElement(validaterule, null), type === 2 && /*#__PURE__*/React.createElement(validaterule$1, null)));
 };
 
 var DocumentsService = /*#__PURE__*/function () {
@@ -4383,7 +4441,7 @@ function Rule(props) {
           switch (_context6.prev = _context6.next) {
             case 0:
               data = _objectSpread2(_objectSpread2({}, record), {}, {
-                sendPartitionId: targetId,
+                senderPartitionId: targetId,
                 privateList: [],
                 sendPublic: true
               });
@@ -4459,7 +4517,8 @@ function Rule(props) {
   })), /*#__PURE__*/React.createElement(Card, {
     style: {
       flex: 1,
-      height: '100%'
+      height: '100%',
+      overflow: 'auto'
     },
     bodyStyle: {
       display: 'flex',
@@ -4717,11 +4776,20 @@ var getWhitelist = /*#__PURE__*/(function () {
             return _context.abrupt("return", false);
 
           case 5:
-            if (res.res) {
-              s.whiteblacklist = res.res.items || []; // s.pageMeta = res.res.pageMeta;
+            if (!res.res) {
+              _context.next = 9;
+              break;
             }
 
-          case 6:
+            res.res.items = res.res.items.map(function (item, index) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                index: index
+              });
+            });
+            s.whiteblacklist = res.res.items || [];
+            return _context.abrupt("return", res);
+
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -4761,11 +4829,20 @@ var getBlacklist = /*#__PURE__*/(function () {
             return _context.abrupt("return", false);
 
           case 5:
-            if (res.res) {
-              s.blacklist = res.res.items || []; // s.pageMeta = res.res.pageMeta;
+            if (!res.res) {
+              _context.next = 9;
+              break;
             }
 
-          case 6:
+            res.res.items = res.res.items.map(function (item, index) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                index: index
+              });
+            });
+            s.blacklist = res.res.items || [];
+            return _context.abrupt("return", res);
+
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -5524,37 +5601,33 @@ function Rule$1(props) {
   var list = controller.useMemo(function (s) {
     return s.whiteblacklist;
   }, []);
-  var pageMeta = controller.useMemo(function (s) {
-    return s.pageMeta;
-  }, []);
+
+  var _useState = useState({
+    pageSize: 10,
+    pageNum: 1,
+    total: 0
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      pageMeta = _useState2[0],
+      setpageMeta = _useState2[1];
+
+  var _useState3 = useState({
+    pageSize: 10,
+    pageNum: 1
+  }),
+      _useState4 = _slicedToArray(_useState3, 2),
+      pageParams = _useState4[0],
+      setpageParams = _useState4[1];
+
   var whiteParams = controller.useMemo(function (s) {
     return s.whiteParams;
   }, []);
 
   var onPageChange = function onPageChange(pageNum, pageSize) {
-    controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                s.pageMeta = {
-                  pageNum: pageNum,
-                  pageSize: pageSize
-                };
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }())();
+    setpageParams({
+      pageNum: pageNum,
+      pageSize: pageSize
+    });
   };
 
   var columns = useMemo(function () {
@@ -5611,6 +5684,35 @@ function Rule$1(props) {
     }];
   }, []);
   var onEnablehander = useCallback(function (type, record) {
+    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var res, data;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return controller.enablewhitelist({
+                flag: type,
+                didList: [record]
+              });
+
+            case 2:
+              res = _context.sent;
+
+              if (res.res) {
+                data = _objectSpread2({}, pageParams);
+                setpageParams(data);
+              }
+
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }, []);
+  useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var res;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -5618,16 +5720,13 @@ function Rule$1(props) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return controller.enablewhitelist({
-                flag: type,
-                didList: [record]
-              });
+              return controller.getWhitelist(_objectSpread2(_objectSpread2({}, whiteParams), pageParams));
 
             case 2:
               res = _context2.sent;
 
               if (res.res) {
-                controller.getWhitelist(_objectSpread2(_objectSpread2({}, whiteParams), pageMeta));
+                setpageMeta(res.res.pageMeta);
               }
 
             case 4:
@@ -5637,10 +5736,7 @@ function Rule$1(props) {
         }
       }, _callee2);
     }))();
-  }, []);
-  useEffect(function () {
-    controller.getWhitelist(_objectSpread2(_objectSpread2({}, whiteParams), pageMeta));
-  }, [whiteParams, pageMeta]);
+  }, [whiteParams, pageParams]);
   var rowSelection = useMemo(function () {
     return {
       onChange: function onChange(selectedRowKeys, selectedRows) {
@@ -5660,7 +5756,7 @@ function Rule$1(props) {
             }, _callee3);
           }));
 
-          return function (_x2) {
+          return function (_x) {
             return _ref3.apply(this, arguments);
           };
         }())();
@@ -5676,7 +5772,7 @@ function Rule$1(props) {
   }, /*#__PURE__*/React.createElement(Table$1, {
     rowSelection: rowSelection,
     columns: columns,
-    rowKey: "customerDid",
+    rowKey: "index",
     dataSource: list,
     pagination: false
   })), pageMeta && /*#__PURE__*/React.createElement(Pagination, {
@@ -5949,37 +6045,34 @@ function Rule$2(props) {
   var list = controller.useMemo(function (s) {
     return s.blacklist;
   }, []);
-  var pageMeta = controller.useMemo(function (s) {
-    return s.pageMeta;
-  }, []);
+
+  var _useState = useState({
+    pageSize: 10,
+    pageNum: 1,
+    total: 0
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      pageMeta = _useState2[0],
+      setpageMeta = _useState2[1];
+
+  var _useState3 = useState({
+    pageSize: 10,
+    pageNum: 1
+  }),
+      _useState4 = _slicedToArray(_useState3, 2),
+      pageParams = _useState4[0],
+      setpageParams = _useState4[1]; // const pageMeta = controller.useMemo((s) => s.pageMeta, []);
+
+
   var params = controller.useMemo(function (s) {
     return s.params;
   }, []);
 
   var onPageChange = function onPageChange(pageNum, pageSize) {
-    controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                s.pageMeta = {
-                  pageNum: pageNum,
-                  pageSize: pageSize
-                };
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }())();
+    setpageParams({
+      pageNum: pageNum,
+      pageSize: pageSize
+    });
   };
 
   var columns = useMemo(function () {
@@ -6036,6 +6129,35 @@ function Rule$2(props) {
     }];
   }, []);
   var onEnablehander = useCallback(function (type, record) {
+    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var res, data;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return controller.enableblacklist({
+                flag: type,
+                didList: [record]
+              });
+
+            case 2:
+              res = _context.sent;
+
+              if (res.res) {
+                data = _objectSpread2({}, pageParams);
+                setpageParams(data);
+              }
+
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }, []);
+  useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var res;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -6043,16 +6165,13 @@ function Rule$2(props) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return controller.enableblacklist({
-                flag: type,
-                didList: [record]
-              });
+              return controller.getBlacklist(_objectSpread2(_objectSpread2({}, params), pageParams));
 
             case 2:
               res = _context2.sent;
 
               if (res.res) {
-                controller.getBlacklist(_objectSpread2(_objectSpread2({}, params), pageMeta));
+                setpageMeta(res.res.pageMeta);
               }
 
             case 4:
@@ -6062,10 +6181,7 @@ function Rule$2(props) {
         }
       }, _callee2);
     }))();
-  }, []);
-  useEffect(function () {
-    controller.getBlacklist(_objectSpread2(_objectSpread2({}, params), pageMeta));
-  }, [params, pageMeta]);
+  }, [params, pageParams]);
   var rowSelection = useMemo(function () {
     return {
       onChange: function onChange(selectedRowKeys, selectedRows) {
@@ -6085,7 +6201,7 @@ function Rule$2(props) {
             }, _callee3);
           }));
 
-          return function (_x2) {
+          return function (_x) {
             return _ref3.apply(this, arguments);
           };
         }())();
@@ -6101,7 +6217,7 @@ function Rule$2(props) {
   }, /*#__PURE__*/React.createElement(Table$1, {
     rowSelection: rowSelection,
     columns: columns,
-    rowKey: "customerDid",
+    rowKey: "index",
     dataSource: list,
     pagination: false
   })), pageMeta && /*#__PURE__*/React.createElement(Pagination, {
@@ -6260,6 +6376,12 @@ function Rule$4(props) {
   }));
 }
 
+/**
+ * 手动添加黑白名单弹窗
+ * @param
+ * @returns
+ */
+
 function modalcomfirm$1(props) {
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -6274,6 +6396,9 @@ function modalcomfirm$1(props) {
   var params = controller.useMemo(function (s) {
     return s.params;
   }, []);
+  var whiteParams = controller.useMemo(function (s) {
+    return s.whiteParams;
+  }, []);
   var pageMeta = controller.useMemo(function (s) {
     return s.pageMeta;
   }, []);
@@ -6337,11 +6462,12 @@ function modalcomfirm$1(props) {
     });
   }, [defaultValue]);
   var onFinish = useCallback(function (values) {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-      var res;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+      var res, _data, _data2;
+
+      return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               values = _objectSpread2(_objectSpread2({}, values), {}, {
                 type: listNature,
@@ -6349,31 +6475,71 @@ function modalcomfirm$1(props) {
               });
 
               if (!(listNature === '1')) {
-                _context2.next = 7;
+                _context4.next = 7;
                 break;
               }
 
-              _context2.next = 4;
+              _context4.next = 4;
               return controller.addWhite([values]);
 
             case 4:
-              res = _context2.sent;
-              _context2.next = 10;
+              res = _context4.sent;
+              _context4.next = 10;
               break;
 
             case 7:
-              _context2.next = 9;
+              _context4.next = 9;
               return controller.addBlack([values]);
 
             case 9:
-              res = _context2.sent;
+              res = _context4.sent;
 
             case 10:
               if (res.res) {
                 if (listNature === '1') {
-                  controller.getWhitelist(_objectSpread2(_objectSpread2({}, params), pageMeta));
+                  _data = _objectSpread2({}, whiteParams);
+                  controller.pipeline( /*#__PURE__*/function () {
+                    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
+                      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                        while (1) {
+                          switch (_context2.prev = _context2.next) {
+                            case 0:
+                              s.whiteParams = _data;
+
+                            case 1:
+                            case "end":
+                              return _context2.stop();
+                          }
+                        }
+                      }, _callee2);
+                    }));
+
+                    return function (_x2) {
+                      return _ref3.apply(this, arguments);
+                    };
+                  }())();
                 } else {
-                  controller.getBlacklist(_objectSpread2(_objectSpread2({}, params), pageMeta));
+                  _data2 = _objectSpread2({}, params);
+                  controller.pipeline( /*#__PURE__*/function () {
+                    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
+                      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+                        while (1) {
+                          switch (_context3.prev = _context3.next) {
+                            case 0:
+                              s.params = _data2;
+
+                            case 1:
+                            case "end":
+                              return _context3.stop();
+                          }
+                        }
+                      }, _callee3);
+                    }));
+
+                    return function (_x3) {
+                      return _ref4.apply(this, arguments);
+                    };
+                  }())();
                 }
               }
 
@@ -6381,10 +6547,10 @@ function modalcomfirm$1(props) {
 
             case 12:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
         }
-      }, _callee2);
+      }, _callee4);
     }))();
   }, [companyDidNote]);
   var didChange = useCallback(function (e) {