kts-component-invoice-operate 2.0.1 → 2.0.2

package/dist/index.esm.js

@@ -7,6 +7,7 @@ import { v4 } from 'uuid';
 import classnames from 'classnames';
 import { Input as Input$1, NumberPicker } from '@formily/antd-components';
 import { createAsyncFormActions, FormEffectHooks, SchemaForm, FormButtonGroup, SchemaMarkupField } from '@formily/antd';
+import { Form as Form$1, Drawer as Drawer$1 } from 'kts-xui';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -976,7 +977,6 @@ var ProductComparison = /*#__PURE__*/_createClass(function ProductComparison() {
   _classCallCheck(this, ProductComparison);
 
   this.onComply = void 0;
-  this.onUpdateComparisonTable = void 0;
 });
 
 var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
@@ -2980,7 +2980,7 @@ var useCommodityComparisonButton = (function () {
 
 
   var disabled = controller.useMemo(function (s) {
-    if (s.goodsListState.selectedGoodIndex.length <= 0) return true;
+    return s.goodsListState.selectedGoodIndex.length <= 0;
   }, []);
   /** 点击了 */
 
@@ -3033,7 +3033,7 @@ var useCommodityComparisonButton = (function () {
                           if (!t) return undefined;
                           return _objectSpread2(_objectSpread2({}, t), {}, {
                             itemName: (_getSN = getSN(t.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.full,
-                            itemNameOther: (_getSN2 = getSN(t.itemNameOther)) === null || _getSN2 === void 0 ? void 0 : _getSN2.full
+                            itemNameSelf: (_getSN2 = getSN(t.itemNameSelf)) === null || _getSN2 === void 0 ? void 0 : _getSN2.full
                           });
                         }).filter(function (e) {
                           return !!e;
@@ -3050,13 +3050,11 @@ var useCommodityComparisonButton = (function () {
                           var vt = s.goodsListState.goodsMap.get(e.$index);
                           if (!vt) return undefined;
                           vt.itemName = e.itemName ? setShorthand(e.itemName, (_getSN3 = getSN(vt.itemName)) === null || _getSN3 === void 0 ? void 0 : _getSN3.shorthand) : vt.itemName;
-                          vt.itemNameOther = e.itemNameOther ? setShorthand(e.itemNameOther, (_getSN4 = getSN(vt.itemNameOther)) === null || _getSN4 === void 0 ? void 0 : _getSN4.shorthand) : vt.itemNameOther;
-                          vt.unit = e.unit ? e.unit : vt.unit;
-                          vt.unitOther = e.unitOther ? e.unitOther : vt.unitOther;
+                          vt.itemNameSelf = e.itemNameSelf ? setShorthand(e.itemNameSelf, (_getSN4 = getSN(vt.itemNameSelf)) === null || _getSN4 === void 0 ? void 0 : _getSN4.shorthand) : vt.itemNameSelf;
                           vt.itemModelName = e.itemModelName ? e.itemModelName : vt.itemModelName;
-                          vt.itemModelNameOther = e.itemModelNameOther ? e.itemModelNameOther : vt.itemModelNameOther;
+                          vt.itemModelNameSelf = e.itemModelNameSelf ? e.itemModelNameSelf : vt.itemModelNameSelf;
                           vt.itemCode = e.itemCode ? e.itemCode : vt.itemCode;
-                          vt.itemCodeOther = e.itemCodeOther ? e.itemCodeOther : vt.itemCodeOther;
+                          vt.itemCodeSelf = e.itemCodeSelf ? e.itemCodeSelf : vt.itemCodeSelf;
                         });
 
                       case 10:
@@ -3087,7 +3085,7 @@ var useCommodityComparisonButton = (function () {
       disabled: disabled,
       onClick: onClick
     }, "\u6267\u884C\u5546\u54C1\u5BF9\u7167");
-  }, []);
+  }, [disabled, onClick, onComply]);
   return {
     menuItem: menuItem
   };
@@ -9869,11 +9867,11 @@ var onChangeItemName = /*#__PURE__*/function () {
 
                         _context12.next = 5;
                         return controller.setEditGood({
-                          itemName: value
+                          itemNameSelf: value
                         });
 
                       case 5:
-                        _context12.t0 = record.itemNameOther;
+                        _context12.t0 = record.itemName;
 
                         if (!_context12.t0) {
                           _context12.next = 9;
@@ -9882,7 +9880,7 @@ var onChangeItemName = /*#__PURE__*/function () {
 
                         _context12.next = 9;
                         return controller.setEditGood({
-                          itemNameOther: setShorthand(record.itemNameOther, shorthand)
+                          itemName: setShorthand(record.itemName, shorthand)
                         });
 
                       case 9:
@@ -9892,11 +9890,11 @@ var onChangeItemName = /*#__PURE__*/function () {
                       case 11:
                         _context12.next = 13;
                         return controller.setEditGood({
-                          itemNameOther: value
+                          itemName: value
                         });
 
                       case 13:
-                        _context12.t1 = record.itemName;
+                        _context12.t1 = record.itemNameSelf;
 
                         if (!_context12.t1) {
                           _context12.next = 17;
@@ -9905,7 +9903,7 @@ var onChangeItemName = /*#__PURE__*/function () {
 
                         _context12.next = 17;
                         return controller.setEditGood({
-                          itemName: setShorthand(record.itemName, shorthand)
+                          itemNameSelf: setShorthand(record.itemNameSelf, shorthand)
                         });
 
                       case 17:
@@ -10174,7 +10172,7 @@ var useColumns = (function (form) {
               display: 'flex'
             }
           }, getFieldDecorator('itemName', {
-            initialValue: isMyShow ? record.itemName : record.itemNameOther,
+            initialValue: isMyShow ? record.itemNameSelf : record.itemName,
             rules: [{
               validator: function () {
                 var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, __, callback) {
@@ -10189,7 +10187,7 @@ var useColumns = (function (form) {
                         case 2:
                           value = controller.state.goodsListState.editGood;
 
-                          if (!(!(value === null || value === void 0 ? void 0 : value.itemName) && !(value === null || value === void 0 ? void 0 : value.itemNameOther))) {
+                          if (!(!(value === null || value === void 0 ? void 0 : value.itemName) && !(value === null || value === void 0 ? void 0 : value.itemNameSelf))) {
                             _context.next = 7;
                             break;
                           }
@@ -10257,8 +10255,8 @@ var useColumns = (function (form) {
           }))));
         } else {
           return React.createElement(MyItemNameDiv, {
-            valueT: formatSearch(record.itemName, searchValue),
-            valueF: record.itemNameOther,
+            valueT: formatSearch(record.itemNameSelf, searchValue),
+            valueF: formatSearch(record.itemName, searchValue),
             isMyShow: isMyShow
           }); // return (
           //   <span style={{ padding: '0 10px' }}>{formatSearch(value, searchValue)}</span>
@@ -10272,7 +10270,7 @@ var useColumns = (function (form) {
       render: function render(_, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return React.createElement(Form.Item, null, getFieldDecorator('itemModelName', {
-            initialValue: isMyShow ? editGood.itemModelName : editGood.itemModelNameOther
+            initialValue: isMyShow ? editGood.itemModelNameSelf : editGood.itemModelName
           })(React.createElement(MyInput, {
             onChange: function () {
               var _onChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
@@ -10285,7 +10283,7 @@ var useColumns = (function (form) {
                         return controller.wait();
 
                       case 2:
-                        key = isMyShow ? 'itemModelName' : 'itemModelNameOther';
+                        key = isMyShow ? 'itemModelNameSelf' : 'itemModelName';
                         value = {};
                         value[key] = form.getFieldsValue().itemModelName;
                         controller.setEditGood(value);
@@ -10307,10 +10305,10 @@ var useColumns = (function (form) {
           })));
         } else {
           return React.createElement(MyItemNameDiv, {
-            valueT: formatSearch(record.itemModelName, searchValue),
-            valueF: formatSearch(record.itemModelNameOther, searchValue),
+            valueT: formatSearch(record.itemModelNameSelf, searchValue),
+            valueF: formatSearch(record.itemModelName, searchValue),
             isMyShow: isMyShow
-          }); // return <span style={{ padding: '0 10px' }}>{formatSearch(value, searchValue)}</span>;
+          });
         }
       }
     }, {
@@ -10358,11 +10356,7 @@ var useColumns = (function (form) {
             }()
           })));
         } else {
-          return React.createElement(MyItemNameDiv, {
-            valueT: record.unit,
-            valueF: record.unitOther,
-            isMyShow: isMyShow
-          });
+          return record.unit;
         }
       }
     }, {
@@ -10759,6 +10753,7 @@ var useColumns = (function (form) {
               width: '100%'
             },
             onChange: function onChange() {
+              setChangeField('taxRate');
               onChangeTaxRate(controller, form, record);
             }
           }, taxRateList.map(function (e, i) {
@@ -10785,7 +10780,9 @@ var useColumns = (function (form) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return getFieldDecorator('taxAmount', {
             initialValue: editGood.taxAmount
-          })(React.createElement(MyDiv, null));
+          })(React.createElement(MyDiv, {
+            loading: isCipher(changeField, 'taxAmount')
+          }));
         } else {
           return React.createElement("span", {
             style: {
@@ -10881,11 +10878,21 @@ var MyDiv = /*#__PURE__*/function (_React$Component2) {
   _createClass(MyDiv, [{
     key: "render",
     value: function render() {
-      return React.createElement("span", {
-        style: {
-          padding: '0 10px'
-        }
-      }, this.props.value);
+      if (this.props.loading) {
+        return React.createElement(Spin, {
+          size: "small"
+        }, React.createElement("span", {
+          style: {
+            padding: '0 10px'
+          }
+        }, this.props.value));
+      } else {
+        return React.createElement("span", {
+          style: {
+            padding: '0 10px'
+          }
+        }, this.props.value);
+      }
     }
   }]);
 
@@ -10953,7 +10960,9 @@ var MyItemNameDiv = /*#__PURE__*/function (_React$Component3) {
 function formatSearch(value, search) {
   if (!value || !search) return value;
 
-  var __html = value.split(new RegExp(search, 'g')).join("<span class=\"kts-invoice-operate-goods-list-table-search-protrude\" >".concat(search, "</span>"));
+  var __html = ucoding(value).split(new RegExp(ucoding(search), 'g')).map(function (e) {
+    return dcoding(e);
+  }).join("<span class=\"kts-invoice-operate-goods-list-table-search-protrude\" >".concat(search, "</span>"));
 
   return React.createElement("span", {
     dangerouslySetInnerHTML: {
@@ -10961,6 +10970,22 @@ function formatSearch(value, search) {
     }
   });
 }
+/** 编码 */
+
+
+function ucoding(v) {
+  return v.split('').map(function (e) {
+    return "U".concat(e.charCodeAt(0), "E");
+  }).join('');
+}
+/** 解码 */
+
+
+function dcoding(v) {
+  return v.split('U').map(function (e) {
+    return e ? String.fromCharCode(parseInt(e.replace('E', ''))) : '';
+  }).join('');
+}
 
 var useOnRow = (function () {
   /** 控制器 */
@@ -12565,13 +12590,12 @@ var DrawerBody$2 = function DrawerBody() {
 
 
                       if (s.goodsListState.isMyShow) {
-                        s.goodsListState.form.setFieldsValue(editGood);
-                      } else {
                         s.goodsListState.form.setFieldsValue(_objectSpread2(_objectSpread2({}, editGood), {}, {
-                          itemName: editGood.itemNameOther,
-                          unit: editGood.unitOther,
-                          itemModelName: editGood.itemModelNameOther
+                          itemName: editGood.itemNameSelf,
+                          itemModelName: editGood.itemModelNameSelf
                         }));
+                      } else {
+                        s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood));
                       }
 
                       s.goodsListState.importGoods.isVisibleDrawer = false;
@@ -12621,10 +12645,10 @@ var getItemName$1 = function getItemName(record, editGood) {
     return "*".concat(shorthand, "*").concat(record.itemName);
   }
 
-  shorthand = (_getSN = getSN(editGood.itemNameOther)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand;
+  shorthand = (_getSN = getSN(editGood.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand;
 
   if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemName);
+    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
   }
 
   return record.itemName;
@@ -12632,15 +12656,15 @@ var getItemName$1 = function getItemName(record, editGood) {
 
 
 var getItemNameOther = function getItemNameOther(record, editGood) {
-  if (!editGood.itemNameOther) return editGood.itemNameOther;
+  if (!editGood.itemName) return editGood.itemName;
   var shorthand;
   shorthand = record.shorthand;
 
   if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemName);
+    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
   }
 
-  return record.itemNameOther;
+  return record.itemName;
 };
 
 /**
@@ -13202,7 +13226,7 @@ var DrawerBody$3 = function DrawerBody(props) {
                 endowCodeGood.forEach(function (good) {
                   if (!good) return;
                   good.itemName = setShorthand(good.itemName, values.shorthand);
-                  good.itemNameOther = setShorthand(good.itemNameOther, values.shorthand); // const name = getItemName(good.itemName, values.shorthand);
+                  good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand); // const name = getItemName(good.itemName, values.shorthand);
                   // good.itemName = getItemName(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
 
                   good.taxClassificationCode = values.taxClassificationCode;
@@ -13452,11 +13476,13 @@ var getShorthand = function getShorthand(value) {
   }
 };
 
-var AddComparisonDrawer = decorator(Form.create())(function (props) {
-  var form = props.form;
-  var getFieldDecorator = form.getFieldDecorator;
+function AddComparisonDrawer() {
+  var _Form$useForm = Form$1.useForm(),
+      _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+      form = _Form$useForm2[0];
   /** 控制器 */
 
+
   var controller = Invoice.useInvoiceController();
   /** 正在 添加商品对照 的货物索引 */
 
@@ -13500,9 +13526,7 @@ var AddComparisonDrawer = decorator(Form.create())(function (props) {
   var onSubmit = React.useCallback(function () {
     controller.run( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
-        var _getSN, _getSN2, _s$goodsListState, _s$goodsListState$pro;
-
-        var _yield$validateFields, err, values, shorthand;
+        var _getSN, _getSN2, values, shorthand;
 
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) {
@@ -13516,49 +13540,34 @@ var AddComparisonDrawer = decorator(Form.create())(function (props) {
                 return _context2.abrupt("return");
 
               case 2:
-                _context2.next = 4;
-                return validateFields$1(form);
-
-              case 4:
-                _yield$validateFields = _context2.sent;
-                err = _yield$validateFields.err;
-                values = _yield$validateFields.values;
-
-                if (!err) {
-                  _context2.next = 9;
-                  break;
-                }
-
-                return _context2.abrupt("return");
+                _context2.prev = 2;
+                _context2.next = 5;
+                return form.validateFields();
 
-              case 9:
-                shorthand = s.goodsListState.isMyShow ? (_getSN = getSN(good.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand : (_getSN2 = getSN(good.itemNameOther)) === null || _getSN2 === void 0 ? void 0 : _getSN2.shorthand;
+              case 5:
+                values = _context2.sent;
+                shorthand = s.goodsListState.isMyShow ? (_getSN = getSN(good.itemNameSelf)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand : (_getSN2 = getSN(good.itemName)) === null || _getSN2 === void 0 ? void 0 : _getSN2.shorthand;
                 good.itemCode = values.itemCode;
-                good.itemCodeOther = values.itemCodeOther;
+                good.itemCodeSelf = values.itemCodeSelf;
                 good.itemName = shorthand ? "*".concat(shorthand, "*").concat(values.itemName) : values.itemName;
-                good.itemNameOther = shorthand ? "*".concat(shorthand, "*").concat(values.itemNameOther) : values.itemNameOther;
+                good.itemNameSelf = shorthand ? "*".concat(shorthand, "*").concat(values.itemNameSelf) : values.itemNameSelf;
                 good.itemModelName = values.itemModelName;
-                good.itemModelNameOther = values.itemModelNameOther;
-                good.unit = values.unit;
-                good.unitOther = values.unitOther;
+                good.itemModelNameSelf = values.itemModelNameSelf;
                 s.goodsListState.addComparisonIndex = undefined;
                 s.goodsListState.goodsList = _toConsumableArray(s.goodsListState.goodsList);
+                _context2.next = 19;
+                break;
 
-                if (!(((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : (_s$goodsListState$pro = _s$goodsListState.productComparison) === null || _s$goodsListState$pro === void 0 ? void 0 : _s$goodsListState$pro.onUpdateComparisonTable) && values.isUpdate)) {
-                  _context2.next = 24;
-                  break;
-                }
-
-                debugger;
-                _context2.next = 24;
-                return s.goodsListState.productComparison.onUpdateComparisonTable(good, values);
+              case 17:
+                _context2.prev = 17;
+                _context2.t0 = _context2["catch"](2);
 
-              case 24:
+              case 19:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2);
+        }, _callee2, null, [[2, 17]]);
       }));
 
       return function (_x2) {
@@ -13574,115 +13583,74 @@ var AddComparisonDrawer = decorator(Form.create())(function (props) {
 
       form.setFieldsValue(_objectSpread2(_objectSpread2({}, good), {}, {
         itemName: (_getSN3 = getSN(good.itemName)) === null || _getSN3 === void 0 ? void 0 : _getSN3.full,
-        itemNameOther: (_getSN4 = getSN(good.itemNameOther)) === null || _getSN4 === void 0 ? void 0 : _getSN4.full
+        itemNameSelf: (_getSN4 = getSN(good.itemNameSelf)) === null || _getSN4 === void 0 ? void 0 : _getSN4.full
       }));
     }
   }, [good]);
-  return React.createElement(Drawer, {
+  return React.createElement(Drawer$1, {
     width: 500,
     onClose: onClose,
     placement: "right",
     title: "\u6DFB\u52A0\u5546\u54C1\u5BF9\u7167",
-    visible: !!addComparisonIndex,
-    drawerStyle: {
-      display: 'flex',
-      flexDirection: 'column'
-    },
-    bodyStyle: {
-      flex: 1,
-      display: 'flex',
-      flexDirection: 'column'
-    }
-  }, React.createElement(Form, {
+    visible: !!good,
+    footer: React.createElement("div", {
+      style: {
+        display: 'flex',
+        justifyContent: 'flex-end',
+        gap: 10
+      }
+    }, React.createElement(Button, {
+      type: "primary",
+      onClick: onSubmit
+    }, "\u63D0\u4EA4"), React.createElement(Button, {
+      onClick: onClose
+    }, "\u53D6\u6D88"))
+  }, !!good && React.createElement(Form$1, {
     layout: "vertical",
     style: {
       flex: 1
-    }
+    },
+    form: form
   }, React.createElement(Row, {
     gutter: [8, 8]
   }, React.createElement(Col, {
     span: 12
-  }, getFieldDecorator('itemCode', {})(React.createElement(Form.Item, {
+  }, React.createElement(Form$1.Item, {
+    name: "itemCodeSelf",
     label: "\u6211\u65B9\u5546\u54C1\u7F16\u7801"
-  }, React.createElement(Input, null)))), React.createElement(Col, {
+  }, React.createElement(Input, null))), React.createElement(Col, {
     span: 12
-  }, getFieldDecorator('itemCodeOther', {})(React.createElement(Form.Item, {
+  }, React.createElement(Form$1.Item, {
+    name: "itemCode",
     label: "\u5BF9\u65B9\u5546\u54C1\u7F16\u7801"
-  }, React.createElement(Input, null)))), React.createElement(Col, {
+  }, React.createElement(Input, null))), React.createElement(Col, {
     span: 12
-  }, getFieldDecorator('itemName', {
-    rules: [{
-      required: true,
-      message: "请输入我方商品名称"
-    }]
-  })(React.createElement(Form.Item, {
+  }, React.createElement(Form$1.Item, {
+    name: "itemNameSelf",
     label: "\u6211\u65B9\u5546\u54C1\u540D\u79F0"
-  }, React.createElement(Input, null)))), React.createElement(Col, {
+  }, React.createElement(Input, null))), React.createElement(Col, {
     span: 12
-  }, getFieldDecorator('itemNameOther', {
-    rules: [{
-      required: true,
-      message: "请输入对方商品名称"
-    }]
-  })(React.createElement(Form.Item, {
+  }, React.createElement(Form$1.Item, {
+    name: "itemName",
     label: "\u5BF9\u65B9\u5546\u54C1\u540D\u79F0"
-  }, React.createElement(Input, null)))), React.createElement(Col, {
+  }, React.createElement(Input, null))), React.createElement(Col, {
     span: 12
-  }, React.createElement(Form.Item, {
+  }, React.createElement(Form$1.Item, {
+    name: 'itemModelNameSelf',
     label: "\u6211\u65B9\u89C4\u683C\u578B\u53F7"
   }, React.createElement(Input, null))), React.createElement(Col, {
     span: 12
-  }, getFieldDecorator('itemModelNameOther', {
-    rules: [{
-      required: true,
-      message: "请输入对方规格型号"
-    }]
-  })(React.createElement(Form.Item, {
+  }, React.createElement(Form$1.Item, {
+    name: "itemModelName",
     label: "\u5BF9\u65B9\u89C4\u683C\u578B\u53F7"
-  }, React.createElement(Input, null)))), React.createElement(Col, {
-    span: 12
-  }, getFieldDecorator('unit', {
-    rules: [{
-      required: true,
-      message: "请输入对方规格型号"
-    }]
-  })(React.createElement(Form.Item, {
-    label: "\u6211\u65B9\u8BA1\u91CF\u5355\u4F4D"
-  }, React.createElement(Input, null)))), React.createElement(Col, {
-    span: 12
-  }, getFieldDecorator('unitOther', {
-    rules: [{
-      required: true,
-      message: "请输入对方计量单位"
-    }]
-  })(React.createElement(Form.Item, {
-    label: "\u5BF9\u65B9\u8BA1\u91CF\u5355\u4F4D"
-  }, React.createElement(Input, null)))), React.createElement(Col, {
-    span: 24
-  }, getFieldDecorator('isUpdate', {})(React.createElement(Form.Item, null, React.createElement(Checkbox, null, "\u66F4\u65B0\u5230\u5546\u54C1\u5BF9\u7167\u8868\u4E2D")))))), React.createElement("div", {
-    style: {
-      display: 'flex',
-      justifyContent: 'flex-end',
-      gap: 10
-    }
-  }, React.createElement(Button, {
-    type: "primary",
-    onClick: onSubmit
-  }, "\u63D0\u4EA4"), React.createElement(Button, {
-    onClick: onClose
-  }, "\u53D6\u6D88")));
-});
-
-function validateFields$1(form) {
-  return new Promise(function (resolve) {
-    form.validateFields(function (err, values) {
-      resolve({
-        err: err,
-        values: values
-      });
-    });
-  });
-}
+  }, React.createElement(Input, null))))));
+} // function validateFields(form: WrappedFormUtils<any>) {
+//     return new Promise<{ err: any, values: any }>(resolve => {
+//         form.validateFields((err, values) => {
+//             resolve({ err, values })
+//         })
+//     })
+// }
 
 /** 发票组件的上下文 */