npm - kts-component-invoice-operate - Versions diffs - 3.2.217 → 3.2.218 - Mend

kts-component-invoice-operate 3.2.217 → 3.2.218

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 (8) hide show

package/dist/index.esm.js +75 -42
package/dist/index.js +75 -42
package/package.json +1 -1
package/src/Invoice/Invoice-digtal/_test/realEstateInfo/index.tsx +16 -7
package/src/Invoice/ui/digtal/Architecture/index.tsx +1 -1
package/src/Invoice/ui/digtal/FreightList/index.tsx +1 -1
package/src/Invoice/ui/digtal/GoodsList/ui/AddRowButton/index.tsx +8 -0
package/src/Invoice/ui/digtal/RealEstateInfo/index.tsx +1 -1

package/dist/index.esm.js CHANGED Viewed

@@ -19144,43 +19144,76 @@ function addGood$2(_x) {
 function _addGood$1() {
-  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller) {
+    var _controller$formList$;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.next = 2;
-            return controller.saveEditGood();
+            _context5.next = 2;
+            return (_controller$formList$ = controller.formList.get('realEstateInfo')) === null || _controller$formList$ === void 0 ? void 0 : _controller$formList$.validateFields( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        console.log(err, values);
+                        if (!err) {
+                          _context2.next = 4;
+                          break;
+                        }
+                        message$1.error('请先填写发票行信息，再添加新的行');
+                        return _context2.abrupt("return");
+                      case 4:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }
+                }, _callee2);
+              }));
+              return function (_x4, _x5) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
           case 2:
-            _context4.next = 4;
-            return controller.wait();
+            _context5.next = 4;
+            return controller.saveEditGood();
           case 4:
-            _context4.next = 6;
+            _context5.next = 6;
+            return controller.wait();
+          case 6:
+            _context5.next = 8;
             return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
                 var _controller$state$goo;
-                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                   while (1) {
-                    switch (_context3.prev = _context3.next) {
+                    switch (_context4.prev = _context4.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context3.next = 3;
+                          _context4.next = 3;
                           break;
                         }
-                        _context3.next = 3;
+                        _context4.next = 3;
                         return (_controller$state$goo = controller.state.goodsListState.form) === null || _controller$state$goo === void 0 ? void 0 : _controller$state$goo.validateFields( /*#__PURE__*/function () {
-                          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
+                          var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(err, values) {
                             var firstError;
-                            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                               while (1) {
-                                switch (_context2.prev = _context2.next) {
+                                switch (_context3.prev = _context3.next) {
                                   case 0:
                                     if (!err) {
-                                      _context2.next = 4;
+                                      _context3.next = 4;
                                       break;
                                     }
@@ -19189,50 +19222,50 @@ function _addGood$1() {
                                       content: firstError.errors[0].message,
                                       key: '你正在编辑一个货物'
                                     });
-                                    return _context2.abrupt("return");
+                                    return _context3.abrupt("return");
                                   case 4:
                                   case "end":
-                                    return _context2.stop();
+                                    return _context3.stop();
                                 }
                               }
-                            }, _callee2);
+                            }, _callee3);
                           }));
-                          return function (_x5, _x6) {
-                            return _ref3.apply(this, arguments);
+                          return function (_x7, _x8) {
+                            return _ref4.apply(this, arguments);
                           };
                         }());
                       case 3:
-                        _context3.next = 5;
+                        _context4.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
                       case 5:
-                        s.goodsListState.editGood = _context3.sent;
+                        s.goodsListState.editGood = _context4.sent;
                       case 6:
                       case "end":
-                        return _context3.stop();
+                        return _context4.stop();
                     }
                   }
-                }, _callee3);
+                }, _callee4);
               }));
-              return function (_x4) {
-                return _ref2.apply(this, arguments);
+              return function (_x6) {
+                return _ref3.apply(this, arguments);
               };
             }());
-          case 6:
+          case 8:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _addGood$1.apply(this, arguments);
 }
@@ -19242,34 +19275,34 @@ function rollBottom$1(_x2, _x3) {
 }
 function _rollBottom$1() {
-  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
+  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 2;
+            _context6.next = 2;
             return controller.wait();
           case 2:
             cont = rootElement === null || rootElement === void 0 ? void 0 : rootElement.querySelector('.ktsAntX-table-body');
             if (cont) {
-              _context5.next = 5;
+              _context6.next = 5;
               break;
             }
-            return _context5.abrupt("return");
+            return _context6.abrupt("return");
           case 5:
             cont.scrollTop = cont.scrollHeight;
           case 6:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
       }
-    }, _callee5);
+    }, _callee6);
   }));
   return _rollBottom$1.apply(this, arguments);
 }
@@ -24528,7 +24561,7 @@ var RealEstateInfo = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React.createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
+  }, "\u7279\u5B9A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
 });
 var MyDiv$3 = /*#__PURE__*/function (_React$Component) {
@@ -24656,7 +24689,7 @@ var Architecture = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React.createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React.createElement(Row$1, {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React.createElement(Row$1, {
     gutter: [17, 0]
   }, /*#__PURE__*/React.createElement(Col$1, {
     span: 6
@@ -26262,7 +26295,7 @@ var Main$4 = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-freight"
   }, /*#__PURE__*/React.createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React.createElement("div", {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-digtal",
     onClick: function onClick(e) {
       e.stopPropagation();

package/dist/index.js CHANGED Viewed

@@ -19154,43 +19154,76 @@ function addGood$2(_x) {
 function _addGood$1() {
-  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller) {
+    var _controller$formList$;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.next = 2;
-            return controller.saveEditGood();
+            _context5.next = 2;
+            return (_controller$formList$ = controller.formList.get('realEstateInfo')) === null || _controller$formList$ === void 0 ? void 0 : _controller$formList$.validateFields( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        console.log(err, values);
+                        if (!err) {
+                          _context2.next = 4;
+                          break;
+                        }
+                        ktsXui.message.error('请先填写发票行信息，再添加新的行');
+                        return _context2.abrupt("return");
+                      case 4:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }
+                }, _callee2);
+              }));
+              return function (_x4, _x5) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
           case 2:
-            _context4.next = 4;
-            return controller.wait();
+            _context5.next = 4;
+            return controller.saveEditGood();
           case 4:
-            _context4.next = 6;
+            _context5.next = 6;
+            return controller.wait();
+          case 6:
+            _context5.next = 8;
             return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
                 var _controller$state$goo;
-                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                   while (1) {
-                    switch (_context3.prev = _context3.next) {
+                    switch (_context4.prev = _context4.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context3.next = 3;
+                          _context4.next = 3;
                           break;
                         }
-                        _context3.next = 3;
+                        _context4.next = 3;
                         return (_controller$state$goo = controller.state.goodsListState.form) === null || _controller$state$goo === void 0 ? void 0 : _controller$state$goo.validateFields( /*#__PURE__*/function () {
-                          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
+                          var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(err, values) {
                             var firstError;
-                            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                               while (1) {
-                                switch (_context2.prev = _context2.next) {
+                                switch (_context3.prev = _context3.next) {
                                   case 0:
                                     if (!err) {
-                                      _context2.next = 4;
+                                      _context3.next = 4;
                                       break;
                                     }
@@ -19199,50 +19232,50 @@ function _addGood$1() {
                                       content: firstError.errors[0].message,
                                       key: '你正在编辑一个货物'
                                     });
-                                    return _context2.abrupt("return");
+                                    return _context3.abrupt("return");
                                   case 4:
                                   case "end":
-                                    return _context2.stop();
+                                    return _context3.stop();
                                 }
                               }
-                            }, _callee2);
+                            }, _callee3);
                           }));
-                          return function (_x5, _x6) {
-                            return _ref3.apply(this, arguments);
+                          return function (_x7, _x8) {
+                            return _ref4.apply(this, arguments);
                           };
                         }());
                       case 3:
-                        _context3.next = 5;
+                        _context4.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
                       case 5:
-                        s.goodsListState.editGood = _context3.sent;
+                        s.goodsListState.editGood = _context4.sent;
                       case 6:
                       case "end":
-                        return _context3.stop();
+                        return _context4.stop();
                     }
                   }
-                }, _callee3);
+                }, _callee4);
               }));
-              return function (_x4) {
-                return _ref2.apply(this, arguments);
+              return function (_x6) {
+                return _ref3.apply(this, arguments);
               };
             }());
-          case 6:
+          case 8:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _addGood$1.apply(this, arguments);
 }
@@ -19252,34 +19285,34 @@ function rollBottom$1(_x2, _x3) {
 }
 function _rollBottom$1() {
-  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
+  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 2;
+            _context6.next = 2;
             return controller.wait();
           case 2:
             cont = rootElement === null || rootElement === void 0 ? void 0 : rootElement.querySelector('.ktsAntX-table-body');
             if (cont) {
-              _context5.next = 5;
+              _context6.next = 5;
               break;
             }
-            return _context5.abrupt("return");
+            return _context6.abrupt("return");
           case 5:
             cont.scrollTop = cont.scrollHeight;
           case 6:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
       }
-    }, _callee5);
+    }, _callee6);
   }));
   return _rollBottom$1.apply(this, arguments);
 }
@@ -24538,7 +24571,7 @@ var RealEstateInfo = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(f
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
+  }, "\u7279\u5B9A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
 });
 var MyDiv$3 = /*#__PURE__*/function (_React$Component) {
@@ -24666,7 +24699,7 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
     gutter: [17, 0]
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
     span: 6
@@ -26272,7 +26305,7 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
     className: "kts-invoice-operate-freight"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-digtal",
     onClick: function onClick(e) {
       e.stopPropagation();

package/package.json CHANGED Viewed

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

package/src/Invoice/Invoice-digtal/_test/realEstateInfo/index.tsx CHANGED Viewed

@@ -11,18 +11,27 @@ export default () => {
         controller.run(async s => {
         })
     }, [])
-    const onSave =async ()=>{
+    const onSave = async () => {
         const formValues = await controller.validateFields();
         console.log(formValues)
     }
     return (
         <>
-        <Button onClick={onSave}>输出表单内容</Button>
-        <Invoice
-            invoiceType='digtal'
-            controller={controller}
-            specialInfor={<Invoice.RealEstateInfo />}
-        />
+            <Button onClick={onSave}>输出表单内容</Button>
+            <Invoice
+                invoiceType='digtal'
+                controller={controller}
+                specialInfor={<Invoice.RealEstateInfo realEstateAddressOptions={[
+                    {
+                        "code": "11",
+                        "name": "北京市"
+                    }] || []}
+                    realEstateAddressFieldNames={{
+                        label: 'name',
+                        value: 'name',
+                        children: 'children'
+                    }} />}
+            />
         </>
     )
 };

package/src/Invoice/ui/digtal/Architecture/index.tsx CHANGED Viewed

@@ -40,7 +40,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
     return (
         <div className="kts-invoice-operate-real-estate-info-digtal">
-            <div className='real-estate-info-digtal-label' >特殊信息-建筑服务</div>
+            <div className='real-estate-info-digtal-label' >特定信息-建筑服务</div>
             <Row gutter={[17, 0]}>
                 <Col span={6} >
                     <Form.Item label='土地增值税项目编号' >

package/src/Invoice/ui/digtal/FreightList/index.tsx CHANGED Viewed

@@ -94,7 +94,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   //  controller.useForm('freightInfo', form);
   return (
     <div className="kts-invoice-operate-freight">
-      <div className='real-estate-info-digtal-label' >特殊信息-货物运输</div>
+      <div className='real-estate-info-digtal-label' >特定信息-货物运输</div>
       <div className="kts-invoice-operate-goods-list-digtal" onClick={(e) => { e.stopPropagation() }} >
         <div className="kts-invoice-operate-freight-list-able">
           {/* 添加行 */}

package/src/Invoice/ui/digtal/GoodsList/ui/AddRowButton/index.tsx CHANGED Viewed

@@ -45,6 +45,13 @@ export default () => {
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
+  await controller.formList.get('realEstateInfo')?.validateFields(async (err: any, values: any) => {
+    console.log(err, values)
+    if (err) {
+      message.error('请先填写发票行信息，再添加新的行');
+      return;
+    }
+  });
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {
@@ -64,6 +71,7 @@ async function addGood(controller: InvoiceController) {
           return;
         }
       });
     }
     s.goodsListState.editGood = await controller.addGood({ taxRate: s.goodsListState.defaultRate, lineAttribute: LineAttributeType.正常 });
   });

package/src/Invoice/ui/digtal/RealEstateInfo/index.tsx CHANGED Viewed

@@ -187,7 +187,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
     }
     return (
         <div className="kts-invoice-operate-real-estate-info-digtal">
-            <div className='real-estate-info-digtal-label' >特殊信息-不动产经营租赁服务</div>
+            <div className='real-estate-info-digtal-label' >特定信息-不动产经营租赁服务</div>
             {getList()}
         </div>