kts-components-document-access-point 1.1.29 → 1.2.1

package/dist/index.esm.js

@@ -3830,11 +3830,11 @@ function validaterule$1(props) {
       dataIndex: 'effectStatus',
       render: function render(text) {
         if (text === 0) {
-          return /*#__PURE__*/React.createElement("span", null, "\u672A\u751F\u6548");
+          return /*#__PURE__*/React.createElement("span", null, "\u5DF2\u5931\u6548");
         }
 
         if (text === 1) {
-          return /*#__PURE__*/React.createElement("span", null, "\u5DF2\u751F\u6548");
+          return /*#__PURE__*/React.createElement("span", null, "\u4F7F\u7528\u4E2D");
         }
       }
     }, {
@@ -4511,6 +4511,7 @@ var Controller = /*#__PURE__*/function (_GreyReactBox) {
   return Controller;
 }(GreyReactBox);
 
+var confirm = Modal.confirm;
 function Rule(props) {
   var controller = DocumentsRule.useController();
 
@@ -4551,17 +4552,14 @@ function Rule(props) {
   var _useState13 = useState([]),
       _useState14 = _slicedToArray(_useState13, 2),
       targetList = _useState14[0],
-      setList = _useState14[1];
+      setList = _useState14[1]; // const [status, setStatus] = useState(0);
+  // const [first, setFirst] = useState(true);
 
-  var _useState15 = useState(0),
-      _useState16 = _slicedToArray(_useState15, 2),
-      status = _useState16[0],
-      setStatus = _useState16[1];
 
-  var _useState17 = useState(true),
-      _useState18 = _slicedToArray(_useState17, 2),
-      first = _useState18[0],
-      setFirst = _useState18[1];
+  var _useState15 = useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      hasChange = _useState16[0],
+      setChange = _useState16[1];
 
   var history = useHistory();
   var search = history.location.search && qs.parse(history.location.search);
@@ -4737,73 +4735,85 @@ function Rule(props) {
   var handleCancel = useCallback(function () {
     setVisible(false);
   }, []);
-  var autoSave = useCallback(throttle(function () {
+  var autoSave = useCallback(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
       var data, formValue, res;
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
+              // let url = '/schema/config/save';
               data = _objectSpread2({}, schema);
               formValue = form.getFieldsValue();
 
               if (!(record && record.id)) {
-                _context4.next = 11;
+                _context4.next = 9;
                 break;
               }
+
+              // url = '/schema/config/update';
               data = _objectSpread2(_objectSpread2({}, record), {}, {
                 schemaContent: JSON.stringify(data)
               }, formValue);
-              _context4.next = 8;
+              _context4.next = 6;
               return controller.configupdate(data);
 
-            case 8:
+            case 6:
               res = _context4.sent;
-              _context4.next = 15;
+              _context4.next = 13;
               break;
 
-            case 11:
+            case 9:
               data = _objectSpread2({
                 schemaContent: JSON.stringify(data)
               }, formValue);
-              _context4.next = 14;
+              _context4.next = 12;
               return controller.configsave(data);
 
-            case 14:
+            case 12:
               res = _context4.sent;
 
-            case 15:
+            case 13:
               if (!res.err) {
-                _context4.next = 19;
+                _context4.next = 17;
                 break;
               }
 
               return _context4.abrupt("return", false);
 
-            case 19:
+            case 17:
               if (res.res) {
+                message$1.success('保存成功');
+                setChange(false);
                 setRecord(res.res);
               }
 
-            case 20:
+            case 18:
             case "end":
               return _context4.stop();
           }
         }
       }, _callee4);
     }))();
-  }), [schema, record]);
-  useEffect(function () {
-    if (status !== 0 && !disabled && first === false) {
-      autoSave();
-    }
-  }, [schema, status, first]);
-  var onFinish = useCallback(function () {
-    setStatus(new Date().getTime());
-  }, []);
-  var onFinishFailed = useCallback(function () {
-    setStatus(0);
-  }, []);
+  }, [record, schema]); // useEffect(() => {
+  //     if (status !== 0 && !disabled && first === false) {
+  //         autoSave();
+  //     }
+  // }, [schema, status, first])
+  // const onFinish = useCallback(() => {
+  //     setStatus(new Date().getTime());
+  // }, []);
+  // const onFinishFailed = useCallback(() => {
+  //     setStatus(0);
+  // }, []);
+
+  /**
+   * 手动保存
+   */
+
+  var onSave = useCallback(function () {
+    autoSave();
+  }, [record, schema]);
   var onSendCheck = useCallback(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
       var res;
@@ -4874,12 +4884,22 @@ function Rule(props) {
     };
   }, []);
   var updateSchema = useCallback(function (e) {
-    setFirst(false);
+    // setFirst(false);
     setSchema(e);
-    setTimeout(function () {
-      form.submit();
-    });
+    setChange(true);
   }, []);
+  var onQuit = useCallback(function () {
+    if (hasChange) {
+      confirm({
+        title: '您当前有内容未保存，是否退出?',
+        onOk: function onOk() {
+          history.goBack();
+        }
+      });
+    } else {
+      history.goBack();
+    }
+  }, [hasChange]);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       height: '100%',
@@ -4897,6 +4917,12 @@ function Rule(props) {
     },
     title: "\u914D\u7F6E",
     extra: [/*#__PURE__*/React.createElement(Button$1, {
+      key: "2",
+      style: {
+        display: type === 'record' ? 'none' : ''
+      },
+      onClick: onSave
+    }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement(Button$1, {
       key: "3",
       style: {
         display: type === 'record' ? 'none' : ''
@@ -4905,9 +4931,7 @@ function Rule(props) {
     }, "\u53D1\u9001"), /*#__PURE__*/React.createElement(Button$1, {
       key: "1",
       type: "primary",
-      onClick: function onClick() {
-        history.goBack();
-      }
+      onClick: onQuit
     }, "\u9000\u51FA")]
   })), /*#__PURE__*/React.createElement(Card, {
     style: {
@@ -4926,13 +4950,11 @@ function Rule(props) {
     },
     name: "basic",
     form: form,
-    onFinish: onFinish,
-    onFinishFailed: onFinishFailed,
+    // onFinish={onFinish}
+    // onFinishFailed={onFinishFailed}
     onValuesChange: function onValuesChange() {
-      setFirst(false);
-      setTimeout(function () {
-        form.submit();
-      });
+      // setFirst(false);
+      setChange(true);
     },
     labelCol: {
       span: 8
@@ -4974,7 +4996,7 @@ function Rule(props) {
   })))), /*#__PURE__*/React.createElement(Col, {
     span: 8
   }, /*#__PURE__*/React.createElement(Form$1.Item, {
-    label: "\u4F60\u7684\u6536\u53D1\u89D2\u8272",
+    label: "\u6211\u7684\u6536\u53D1\u89D2\u8272",
     name: "attribution",
     rules: [{
       required: true,
@@ -5035,24 +5057,6 @@ function Rule(props) {
   }))));
 }
 
-var throttle = function throttle(fn) {
-  var interval = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
-
-  var _timer;
-
-  return function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    clearTimeout(_timer);
-    _timer = setTimeout(function () {
-      _timer = null;
-      return fn.apply(null, args);
-    }, interval);
-  };
-};
-
 var DocumentsListContext$1 = /*#__PURE__*/createContext(null);
 /**
  * 单据校验规则
@@ -5700,7 +5704,6 @@ var didList = /*#__PURE__*/(function () {
           case 5:
             if (res.res) {
               s.didlist = res.res;
-              console.log(s.didlist);
             }
 
           case 6:
@@ -5812,7 +5815,7 @@ var Header = (function () {
   useEffect(function () {
     var didEnum = didlist.map(function (item) {
       return {
-        label: item.remarkName + item.participantId,
+        label: item.remarkName + ':' + item.participantId,
         value: item.participantId
       };
     });
@@ -6031,7 +6034,7 @@ function Rule$1(props) {
       dataIndex: 'customerDid'
     }, {
       title: '所属公司',
-      dataIndex: 'customerDidNote'
+      dataIndex: 'customerName'
     }, {
       title: '本条数据状态',
       dataIndex: 'dataStatus',
@@ -6043,7 +6046,7 @@ function Rule$1(props) {
       dataIndex: 'companyDid',
       render: function render(text, record) {
         if (text) {
-          return /*#__PURE__*/React.createElement("span", null, record.companyDidNote, ":", text);
+          return /*#__PURE__*/React.createElement("span", null, record.customerDidNote, ":", text);
         } else {
           return '';
         }
@@ -6247,7 +6250,7 @@ var Header$1 = (function () {
   useEffect(function () {
     var didEnum = didlist.map(function (item) {
       return {
-        label: item.remarkName + item.participantId,
+        label: item.remarkName + ':' + item.participantId,
         value: item.participantId
       };
     });
@@ -6463,7 +6466,7 @@ function Rule$2(props) {
       dataIndex: 'customerDid'
     }, {
       title: '所属公司',
-      dataIndex: 'customerDidNote'
+      dataIndex: 'customerName'
     }, {
       title: '本条数据状态',
       dataIndex: 'dataStatus',
@@ -6475,7 +6478,7 @@ function Rule$2(props) {
       dataIndex: 'companyDid',
       render: function render(text, record) {
         if (text) {
-          return /*#__PURE__*/React.createElement("span", null, record.companyDidNote, ":", text);
+          return /*#__PURE__*/React.createElement("span", null, record.customerDidNote, ":", text);
         } else {
           return '';
         }
@@ -7195,7 +7198,7 @@ function modalcomfirm$2(props) {
   var schema = useMemo(function () {
     var didEnum = didlist.map(function (item) {
       return {
-        label: item.remarkName + item.participantId,
+        label: item.remarkName + ':' + item.participantId,
         value: item.participantId
       };
     });

package/dist/index.js

@@ -3844,11 +3844,11 @@ function validaterule$1(props) {
       dataIndex: 'effectStatus',
       render: function render(text) {
         if (text === 0) {
-          return /*#__PURE__*/React__default['default'].createElement("span", null, "\u672A\u751F\u6548");
+          return /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u5931\u6548");
         }
 
         if (text === 1) {
-          return /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u751F\u6548");
+          return /*#__PURE__*/React__default['default'].createElement("span", null, "\u4F7F\u7528\u4E2D");
         }
       }
     }, {
@@ -4525,6 +4525,7 @@ var Controller = /*#__PURE__*/function (_GreyReactBox) {
   return Controller;
 }(GreyReactBox__default['default']);
 
+var confirm = ktsXui.Modal.confirm;
 function Rule(props) {
   var controller = DocumentsRule.useController();
 
@@ -4565,17 +4566,14 @@ function Rule(props) {
   var _useState13 = React.useState([]),
       _useState14 = _slicedToArray(_useState13, 2),
       targetList = _useState14[0],
-      setList = _useState14[1];
+      setList = _useState14[1]; // const [status, setStatus] = useState(0);
+  // const [first, setFirst] = useState(true);
 
-  var _useState15 = React.useState(0),
-      _useState16 = _slicedToArray(_useState15, 2),
-      status = _useState16[0],
-      setStatus = _useState16[1];
 
-  var _useState17 = React.useState(true),
-      _useState18 = _slicedToArray(_useState17, 2),
-      first = _useState18[0],
-      setFirst = _useState18[1];
+  var _useState15 = React.useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      hasChange = _useState16[0],
+      setChange = _useState16[1];
 
   var history = reactRouterDom.useHistory();
   var search = history.location.search && qs__default['default'].parse(history.location.search);
@@ -4751,73 +4749,85 @@ function Rule(props) {
   var handleCancel = React.useCallback(function () {
     setVisible(false);
   }, []);
-  var autoSave = React.useCallback(throttle(function () {
+  var autoSave = React.useCallback(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
       var data, formValue, res;
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
+              // let url = '/schema/config/save';
               data = _objectSpread2({}, schema);
               formValue = form.getFieldsValue();
 
               if (!(record && record.id)) {
-                _context4.next = 11;
+                _context4.next = 9;
                 break;
               }
+
+              // url = '/schema/config/update';
               data = _objectSpread2(_objectSpread2({}, record), {}, {
                 schemaContent: JSON.stringify(data)
               }, formValue);
-              _context4.next = 8;
+              _context4.next = 6;
               return controller.configupdate(data);
 
-            case 8:
+            case 6:
               res = _context4.sent;
-              _context4.next = 15;
+              _context4.next = 13;
               break;
 
-            case 11:
+            case 9:
               data = _objectSpread2({
                 schemaContent: JSON.stringify(data)
               }, formValue);
-              _context4.next = 14;
+              _context4.next = 12;
               return controller.configsave(data);
 
-            case 14:
+            case 12:
               res = _context4.sent;
 
-            case 15:
+            case 13:
               if (!res.err) {
-                _context4.next = 19;
+                _context4.next = 17;
                 break;
               }
 
               return _context4.abrupt("return", false);
 
-            case 19:
+            case 17:
               if (res.res) {
+                ktsXui.message.success('保存成功');
+                setChange(false);
                 setRecord(res.res);
               }
 
-            case 20:
+            case 18:
             case "end":
               return _context4.stop();
           }
         }
       }, _callee4);
     }))();
-  }), [schema, record]);
-  React.useEffect(function () {
-    if (status !== 0 && !disabled && first === false) {
-      autoSave();
-    }
-  }, [schema, status, first]);
-  var onFinish = React.useCallback(function () {
-    setStatus(new Date().getTime());
-  }, []);
-  var onFinishFailed = React.useCallback(function () {
-    setStatus(0);
-  }, []);
+  }, [record, schema]); // useEffect(() => {
+  //     if (status !== 0 && !disabled && first === false) {
+  //         autoSave();
+  //     }
+  // }, [schema, status, first])
+  // const onFinish = useCallback(() => {
+  //     setStatus(new Date().getTime());
+  // }, []);
+  // const onFinishFailed = useCallback(() => {
+  //     setStatus(0);
+  // }, []);
+
+  /**
+   * 手动保存
+   */
+
+  var onSave = React.useCallback(function () {
+    autoSave();
+  }, [record, schema]);
   var onSendCheck = React.useCallback(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
       var res;
@@ -4888,12 +4898,22 @@ function Rule(props) {
     };
   }, []);
   var updateSchema = React.useCallback(function (e) {
-    setFirst(false);
+    // setFirst(false);
     setSchema(e);
-    setTimeout(function () {
-      form.submit();
-    });
+    setChange(true);
   }, []);
+  var onQuit = React.useCallback(function () {
+    if (hasChange) {
+      confirm({
+        title: '您当前有内容未保存，是否退出?',
+        onOk: function onOk() {
+          history.goBack();
+        }
+      });
+    } else {
+      history.goBack();
+    }
+  }, [hasChange]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       height: '100%',
@@ -4911,6 +4931,12 @@ function Rule(props) {
     },
     title: "\u914D\u7F6E",
     extra: [/*#__PURE__*/React__default['default'].createElement(ktsXui.Button, {
+      key: "2",
+      style: {
+        display: type === 'record' ? 'none' : ''
+      },
+      onClick: onSave
+    }, "\u4FDD\u5B58"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Button, {
       key: "3",
       style: {
         display: type === 'record' ? 'none' : ''
@@ -4919,9 +4945,7 @@ function Rule(props) {
     }, "\u53D1\u9001"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Button, {
       key: "1",
       type: "primary",
-      onClick: function onClick() {
-        history.goBack();
-      }
+      onClick: onQuit
     }, "\u9000\u51FA")]
   })), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Card, {
     style: {
@@ -4940,13 +4964,11 @@ function Rule(props) {
     },
     name: "basic",
     form: form,
-    onFinish: onFinish,
-    onFinishFailed: onFinishFailed,
+    // onFinish={onFinish}
+    // onFinishFailed={onFinishFailed}
     onValuesChange: function onValuesChange() {
-      setFirst(false);
-      setTimeout(function () {
-        form.submit();
-      });
+      // setFirst(false);
+      setChange(true);
     },
     labelCol: {
       span: 8
@@ -4988,7 +5010,7 @@ function Rule(props) {
   })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
     span: 8
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
-    label: "\u4F60\u7684\u6536\u53D1\u89D2\u8272",
+    label: "\u6211\u7684\u6536\u53D1\u89D2\u8272",
     name: "attribution",
     rules: [{
       required: true,
@@ -5049,24 +5071,6 @@ function Rule(props) {
   }))));
 }
 
-var throttle = function throttle(fn) {
-  var interval = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
-
-  var _timer;
-
-  return function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    clearTimeout(_timer);
-    _timer = setTimeout(function () {
-      _timer = null;
-      return fn.apply(null, args);
-    }, interval);
-  };
-};
-
 var DocumentsListContext$1 = /*#__PURE__*/React.createContext(null);
 /**
  * 单据校验规则
@@ -5714,7 +5718,6 @@ var didList = /*#__PURE__*/(function () {
           case 5:
             if (res.res) {
               s.didlist = res.res;
-              console.log(s.didlist);
             }
 
           case 6:
@@ -5826,7 +5829,7 @@ var Header = (function () {
   React.useEffect(function () {
     var didEnum = didlist.map(function (item) {
       return {
-        label: item.remarkName + item.participantId,
+        label: item.remarkName + ':' + item.participantId,
         value: item.participantId
       };
     });
@@ -6045,7 +6048,7 @@ function Rule$1(props) {
       dataIndex: 'customerDid'
     }, {
       title: '所属公司',
-      dataIndex: 'customerDidNote'
+      dataIndex: 'customerName'
     }, {
       title: '本条数据状态',
       dataIndex: 'dataStatus',
@@ -6057,7 +6060,7 @@ function Rule$1(props) {
       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("span", null, record.customerDidNote, ":", text);
         } else {
           return '';
         }
@@ -6261,7 +6264,7 @@ var Header$1 = (function () {
   React.useEffect(function () {
     var didEnum = didlist.map(function (item) {
       return {
-        label: item.remarkName + item.participantId,
+        label: item.remarkName + ':' + item.participantId,
         value: item.participantId
       };
     });
@@ -6477,7 +6480,7 @@ function Rule$2(props) {
       dataIndex: 'customerDid'
     }, {
       title: '所属公司',
-      dataIndex: 'customerDidNote'
+      dataIndex: 'customerName'
     }, {
       title: '本条数据状态',
       dataIndex: 'dataStatus',
@@ -6489,7 +6492,7 @@ function Rule$2(props) {
       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("span", null, record.customerDidNote, ":", text);
         } else {
           return '';
         }
@@ -7209,7 +7212,7 @@ function modalcomfirm$2(props) {
   var schema = React.useMemo(function () {
     var didEnum = didlist.map(function (item) {
       return {
-        label: item.remarkName + item.participantId,
+        label: item.remarkName + ':' + item.participantId,
         value: item.participantId
       };
     });

package/package.json

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

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

@@ -11,6 +11,5 @@ export default async (s: ControllerState, params?: IParams) => {
     }
     if (res.res) {
         s.didlist = res.res ;
-        console.log(s.didlist);
     }
 }

package/src/DocumentWhiteList/ui/clientmodal/index.tsx

@@ -34,7 +34,7 @@ export default function modalcomfirm(props: any) {
     }, []);
     const schema = useMemo(() => {
         const didEnum = didlist.map(item => {
-            return { label: item.remarkName + item.participantId, value: item.participantId };
+            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
         })
         return {
             'type': "object",

package/src/DocumentWhiteList/ui/main/black.tsx

@@ -21,7 +21,7 @@ export default function Rule(props: any) {
         },
         {
             title: '所属公司',
-            dataIndex: 'customerDidNote',
+            dataIndex: 'customerName',
         },
         {
             title: '本条数据状态',
@@ -33,7 +33,7 @@ export default function Rule(props: any) {
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
-                    return <span>{record.companyDidNote}:{text}</span>
+                    return <span>{record.customerDidNote}:{text}</span>
                 } else {
                     return ''
                 }

package/src/DocumentWhiteList/ui/main/white.tsx

@@ -20,7 +20,7 @@ export default function Rule(props: any) {
         },
         {
             title: '所属公司',
-            dataIndex: 'customerDidNote',
+            dataIndex: 'customerName',
         },
         {
             title: '本条数据状态',
@@ -32,7 +32,7 @@ export default function Rule(props: any) {
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
-                    return <span>{record.companyDidNote}:{text}</span>
+                    return <span>{record.customerDidNote}:{text}</span>
                 } else {
                     return ''
                 }

package/src/DocumentWhiteList/ui/pageheader/BlackHeader.tsx

@@ -30,7 +30,7 @@ export default () => {
     }, []);
     useEffect(() => {
         const didEnum = didlist.map(item => {
-            return { label: item.remarkName + item.participantId, value: item.participantId };
+            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
         })
         let obj: any = {
             type: "object",
@@ -115,12 +115,12 @@ export default () => {
                     compact={true}
                     schema={schema}
                     defaultValue={params}
-                    
+
                 >
                 </KtsForm>
             </AdvancedSearch>
         );
-    }, [schema,params]);
+    }, [schema, params]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

package/src/DocumentWhiteList/ui/pageheader/WhiteHeader.tsx

@@ -29,7 +29,7 @@ export default () => {
     }, []);
     useEffect(() => {
         const didEnum = didlist.map(item => {
-            return { label: item.remarkName + item.participantId, value: item.participantId };
+            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
         })
         let obj: any = {
             type: "object",
@@ -118,7 +118,7 @@ export default () => {
                 </KtsForm>
             </AdvancedSearch>
         );
-    }, [schema,whiteParams]);
+    }, [schema, whiteParams]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

package/src/DocumentsCont/___demo___/base/index.tsx

@@ -3,6 +3,6 @@ import React from "react";
 
 export default () => {
   return (
-    <DocumentsCont path='/billwhiteliest'/>
+    <DocumentsCont path=''/>
   );
 };

package/src/DocumentsList/ui/sendlist/index.tsx

@@ -63,10 +63,10 @@ export default function validaterule(props: any) {
             dataIndex: 'effectStatus',
             render: (text: any) => {
                 if (text === 0) {
-                    return <span>未生效</span>
+                    return <span>已失效</span>
                 }
                 if (text === 1) {
-                    return <span>已生效</span>
+                    return <span>使用中</span>
                 }
             }
         },

package/src/DocumentsRule/ui/main/index.tsx

@@ -5,6 +5,7 @@ import { Card, Row, Col, PageHeader } from 'kts-components-antd-x4';
 import { useHistory } from 'react-router-dom';
 import qs from 'query-string';
 import Main from '../..';
+const { confirm } = Modal;
 export default function Rule(props: any) {
     const controller = Main.useController();
     const [billEnum, setBill] = useState([]);
@@ -15,8 +16,9 @@ export default function Rule(props: any) {
     const [visible, setVisible] = useState(false);
     const [targetId, setTarget] = useState();
     const [targetList, setList] = useState([]);
-    const [status, setStatus] = useState(0);
-    const [first, setFirst] = useState(true);
+    // const [status, setStatus] = useState(0);
+    // const [first, setFirst] = useState(true);
+    const [hasChange, setChange] = useState(false);
     const history = useHistory() as any;
     const search = history.location.search && qs.parse(history.location.search);
     const id = search && search.id;
@@ -92,14 +94,14 @@ export default function Rule(props: any) {
     const handleCancel = useCallback(() => {
         setVisible(false);
     }, [])
-    const autoSave = useCallback(throttle(() => {
+    const autoSave = useCallback(() => {
         (async () => {
-            let url = '/schema/config/save';
+            // let url = '/schema/config/save';
             let data: any = { ...schema };
             const formValue = form.getFieldsValue();
             let res;
             if (record && record.id) {
-                url = '/schema/config/update';
+                // url = '/schema/config/update';
                 data = { ...record, schemaContent: JSON.stringify(data), ...formValue }
                 res = await controller.configupdate(data);
             } else {
@@ -111,22 +113,30 @@ export default function Rule(props: any) {
                 return false;
             } else {
                 if (res.res) {
+                    message.success('保存成功');
+                    setChange(false);
                     setRecord(res.res);
                 }
             }
         })()
-    }), [schema, record]);
-    useEffect(() => {
-        if (status !== 0 && !disabled && first === false) {
-            autoSave();
-        }
-    }, [schema, status, first])
-    const onFinish = useCallback(() => {
-        setStatus(new Date().getTime());
-    }, []);
-    const onFinishFailed = useCallback(() => {
-        setStatus(0);
-    }, []);
+    }, [record,schema]);
+    // useEffect(() => {
+    //     if (status !== 0 && !disabled && first === false) {
+    //         autoSave();
+    //     }
+    // }, [schema, status, first])
+    // const onFinish = useCallback(() => {
+    //     setStatus(new Date().getTime());
+    // }, []);
+    // const onFinishFailed = useCallback(() => {
+    //     setStatus(0);
+    // }, []);
+    /**
+     * 手动保存
+     */
+    const onSave = useCallback(() => {
+        autoSave();
+    }, [record,schema]);
     const onSendCheck = useCallback(() => {
         (async () => {
             const res = await controller.listbysubjectid({});
@@ -164,20 +174,31 @@ export default function Rule(props: any) {
         };
     }, [])
     const updateSchema = useCallback((e) => {
-        setFirst(false);
+        // setFirst(false);
         setSchema(e);
-        setTimeout(() => {
-            form.submit()
-        });
+        setChange(true);
     }, [])
+    const onQuit = useCallback(() => {
+        if (hasChange) {
+            confirm({
+                title: '您当前有内容未保存，是否退出?',
+                onOk: () => {
+                    history.goBack();
+                }
+            });
+        } else {
+            history.goBack();
+        }
+    }, [hasChange]);
     return <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
         <div style={{ display: 'flex', flex: 'none', }}>
             <PageHeader
                 style={{ flex: 1 }}
                 title="配置"
                 extra={[
+                    <Button key="2" style={{ display: type === 'record' ? 'none' : '' }} onClick={onSave}>保存</Button>,
                     <Button key="3" style={{ display: type === 'record' ? 'none' : '' }} onClick={onSendCheck}>发送</Button>,
-                    <Button key="1" type="primary" onClick={() => { history.goBack() }}>
+                    <Button key="1" type="primary" onClick={onQuit}>
                         退出
                     </Button>,
                 ]}
@@ -188,13 +209,11 @@ export default function Rule(props: any) {
                 style={{ flex: 'none' }}
                 name="basic"
                 form={form}
-                onFinish={onFinish}
-                onFinishFailed={onFinishFailed}
+                // onFinish={onFinish}
+                // onFinishFailed={onFinishFailed}
                 onValuesChange={() => {
-                    setFirst(false);
-                    setTimeout(() => {
-                        form.submit()
-                    });
+                    // setFirst(false);
+                    setChange(true);
                 }}
                 labelCol={{ span: 8 }}
                 wrapperCol={{ span: 16 }}
@@ -226,7 +245,7 @@ export default function Rule(props: any) {
                     </Col>
                     <Col span={8}>
                         <Form.Item
-                            label="你的收发角色"
+                            label="我的收发角色"
                             name="attribution"
                             rules={[{ required: true, message: '请输入必填项' }]}
                         >