kts-components-document-access-point 1.2.8 → 1.2.9

package/dist/index.js

@@ -14,7 +14,6 @@ var antd = require('@formily/antd');
 var reactRouterDom = require('react-router-dom');
 var zhCN = require('kts-components-antd-x4/lib/locale/zh_CN');
 var qs = require('query-string');
-var antd$1 = require('antd');
 var _ = require('lodash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -2976,8 +2975,14 @@ var PageHeader = (function () {
               case 0:
                 s.type = e.target.value;
                 s.params = {};
+                history.push({
+                  pathname: '/rulelist',
+                  state: {
+                    type: e.target.value
+                  }
+                });
 
-              case 2:
+              case 3:
               case "end":
                 return _context3.stop();
             }
@@ -4029,20 +4034,20 @@ var Main$1 = function Main(props) {
     return s.type;
   }, []);
   React.useEffect(function () {
-    var params = props.location.query && props.location.query.type;
-    console.log(props);
+    var params = props.location.state;
+    var tab = params && params.type;
+    console.log(tab);
 
-    if (params) {
+    if (tab) {
       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.type = Number(params);
-                  console.log(params);
+                  s.type = Number(tab);
 
-                case 2:
+                case 1:
                 case "end":
                   return _context.stop();
               }
@@ -5034,10 +5039,17 @@ function Rule(props) {
     if (type === 'record') {
       history.push({
         pathname: "/rulelist",
-        search: "?type=2"
+        state: {
+          type: 2
+        }
       });
     } else {
-      history.goBack();
+      history.push({
+        pathname: "/rulelist",
+        state: {
+          type: 1
+        }
+      });
     }
   }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -5861,11 +5873,15 @@ var didList = /*#__PURE__*/(function () {
             return _context.abrupt("return", false);
 
           case 5:
-            if (res.res) {
-              s.didlist = res.res;
+            if (!res.res) {
+              _context.next = 8;
+              break;
             }
 
-          case 6:
+            s.didlist = res.res;
+            return _context.abrupt("return", res);
+
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -5969,7 +5985,50 @@ var Header = (function () {
     controller.checkclient();
   }, []);
   React.useEffect(function () {
-    controller.didList({});
+    // console.log(controller);
+    // controller.pipeline(controller.didList)({})
+    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+      var res;
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return controller.didList({});
+
+            case 2:
+              res = _context3.sent;
+
+              if (!res.err) {
+                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.didlist = res.res;
+
+                          case 1:
+                          case "end":
+                            return _context2.stop();
+                        }
+                      }
+                    }, _callee2);
+                  }));
+
+                  return function (_x2) {
+                    return _ref3.apply(this, arguments);
+                  };
+                }())();
+              }
+
+            case 4:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }))();
   }, []);
   React.useEffect(function () {
     var didEnum = didlist.map(function (item) {
@@ -6022,20 +6081,20 @@ var Header = (function () {
     setSchema(obj);
   }, [didlist]);
   var batchBlockList = React.useCallback(function (type) {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
       var res;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              _context2.next = 2;
+              _context4.next = 2;
               return controller.enablewhitelist({
                 flag: type,
                 didList: selectedRowKey
               });
 
             case 2:
-              res = _context2.sent;
+              res = _context4.sent;
 
               if (res.res) {
                 controller.getWhitelist(_objectSpread2(_objectSpread2({}, whiteParams), pageMeta));
@@ -6043,55 +6102,55 @@ var Header = (function () {
 
             case 4:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
         }
-      }, _callee2);
+      }, _callee4);
     }))();
   }, [selectedRowKey]);
   var createWhiteList = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
-        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(s) {
+        return regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 s.visible = true;
                 s.listNature = '1';
 
               case 2:
               case "end":
-                return _context3.stop();
+                return _context5.stop();
             }
           }
-        }, _callee3);
+        }, _callee5);
       }));
 
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
       };
     }())();
   }, []);
   var showClientModal = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(s) {
-        return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(s) {
+        return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 s.clientModal = true;
                 s.listNature = '1';
 
               case 2:
               case "end":
-                return _context4.stop();
+                return _context6.stop();
             }
           }
-        }, _callee4);
+        }, _callee6);
       }));
 
-      return function (_x3) {
-        return _ref4.apply(this, arguments);
+      return function (_x4) {
+        return _ref6.apply(this, arguments);
       };
     }())();
   }, []);
@@ -6190,13 +6249,22 @@ function Rule$1(props) {
   var columns = React.useMemo(function () {
     return [{
       title: 'DID',
-      dataIndex: 'customerDid'
+      dataIndex: 'customerDid',
+      render: function render(text, record) {
+        if (text) {
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, record.customerDidNote), text);
+        } else {
+          return '';
+        }
+      }
     }, {
       title: '所属公司',
-      dataIndex: 'customerName'
+      dataIndex: 'customerName',
+      width: 200
     }, {
       title: '数据状态',
       dataIndex: 'dataStatus',
+      width: 100,
       render: function render(text) {
         return dataStatusEnum[text];
       }
@@ -6205,7 +6273,7 @@ function Rule$1(props) {
       dataIndex: 'companyDid',
       render: function render(text, record) {
         if (text) {
-          return /*#__PURE__*/React__default['default'].createElement("span", null, record.customerDidNote, ":", text);
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, record.companyDidNote), text);
         } else {
           return '';
         }
@@ -6213,18 +6281,21 @@ function Rule$1(props) {
     }, {
       title: '加入时间',
       dataIndex: 'createTime',
+      width: 200,
       render: function render(text) {
         return moment__default['default'](text).format('YYYY-MM-DD HH:mm');
       }
     }, {
       title: '最近更新时间',
       dataIndex: 'updateTime',
+      width: 200,
       render: function render(text) {
         return moment__default['default'](text).format('YYYY-MM-DD HH:mm');
       }
     }, {
       title: '操作',
       dataIndex: 'console',
+      width: 80,
       render: function render(text, record) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, record.dataStatus === 1 ? /*#__PURE__*/React__default['default'].createElement("a", {
           className: "tabel-action",
@@ -6622,13 +6693,22 @@ function Rule$2(props) {
   var columns = React.useMemo(function () {
     return [{
       title: 'DID',
-      dataIndex: 'customerDid'
+      dataIndex: 'customerDid',
+      render: function render(text, record) {
+        if (text) {
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, record.customerDidNote), text);
+        } else {
+          return '';
+        }
+      }
     }, {
       title: '所属公司',
+      width: 200,
       dataIndex: 'customerName'
     }, {
       title: '数据状态',
       dataIndex: 'dataStatus',
+      width: 100,
       render: function render(text) {
         return dataStatusEnum[text];
       }
@@ -6637,7 +6717,7 @@ function Rule$2(props) {
       dataIndex: 'companyDid',
       render: function render(text, record) {
         if (text) {
-          return /*#__PURE__*/React__default['default'].createElement("span", null, record.customerDidNote, ":", text);
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, record.companyDidNote), text);
         } else {
           return '';
         }
@@ -6645,17 +6725,20 @@ function Rule$2(props) {
     }, {
       title: '加入时间',
       dataIndex: 'createTime',
+      width: 200,
       render: function render(text) {
         return moment__default['default'](text).format('YYYY-MM-DD HH:mm');
       }
     }, {
       title: '最近更新时间',
+      width: 200,
       dataIndex: 'updateTime',
       render: function render(text) {
         return moment__default['default'](text).format('YYYY-MM-DD HH:mm');
       }
     }, {
       title: '操作',
+      width: 80,
       dataIndex: 'console',
       render: function render(text, record) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, record.dataStatus === 1 ? /*#__PURE__*/React__default['default'].createElement("a", {
@@ -7150,8 +7233,8 @@ function modalcomfirm$1(props) {
       message: '请输入必填项'
     }]
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-    maxLength: 200,
-    placeholder: "\u6700\u591A\u8F93\u5165200\u4E2A\u5B57\u7B26"
+    maxLength: 60,
+    placeholder: "\u6700\u591A\u8F93\u516560\u4E2A\u5B57\u7B26"
   })), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Form.Item, {
     label: "DID\u5907\u6CE8\u540D\u79F0",
     name: "customerDidNote",
@@ -7160,8 +7243,8 @@ function modalcomfirm$1(props) {
       message: '请输入必填项'
     }]
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-    maxLength: 200,
-    placeholder: "\u6700\u591A\u8F93\u5165200\u4E2A\u5B57\u7B26"
+    maxLength: 20,
+    placeholder: "\u6700\u591A\u8F93\u516520\u4E2A\u5B57\u7B26"
   })), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Form.Item, {
     label: "\u6240\u5C5E\u516C\u53F8",
     name: "customerName",
@@ -7170,8 +7253,8 @@ function modalcomfirm$1(props) {
       message: '请输入必填项'
     }]
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-    maxLength: 500,
-    placeholder: "\u6700\u591A\u8F93\u5165500\u4E2A\u5B57\u7B26"
+    maxLength: 100,
+    placeholder: "\u6700\u591A\u8F93\u5165100\u4E2A\u5B57\u7B26"
   })), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Form.Item, {
     label: "\u5BF9\u5E94\u6211\u7684DID",
     name: "companyDid",
@@ -7202,83 +7285,6 @@ function modalcomfirm$1(props) {
   }, "\u53D6\u6D88")))));
 }
 
-var CustomerPage = /*#__PURE__*/function (_React$Component) {
-  _inherits(CustomerPage, _React$Component);
-
-  var _super = _createSuper(CustomerPage);
-
-  function CustomerPage(props) {
-    var _this;
-
-    _classCallCheck(this, CustomerPage);
-
-    _this = _super.call(this, props);
-
-    _this.onPageChange = function (page, pageSize) {
-      _this.props.onChange(page, pageSize);
-    };
-
-    _this.onShowSizeChange = function (current, pageSize) {
-      _this.props.onChange(current, pageSize);
-    };
-
-    _this.state = {
-      pageMeta: _this.props.data
-    };
-    return _this;
-  } // 点击下标改变页面
-
-
-  _createClass(CustomerPage, [{
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
-      if (nextProps.data !== this.props.data) {
-        this.setState({
-          pageMeta: nextProps.data
-        });
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-
-      var pageMeta = this.state.pageMeta;
-      var isShowPageSize = this.props.showSizeChanger !== undefined ? this.props.showSizeChanger : true;
-      return /*#__PURE__*/React__default['default'].createElement("div", {
-        style: {
-          padding: '16px 10px',
-          textAlign: 'center'
-        }
-      }, /*#__PURE__*/React__default['default'].createElement("div", {
-        className: "my-pagination-div"
-      }, /*#__PURE__*/React__default['default'].createElement(antd$1.Pagination, {
-        size: "small",
-        showQuickJumper: true,
-        defaultCurrent: pageMeta.pageNum,
-        total: pageMeta.total,
-        current: pageMeta.pageNum,
-        pageSize: pageMeta.pageSize,
-        pageSizeOptions: this.props.pageSizeOptions || [],
-        showTotal: function showTotal(total, range) {
-          if (total > 0) {
-            return /*#__PURE__*/React__default['default'].createElement("span", null, !_this2.props.hideTotal && /*#__PURE__*/React__default['default'].createElement("span", null, "\u7B2C ", (pageMeta.pageNum - 1) * pageMeta.pageSize + 1, " - ", pageMeta.pageNum * pageMeta.pageSize, " \u6761\uFF0C\u5171\u6709", /*#__PURE__*/React__default['default'].createElement("span", {
-              className: "number"
-            }, total), "\u6761"));
-          }
-
-          return '';
-        },
-        onChange: this.onPageChange,
-        onShowSizeChange: this.onShowSizeChange,
-        showSizeChanger: pageMeta.total > 0 && isShowPageSize === true ? true : false
-      })));
-    }
-  }]);
-
-  return CustomerPage;
-}(React__default['default'].Component);
-
 function modalcomfirm$2(props) {
   var controller = WhiteList.useController();
   var clientInfo = controller.useMemo(function (s) {
@@ -7299,7 +7305,8 @@ function modalcomfirm$2(props) {
 
   var _useState3 = React.useState({
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
+    total: 0
   }),
       _useState4 = _slicedToArray(_useState3, 2),
       pageMeta = _useState4[0],
@@ -7321,12 +7328,6 @@ function modalcomfirm$2(props) {
   var listNature = controller.useMemo(function (s) {
     return s.listNature;
   }, []);
-
-  var _useState9 = React.useState(''),
-      _useState10 = _slicedToArray(_useState9, 2),
-      companyDidNote = _useState10[0],
-      setNote = _useState10[1];
-
   React.useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
@@ -7402,16 +7403,24 @@ function modalcomfirm$2(props) {
   var columns = React.useMemo(function () {
     return [{
       title: 'DID',
-      dataIndex: 'customerDid'
+      dataIndex: 'customerDid',
+      render: function render(text, record) {
+        if (text) {
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, record.customerDidNote), text);
+        } else {
+          return '';
+        }
+      }
     }, {
       title: '所属公司',
-      dataIndex: 'customerName'
+      dataIndex: 'customerName',
+      width: 200
     }, {
       title: '对应我的DID',
       dataIndex: 'companyDid',
       render: function render(text, record) {
         if (text) {
-          return /*#__PURE__*/React__default['default'].createElement("span", null, record.companyDidNote, ":", text);
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, record.companyDidNote), text);
         } else {
           return '';
         }
@@ -7495,10 +7504,13 @@ function modalcomfirm$2(props) {
     visible: true,
     footer: null,
     onCancel: handleCancel,
-    width: 800
+    width: 1000
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
-      marginBottom: 24
+      marginBottom: 24,
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between'
     }
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponents.AdvancedSearch, {
     width: 480,
@@ -7514,24 +7526,34 @@ function modalcomfirm$2(props) {
     compact: true,
     schema: schema,
     defaultValue: ___default['default'].pick(params, ['customerDid', 'customerDidNote', 'companyDid', 'customerName'])
-  }))), /*#__PURE__*/React__default['default'].createElement("p", null, clientInfo.noticeMessage), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Table, {
-    rowSelection: rowSelection,
-    columns: columns,
-    rowKey: "customerDid",
-    dataSource: list,
-    pagination: false
-  }), pageMeta && /*#__PURE__*/React__default['default'].createElement(CustomerPage, {
-    data: pageMeta,
-    onChange: onPageChange
-  }), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
+  })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
     onClick: handleCancel,
     style: {
       marginRight: 20
     }
   }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
+    disabled: selectedRowKeys.length > 0 ? false : true,
     type: "primary",
     onClick: onSubmit
-  }, "\u63D0\u4EA4")));
+  }, "\u63D0\u4EA4"))), /*#__PURE__*/React__default['default'].createElement("p", null, clientInfo.noticeMessage), /*#__PURE__*/React__default['default'].createElement(ktsXui.Table, {
+    rowSelection: rowSelection,
+    columns: columns,
+    rowKey: "customerDid",
+    dataSource: list,
+    pagination: false
+  }), pageMeta && /*#__PURE__*/React__default['default'].createElement(ktsXui.Pagination, {
+    onChange: onPageChange,
+    style: {
+      padding: '16px 0',
+      flex: 'none',
+      background: 'white',
+      textAlign: 'center'
+    },
+    total: pageMeta.total,
+    pageSize: pageMeta.pageSize,
+    current: pageMeta.pageNum,
+    showSizeChanger: true
+  })));
 }
 
 var MainContext = /*#__PURE__*/React.createContext(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "private": false,
   "scripts": {
     "start": "dumi dev",

package/src/DocumentWhiteList/control/actions/didilist/index.ts

@@ -6,10 +6,14 @@ import { IParams } from '../../../interface'
 
 export default async (s: ControllerState, params?: IParams) => {
     const res = await DocumentsService.instance.service?.call({ url: '/participant/list', data: params, type: 'post' }) as any;
+    // return res;
     if (res.err) {
         return false;
     }
     if (res.res) {
-        s.didlist = res.res ;
+        
+        s.didlist = res.res;
+        return res;
+        // console.log(s.didlist);
     }
 }

package/src/DocumentWhiteList/control/state/index.ts

@@ -1,5 +1,5 @@
 
-import { IParams, IPageMeta, IFilter } from '../../interface'
+import { IPageMeta, IFilter } from '../../interface'
 
 export interface IBillEnum {
     name: string;

package/src/DocumentWhiteList/index.tsx

@@ -26,7 +26,6 @@ const Main = (props: any) => {
   return (
     <MainContext.Provider value={controller}>
       <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
-        {/* <Header /> */}
         <RulePage />
         {
           visible &&