npm - kts-component-invoice-operate - Versions diffs - 1.2.11 → 1.2.13 - Mend

kts-component-invoice-operate 1.2.11 → 1.2.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.esm.js +54 -57
package/dist/index.js +54 -57
package/package.json +2 -2
package/src/Invoice/_test/endowCode/index.tsx +3 -3
package/src/Invoice/ui/EndowCodeDrawer/index.tsx +5 -5

package/dist/index.esm.js CHANGED Viewed

@@ -5936,10 +5936,8 @@ var DrawerBody$3 = function DrawerBody(props) {
     return s.goodsListState.endowCode.favouredPolicyNameList;
   }, []);
   /** 优惠政策类型列表 */
+  // const getTaxCategoryCodeTree = controller.useMemo(s => s.goodsListState.endowCode.getTaxCategoryCodeTree, []);
-  var getTaxCategoryCodeTree = controller.useMemo(function (s) {
-    return s.goodsListState.endowCode.getTaxCategoryCodeTree;
-  }, []);
   /** 税率 */
   var _React$useState3 = React.useState(0),
@@ -6182,41 +6180,40 @@ var DrawerBody$3 = function DrawerBody(props) {
       }());
       setVisible(false);
     }, [list, actions, readOnlyTaxRate]);
-    var getTaxCategoryCodeTree = controller.useMemo(function (s) {
-      return s.goodsListState.endowCode.getTaxCategoryCodeTree || function () {
-        return [];
-      };
-    }, []);
     React.useEffect(function () {
-      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
-        return regeneratorRuntime.wrap(function _callee9$(_context9) {
+      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+        var fn, list;
+        return regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
-                _context9.t0 = setList;
-                _context9.next = 3;
-                return getTaxCategoryCodeTree(filter === null || filter === void 0 ? void 0 : filter.taxCategoryCode, filter === null || filter === void 0 ? void 0 : filter.val);
-              case 3:
-                _context9.t1 = _context9.sent;
-                if (_context9.t1) {
-                  _context9.next = 6;
-                  break;
-                }
+                fn = controller.state.goodsListState.endowCode.getTaxCategoryCodeTree || /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
+                  return regeneratorRuntime.wrap(function _callee9$(_context9) {
+                    while (1) {
+                      switch (_context9.prev = _context9.next) {
+                        case 0:
+                          return _context9.abrupt("return", []);
-                _context9.t1 = [];
+                        case 1:
+                        case "end":
+                          return _context9.stop();
+                      }
+                    }
+                  }, _callee9);
+                }));
+                _context10.next = 3;
+                return fn(filter === null || filter === void 0 ? void 0 : filter.taxCategoryCode, filter === null || filter === void 0 ? void 0 : filter.val);
-              case 6:
-                _context9.t2 = _context9.t1;
-                (0, _context9.t0)(_context9.t2);
+              case 3:
+                list = _context10.sent;
+                setList(list || []);
-              case 8:
+              case 5:
               case "end":
-                return _context9.stop();
+                return _context10.stop();
             }
           }
-        }, _callee9);
+        }, _callee10);
       }))();
     }, [filter]);
     React.useEffect(function () {
@@ -6278,11 +6275,11 @@ var DrawerBody$3 = function DrawerBody(props) {
   var onSubmit = React.useCallback(function (values) {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref10 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10(s) {
+      var _ref11 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(s) {
         var endowCodeGood;
-        return regeneratorRuntime.wrap(function _callee10$(_context10) {
+        return regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
                 endowCodeGood = s.goodsListState.endowCode.endowcodeGoodIndex.map(function (e) {
                   return s.goodsListState.goodsMap.get(e);
@@ -6318,11 +6315,11 @@ var DrawerBody$3 = function DrawerBody(props) {
                 if (!endowCodeGood.some(function (e) {
                   return bytesLnegth((e === null || e === void 0 ? void 0 : e.itemName) || '') > 92;
                 })) {
-                  _context10.next = 5;
+                  _context11.next = 5;
                   break;
                 }
-                _context10.next = 5;
+                _context11.next = 5;
                 return function () {
                   return new Promise(function (resolve) {
                     confirm({
@@ -6352,14 +6349,14 @@ var DrawerBody$3 = function DrawerBody(props) {
               case 7:
               case "end":
-                return _context10.stop();
+                return _context11.stop();
             }
           }
-        }, _callee10);
+        }, _callee11);
       }));
       return function (_x9) {
-        return _ref10.apply(this, arguments);
+        return _ref11.apply(this, arguments);
       };
     }())();
   }, [controller]);
@@ -6368,23 +6365,23 @@ var DrawerBody$3 = function DrawerBody(props) {
     FormEffectHooks.onFieldValueChange$('taxRate').subscribe(function (e) {
       setTaxRate(e.value);
       actions.setFieldState('taxFreeType', /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(s) {
-          return regeneratorRuntime.wrap(function _callee11$(_context11) {
+        var _ref12 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12(s) {
+          return regeneratorRuntime.wrap(function _callee12$(_context12) {
             while (1) {
-              switch (_context11.prev = _context11.next) {
+              switch (_context12.prev = _context12.next) {
                 case 0:
                   if (e.value !== 0) s.value = undefined;
                 case 1:
                 case "end":
-                  return _context11.stop();
+                  return _context12.stop();
               }
             }
-          }, _callee11);
+          }, _callee12);
         }));
         return function (_x10) {
-          return _ref11.apply(this, arguments);
+          return _ref12.apply(this, arguments);
         };
       }());
     }); // 是否享受优惠政策
@@ -6392,23 +6389,23 @@ var DrawerBody$3 = function DrawerBody(props) {
     FormEffectHooks.onFieldValueChange$('favouredPolicyMark').subscribe(function (e) {
       setFavouredPolicyMark(e.value);
       actions.setFieldState('favouredPolicyName', /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12(s) {
-          return regeneratorRuntime.wrap(function _callee12$(_context12) {
+        var _ref13 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13(s) {
+          return regeneratorRuntime.wrap(function _callee13$(_context13) {
             while (1) {
-              switch (_context12.prev = _context12.next) {
+              switch (_context13.prev = _context13.next) {
                 case 0:
                   if (e.value === 0) s.value = undefined;
                 case 1:
                 case "end":
-                  return _context12.stop();
+                  return _context13.stop();
               }
             }
-          }, _callee12);
+          }, _callee13);
         }));
         return function (_x11) {
-          return _ref12.apply(this, arguments);
+          return _ref13.apply(this, arguments);
         };
       }());
     });
@@ -6420,7 +6417,7 @@ var DrawerBody$3 = function DrawerBody(props) {
   return /*#__PURE__*/React.createElement(SchemaForm, {
     actions: actions,
     components: _objectSpread2(_objectSpread2({}, components), {}, {
-      showSearch: !!getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch
+      showSearch: !!controller.state.goodsListState.endowCode.getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch
     }),
     effects: effects
   }, /*#__PURE__*/React.createElement(FormButtonGroup, null, /*#__PURE__*/React.createElement(SchemaMarkupField, {
@@ -6497,23 +6494,23 @@ var DrawerBody$3 = function DrawerBody(props) {
   }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13(s) {
-          return regeneratorRuntime.wrap(function _callee13$(_context13) {
+        var _ref14 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14(s) {
+          return regeneratorRuntime.wrap(function _callee14$(_context14) {
             while (1) {
-              switch (_context13.prev = _context13.next) {
+              switch (_context14.prev = _context14.next) {
                 case 0:
-                  return _context13.abrupt("return", s.goodsListState.endowCode.endowcodeGoodIndex = []);
+                  return _context14.abrupt("return", s.goodsListState.endowCode.endowcodeGoodIndex = []);
                 case 1:
                 case "end":
-                  return _context13.stop();
+                  return _context14.stop();
               }
             }
-          }, _callee13);
+          }, _callee14);
         }));
         return function (_x12) {
-          return _ref13.apply(this, arguments);
+          return _ref14.apply(this, arguments);
         };
       }())();
     }

package/dist/index.js CHANGED Viewed

@@ -5946,10 +5946,8 @@ var DrawerBody$3 = function DrawerBody(props) {
     return s.goodsListState.endowCode.favouredPolicyNameList;
   }, []);
   /** 优惠政策类型列表 */
+  // const getTaxCategoryCodeTree = controller.useMemo(s => s.goodsListState.endowCode.getTaxCategoryCodeTree, []);
-  var getTaxCategoryCodeTree = controller.useMemo(function (s) {
-    return s.goodsListState.endowCode.getTaxCategoryCodeTree;
-  }, []);
   /** 税率 */
   var _React$useState3 = React__default['default'].useState(0),
@@ -6192,41 +6190,40 @@ var DrawerBody$3 = function DrawerBody(props) {
       }());
       setVisible(false);
     }, [list, actions, readOnlyTaxRate]);
-    var getTaxCategoryCodeTree = controller.useMemo(function (s) {
-      return s.goodsListState.endowCode.getTaxCategoryCodeTree || function () {
-        return [];
-      };
-    }, []);
     React__default['default'].useEffect(function () {
-      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
-        return regeneratorRuntime.wrap(function _callee9$(_context9) {
+      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+        var fn, list;
+        return regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
-                _context9.t0 = setList;
-                _context9.next = 3;
-                return getTaxCategoryCodeTree(filter === null || filter === void 0 ? void 0 : filter.taxCategoryCode, filter === null || filter === void 0 ? void 0 : filter.val);
-              case 3:
-                _context9.t1 = _context9.sent;
-                if (_context9.t1) {
-                  _context9.next = 6;
-                  break;
-                }
+                fn = controller.state.goodsListState.endowCode.getTaxCategoryCodeTree || /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
+                  return regeneratorRuntime.wrap(function _callee9$(_context9) {
+                    while (1) {
+                      switch (_context9.prev = _context9.next) {
+                        case 0:
+                          return _context9.abrupt("return", []);
-                _context9.t1 = [];
+                        case 1:
+                        case "end":
+                          return _context9.stop();
+                      }
+                    }
+                  }, _callee9);
+                }));
+                _context10.next = 3;
+                return fn(filter === null || filter === void 0 ? void 0 : filter.taxCategoryCode, filter === null || filter === void 0 ? void 0 : filter.val);
-              case 6:
-                _context9.t2 = _context9.t1;
-                (0, _context9.t0)(_context9.t2);
+              case 3:
+                list = _context10.sent;
+                setList(list || []);
-              case 8:
+              case 5:
               case "end":
-                return _context9.stop();
+                return _context10.stop();
             }
           }
-        }, _callee9);
+        }, _callee10);
       }))();
     }, [filter]);
     React__default['default'].useEffect(function () {
@@ -6288,11 +6285,11 @@ var DrawerBody$3 = function DrawerBody(props) {
   var onSubmit = React__default['default'].useCallback(function (values) {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref10 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10(s) {
+      var _ref11 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(s) {
         var endowCodeGood;
-        return regeneratorRuntime.wrap(function _callee10$(_context10) {
+        return regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
                 endowCodeGood = s.goodsListState.endowCode.endowcodeGoodIndex.map(function (e) {
                   return s.goodsListState.goodsMap.get(e);
@@ -6328,11 +6325,11 @@ var DrawerBody$3 = function DrawerBody(props) {
                 if (!endowCodeGood.some(function (e) {
                   return bytesLnegth((e === null || e === void 0 ? void 0 : e.itemName) || '') > 92;
                 })) {
-                  _context10.next = 5;
+                  _context11.next = 5;
                   break;
                 }
-                _context10.next = 5;
+                _context11.next = 5;
                 return function () {
                   return new Promise(function (resolve) {
                     confirm({
@@ -6362,14 +6359,14 @@ var DrawerBody$3 = function DrawerBody(props) {
               case 7:
               case "end":
-                return _context10.stop();
+                return _context11.stop();
             }
           }
-        }, _callee10);
+        }, _callee11);
       }));
       return function (_x9) {
-        return _ref10.apply(this, arguments);
+        return _ref11.apply(this, arguments);
       };
     }())();
   }, [controller]);
@@ -6378,23 +6375,23 @@ var DrawerBody$3 = function DrawerBody(props) {
     antd.FormEffectHooks.onFieldValueChange$('taxRate').subscribe(function (e) {
       setTaxRate(e.value);
       actions.setFieldState('taxFreeType', /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(s) {
-          return regeneratorRuntime.wrap(function _callee11$(_context11) {
+        var _ref12 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12(s) {
+          return regeneratorRuntime.wrap(function _callee12$(_context12) {
             while (1) {
-              switch (_context11.prev = _context11.next) {
+              switch (_context12.prev = _context12.next) {
                 case 0:
                   if (e.value !== 0) s.value = undefined;
                 case 1:
                 case "end":
-                  return _context11.stop();
+                  return _context12.stop();
               }
             }
-          }, _callee11);
+          }, _callee12);
         }));
         return function (_x10) {
-          return _ref11.apply(this, arguments);
+          return _ref12.apply(this, arguments);
         };
       }());
     }); // 是否享受优惠政策
@@ -6402,23 +6399,23 @@ var DrawerBody$3 = function DrawerBody(props) {
     antd.FormEffectHooks.onFieldValueChange$('favouredPolicyMark').subscribe(function (e) {
       setFavouredPolicyMark(e.value);
       actions.setFieldState('favouredPolicyName', /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12(s) {
-          return regeneratorRuntime.wrap(function _callee12$(_context12) {
+        var _ref13 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13(s) {
+          return regeneratorRuntime.wrap(function _callee13$(_context13) {
             while (1) {
-              switch (_context12.prev = _context12.next) {
+              switch (_context13.prev = _context13.next) {
                 case 0:
                   if (e.value === 0) s.value = undefined;
                 case 1:
                 case "end":
-                  return _context12.stop();
+                  return _context13.stop();
               }
             }
-          }, _callee12);
+          }, _callee13);
         }));
         return function (_x11) {
-          return _ref12.apply(this, arguments);
+          return _ref13.apply(this, arguments);
         };
       }());
     });
@@ -6430,7 +6427,7 @@ var DrawerBody$3 = function DrawerBody(props) {
   return /*#__PURE__*/React__default['default'].createElement(antd.SchemaForm, {
     actions: actions,
     components: _objectSpread2(_objectSpread2({}, components), {}, {
-      showSearch: !!getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch
+      showSearch: !!controller.state.goodsListState.endowCode.getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch
     }),
     effects: effects
   }, /*#__PURE__*/React__default['default'].createElement(antd.FormButtonGroup, null, /*#__PURE__*/React__default['default'].createElement(antd.SchemaMarkupField, {
@@ -6507,23 +6504,23 @@ var DrawerBody$3 = function DrawerBody(props) {
   }, "\u786E\u5B9A"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Button, {
     onClick: function onClick() {
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13(s) {
-          return regeneratorRuntime.wrap(function _callee13$(_context13) {
+        var _ref14 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14(s) {
+          return regeneratorRuntime.wrap(function _callee14$(_context14) {
             while (1) {
-              switch (_context13.prev = _context13.next) {
+              switch (_context14.prev = _context14.next) {
                 case 0:
-                  return _context13.abrupt("return", s.goodsListState.endowCode.endowcodeGoodIndex = []);
+                  return _context14.abrupt("return", s.goodsListState.endowCode.endowcodeGoodIndex = []);
                 case 1:
                 case "end":
-                  return _context13.stop();
+                  return _context14.stop();
               }
             }
-          }, _callee13);
+          }, _callee14);
         }));
         return function (_x12) {
-          return _ref13.apply(this, arguments);
+          return _ref14.apply(this, arguments);
         };
       }())();
     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -28,7 +28,7 @@
     "@formily/antd-components": "^1.3.17",
     "@types/uuid": "^8.3.0",
     "classnames": "^2.3.1",
-    "grey-react-box": "^0.2.17",
+    "grey-react-box": "^0.2.20",
     "kts-components-antd-x3": "^3.26.20-5",
     "mathjs": "^9.4.2",
     "next": "^11.0.1",

package/src/Invoice/_test/endowCode/index.tsx CHANGED Viewed

@@ -63,8 +63,8 @@ class MyController1 extends Invoice.InvoiceController {
   getTaxCategoryCodeList = this.pipeline(async (s) => {
     console.log('===> 准备赋码的货物索引列表', s.goodsListState.endowCode.endowcodeGoodIndex);
-    s.goodsListState.endowCode.getTaxCategoryCodeTree = async (value) => {
+    s.goodsListState.endowCode.getTaxCategoryCodeTree = async (taxCategoryCode?: string | undefined, val?: string | undefined) => {
+      if(! taxCategoryCode && !val) return [];
       return moke.map(e => {
         return {
           label: `${e.taxCategoryCode}-${e.shorthand}`,
@@ -73,7 +73,7 @@ class MyController1 extends Invoice.InvoiceController {
           pid: e.pid
         }
       })
-    };
+    };;
   });
 }

package/src/Invoice/ui/EndowCodeDrawer/index.tsx CHANGED Viewed

@@ -105,7 +105,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   const favouredPolicyNameList = controller.useMemo(s => s.goodsListState.endowCode.favouredPolicyNameList, []);
   /** 优惠政策类型列表 */
-  const getTaxCategoryCodeTree = controller.useMemo(s => s.goodsListState.endowCode.getTaxCategoryCodeTree, []);
+  // const getTaxCategoryCodeTree = controller.useMemo(s => s.goodsListState.endowCode.getTaxCategoryCodeTree, []);
   /** 税率 */
   const [taxRate, setTaxRate] = React.useState<number>(0);
@@ -229,11 +229,11 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       setVisible(false);
     }, [list, actions, readOnlyTaxRate])
-    const getTaxCategoryCodeTree = controller.useMemo(s => s.goodsListState.endowCode.getTaxCategoryCodeTree || (() => []), []);
     React.useEffect(() => {
       (async () => {
-        setList(await getTaxCategoryCodeTree(filter?.taxCategoryCode, filter?.val) || []);
+        const fn = controller.state.goodsListState.endowCode.getTaxCategoryCodeTree || (async () => []);
+        const list = await fn(filter?.taxCategoryCode, filter?.val);
+        setList(list || []);
       })()
     }, [filter])
@@ -371,7 +371,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   }, [controller]);
   return (
-    <SchemaForm actions={actions} components={{ ...components, showSearch: !!getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch }} effects={effects}>
+    <SchemaForm actions={actions} components={{ ...components, showSearch: !!controller.state.goodsListState.endowCode.getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch }} effects={effects}>
       <FormButtonGroup>
         <Field
           name="taxClassificationCode"