kts-component-invoice-operate 3.2.219 → 3.2.220

package/dist/Invoice/InvoiceController/InvoiceControllerState/index.d.ts

@@ -54,4 +54,5 @@ export default class InvoiceControllerState {
      * 货物运输列表
      */
     freightListState: FreightListState;
+    addGoodsCheck?: any;
 }

package/dist/index.esm.js

@@ -1267,6 +1267,7 @@ var InvoiceControllerState = /*#__PURE__*/_createClass(function InvoiceControlle
   this.autoComplete = new AutoComplete();
   this.taxClassificationProps = void 0;
   this.freightListState = new FreightListState();
+  this.addGoodsCheck = void 0;
 });
 
 /**
@@ -10685,36 +10686,54 @@ var AddRowButton = (function (props) {
   var disabled = React.useMemo(function () {
     return typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue;
   }, [goodMax, goodsNum, searchValue]);
-  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
-        switch (_context.prev = _context.next) {
+        switch (_context2.prev = _context2.next) {
           case 0:
-            _context.t0 = props.addGoodsCheck;
+            _context2.next = 2;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!s.addGoodsCheck) {
+                          _context.next = 3;
+                          break;
+                        }
 
-            if (!_context.t0) {
-              _context.next = 4;
-              break;
-            }
+                        _context.next = 3;
+                        return s.addGoodsCheck();
 
-            _context.next = 4;
-            return props.addGoodsCheck();
+                      case 3:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
 
-          case 4:
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+
+          case 2:
             console.log('continue');
-            _context.next = 7;
+            _context2.next = 5;
             return addGood$1(controller);
 
-          case 7:
-            _context.next = 9;
+          case 5:
+            _context2.next = 7;
             return rollBottom(controller, rootElement);
 
-          case 9:
+          case 7:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
       }
-    }, _callee);
+    }, _callee2);
   })), [controller, rootElement]);
   if (isAddRow === false) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (model === 'prefab') return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -10726,35 +10745,35 @@ var AddRowButton = (function (props) {
 });
 /** 添加一个空货物 */
 
-function addGood$1(_x) {
+function addGood$1(_x2) {
   return _addGood.apply(this, arguments);
 }
 /** 货物列表，滚动到底部 */
 
 
 function _addGood() {
-  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(controller) {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 2;
+            _context4.next = 2;
             return controller.saveEditGood();
 
           case 2:
-            _context3.next = 4;
+            _context4.next = 4;
             return controller.wait();
 
           case 4:
-            _context3.next = 6;
+            _context4.next = 6;
             return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
-                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) {
-                    switch (_context2.prev = _context2.next) {
+                    switch (_context3.prev = _context3.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context2.next = 3;
+                          _context3.next = 3;
                           break;
                         }
 
@@ -10762,74 +10781,74 @@ function _addGood() {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context2.abrupt("return");
+                        return _context3.abrupt("return");
 
                       case 3:
-                        _context2.next = 5;
+                        _context3.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
                       case 5:
-                        s.goodsListState.editGood = _context2.sent;
+                        s.goodsListState.editGood = _context3.sent;
 
                       case 6:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
                   }
-                }, _callee2);
+                }, _callee3);
               }));
 
-              return function (_x4) {
-                return _ref2.apply(this, arguments);
+              return function (_x5) {
+                return _ref3.apply(this, arguments);
               };
             }());
 
           case 6:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _addGood.apply(this, arguments);
 }
 
-function rollBottom(_x2, _x3) {
+function rollBottom(_x3, _x4) {
   return _rollBottom.apply(this, arguments);
 }
 
 function _rollBottom() {
-  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller, rootElement) {
+  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.next = 2;
+            _context5.next = 2;
             return controller.wait();
 
           case 2:
             cont = rootElement === null || rootElement === void 0 ? void 0 : rootElement.querySelector('.ktsAntX-table-body');
 
             if (cont) {
-              _context4.next = 5;
+              _context5.next = 5;
               break;
             }
 
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
 
           case 5:
             cont.scrollTop = cont.scrollHeight;
 
           case 6:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _rollBottom.apply(this, arguments);
 }

package/dist/index.js

@@ -1277,6 +1277,7 @@ var InvoiceControllerState = /*#__PURE__*/_createClass(function InvoiceControlle
   this.autoComplete = new AutoComplete();
   this.taxClassificationProps = void 0;
   this.freightListState = new FreightListState();
+  this.addGoodsCheck = void 0;
 });
 
 /**
@@ -10695,36 +10696,54 @@ var AddRowButton = (function (props) {
   var disabled = React__default['default'].useMemo(function () {
     return typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue;
   }, [goodMax, goodsNum, searchValue]);
-  var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
+  var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
-        switch (_context.prev = _context.next) {
+        switch (_context2.prev = _context2.next) {
           case 0:
-            _context.t0 = props.addGoodsCheck;
+            _context2.next = 2;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!s.addGoodsCheck) {
+                          _context.next = 3;
+                          break;
+                        }
 
-            if (!_context.t0) {
-              _context.next = 4;
-              break;
-            }
+                        _context.next = 3;
+                        return s.addGoodsCheck();
 
-            _context.next = 4;
-            return props.addGoodsCheck();
+                      case 3:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
 
-          case 4:
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+
+          case 2:
             console.log('continue');
-            _context.next = 7;
+            _context2.next = 5;
             return addGood$1(controller);
 
-          case 7:
-            _context.next = 9;
+          case 5:
+            _context2.next = 7;
             return rollBottom(controller, rootElement);
 
-          case 9:
+          case 7:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
       }
-    }, _callee);
+    }, _callee2);
   })), [controller, rootElement]);
   if (isAddRow === false) return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
   if (model === 'prefab') return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
@@ -10736,35 +10755,35 @@ var AddRowButton = (function (props) {
 });
 /** 添加一个空货物 */
 
-function addGood$1(_x) {
+function addGood$1(_x2) {
   return _addGood.apply(this, arguments);
 }
 /** 货物列表，滚动到底部 */
 
 
 function _addGood() {
-  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(controller) {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 2;
+            _context4.next = 2;
             return controller.saveEditGood();
 
           case 2:
-            _context3.next = 4;
+            _context4.next = 4;
             return controller.wait();
 
           case 4:
-            _context3.next = 6;
+            _context4.next = 6;
             return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
-                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) {
-                    switch (_context2.prev = _context2.next) {
+                    switch (_context3.prev = _context3.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context2.next = 3;
+                          _context3.next = 3;
                           break;
                         }
 
@@ -10772,74 +10791,74 @@ function _addGood() {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context2.abrupt("return");
+                        return _context3.abrupt("return");
 
                       case 3:
-                        _context2.next = 5;
+                        _context3.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
                       case 5:
-                        s.goodsListState.editGood = _context2.sent;
+                        s.goodsListState.editGood = _context3.sent;
 
                       case 6:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
                   }
-                }, _callee2);
+                }, _callee3);
               }));
 
-              return function (_x4) {
-                return _ref2.apply(this, arguments);
+              return function (_x5) {
+                return _ref3.apply(this, arguments);
               };
             }());
 
           case 6:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _addGood.apply(this, arguments);
 }
 
-function rollBottom(_x2, _x3) {
+function rollBottom(_x3, _x4) {
   return _rollBottom.apply(this, arguments);
 }
 
 function _rollBottom() {
-  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller, rootElement) {
+  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.next = 2;
+            _context5.next = 2;
             return controller.wait();
 
           case 2:
             cont = rootElement === null || rootElement === void 0 ? void 0 : rootElement.querySelector('.ktsAntX-table-body');
 
             if (cont) {
-              _context4.next = 5;
+              _context5.next = 5;
               break;
             }
 
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
 
           case 5:
             cont.scrollTop = cont.scrollHeight;
 
           case 6:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _rollBottom.apply(this, arguments);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.219",
+  "version": "3.2.220",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/InvoiceControllerState/index.ts

@@ -69,4 +69,5 @@ export default class InvoiceControllerState {
    */
   freightListState = new FreightListState();
 
+  addGoodsCheck?: any;
 }

package/src/Invoice/_test/deduction/index.tsx

@@ -6,7 +6,13 @@ import 'antd/dist/antd.css';
 export default () => {
 
     const controller = React.useMemo(() => new MyController1(), [])
+    React.useEffect(() => {
+        controller.run(async s => {
+            s.addGoodsCheck=checkGood;
+           
 
+        })
+    }, [])
     const [deduction, setDeduction] = React.useState<number | undefined>(0);
 
     const [goodMax, setgoodMax] = React.useState(0);
@@ -50,7 +56,7 @@ export default () => {
             goodsList={
                 <Invoice.GoodsList
 
-                    addGoodsCheck={checkGood}
+                    // addGoodsCheck={checkGood}
                 // isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
                 // isAddDiscount={false}           // 不能添加折扣行
                 // goodMax={goodMax}               // 控制能可以添加的货物函数

package/src/Invoice/ui/default/GoodsList/ui/AddRowButton/index.tsx

@@ -26,7 +26,11 @@ export default (props: any) => {
   const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
 
   const onClick = React.useCallback(async () => {
-    props.addGoodsCheck &&await props.addGoodsCheck();
+    await controller.run(async (s) => {
+      if (s.addGoodsCheck) {  
+        await s.addGoodsCheck();
+      }
+    });
     console.log('continue')
     await addGood(controller);
     await rollBottom(controller, rootElement);
@@ -45,7 +49,7 @@ export default (props: any) => {
 
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
- 
+
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {