kts-component-invoice-operate 1.0.85 → 1.0.89

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/EndowCode.d.ts

@@ -10,8 +10,12 @@ export default class EndowCode {
     }[]>;
     /** 税率 是否可以编辑 */
     getReadOnlyTaxRate?: (value?: GoodsListState) => boolean;
-    /** 获取单条赋码时候的默认值 */
-    getDefaultValue?: (value: IGood) => Promise<IGood>;
+    /**
+     * 获取赋码时候的默认值
+     * @param value 商品信息
+     * @param length 商品数量
+     * */
+    getDefaultValue?: (value: IGood, length: number) => Promise<IGood>;
     /** 税率 是否可以编辑 校验函数 */
     readonly readOnlyTaxRateMap: {
         [key: string]: (value?: GoodsListState) => boolean;

package/dist/Invoice/tools/calculate/index.d.ts

@@ -1,5 +1,5 @@
 /** 格式化 保留2位小数 */
-export declare const format2: (value: number | string) => string;
+export declare const format2: (value: number | string) => number | "";
 /** 格式化 保留15位数字 */
 export declare const format15: (value: number | string) => number | "";
 export declare function quantityPriceIncludeTax(quantity?: number | string, priceIncludeTax?: number | string): number | undefined;

package/dist/index.esm.js

@@ -348,7 +348,7 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
       var _validateFields2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
         var _this3 = this;
 
-        var _errors, _values, arr, i, key, _yield$_validateField, errors, values;
+        var _errors, _values, arr, i, key, _yield$_validateField, errors, values, _this$state$goodsList;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -382,7 +382,26 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                 break;
 
               case 16:
-                // 列表数据
+                if (!this.state.goodsListState.form) {
+                  _context.next = 25;
+                  break;
+                }
+
+                _context.prev = 17;
+                _context.next = 20;
+                return (_this$state$goodsList = this.state.goodsListState.form) === null || _this$state$goodsList === void 0 ? void 0 : _this$state$goodsList.validateFields();
+
+              case 20:
+                _context.next = 25;
+                break;
+
+              case 22:
+                _context.prev = 22;
+                _context.t0 = _context["catch"](17);
+
+                _errors.set('goodsList', _context.t0.errors);
+
+              case 25:
                 _values.set('goodsList', this.state.goodsListState.goodsList.slice()); // 金额（含税）
 
 
@@ -426,12 +445,12 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                   values: _values
                 });
 
-              case 21:
+              case 30:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this);
+        }, _callee, this, [[17, 22]]);
       }));
 
       function validateFields() {
@@ -2381,7 +2400,7 @@ var format2 = function format2(value) {
   if (value === Infinity) return '';
   if ("".concat(value) === 'NaN') return '';
   if (typeof value === 'string') value = parseFloat(value);
-  return value.toFixed(2);
+  return parseFloat(value.toFixed(2));
 };
 /** 格式化 保留15位数字 */
 
@@ -2423,14 +2442,13 @@ var lazyFn$1 = function lazyFn(fn) {
 
 var promptErr = function promptErr(err) {
   if (!err) return false;
-
-  if (err.errors[0].message !== 'lineAmountIncludeTax need to revalidate') {
-    message.error({
-      key: err.errors[0].message,
-      content: err.errors[0].message
-    });
-  }
-
+  if (err.errors[0].message === 'lineAmountIncludeTax need to revalidate') return true;
+  if (err.errors[0].message === 'priceIncludeTax need to revalidate') return true;
+  message.error({
+    key: err.errors[0].message,
+    content: err.errors[0].message,
+    duration: 2
+  });
   return true;
 };
 /** 数量改变了 */
@@ -3765,8 +3783,8 @@ var useColumns = (function (form) {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
                         case 0:
-                          if ("".concat(value).split('.')[0].length > 10) {
-                            callback('金额整数部分不能大于10位');
+                          if ("".concat(value).split('.')[0].length > 9) {
+                            callback('金额整数部分不能大于9位');
                           }
 
                         case 1:
@@ -3827,8 +3845,8 @@ var useColumns = (function (form) {
                     while (1) {
                       switch (_context6.prev = _context6.next) {
                         case 0:
-                          if ("".concat(value).split('.')[0].length > 10) {
-                            callback('金额整数部分不能大于10位');
+                          if ("".concat(value).split('.')[0].length > 9) {
+                            callback('金额整数部分不能大于9位');
                           }
 
                         case 1:
@@ -4492,7 +4510,7 @@ var Main = decorator(Form.create())(function (props) {
     },
     dataSource: controller.useMemo(function (s) {
       return s.goodsListState.goodsList;
-    }, []),
+    }, [controller]),
     columns: useColumns(props.form),
     rowSelection: useRowSelection(),
     onRow: function onRow(record) {
@@ -5264,41 +5282,33 @@ var EndowCodeDrawer = (function () {
                   return _context2.abrupt("return");
 
                 case 4:
-                  if (!(endowcodeGoodIndex.length === 1)) {
-                    _context2.next = 17;
-                    break;
-                  }
-
                   getDefaultValue = s.goodsListState.endowCode.getDefaultValue;
 
                   if (!getDefaultValue) {
-                    _context2.next = 14;
+                    _context2.next = 13;
                     break;
                   }
 
                   _context2.t0 = setDefaultValue;
-                  _context2.next = 10;
-                  return getDefaultValue(_objectSpread2({}, good));
+                  _context2.next = 9;
+                  return getDefaultValue(_objectSpread2({}, good), endowcodeGoodIndex.length);
 
-                case 10:
+                case 9:
                   _context2.t1 = _context2.sent;
                   (0, _context2.t0)(_context2.t1);
-                  _context2.next = 15;
-                  break;
-
-                case 14:
-                  setDefaultValue(good);
-
-                case 15:
-                  _context2.next = 18;
+                  _context2.next = 14;
                   break;
 
-                case 17:
-                  setDefaultValue({
-                    taxRate: good.taxRate
-                  });
+                case 13:
+                  if (endowcodeGoodIndex.length === 1) {
+                    setDefaultValue(good);
+                  } else {
+                    setDefaultValue({
+                      taxRate: good.taxRate
+                    });
+                  }
 
-                case 18:
+                case 14:
                 case "end":
                   return _context2.stop();
               }
@@ -5609,7 +5619,9 @@ var DrawerBody$3 = function DrawerBody(props) {
     name: "taxRate",
     type: "string",
     title: "\u7A0E\u7387",
-    readOnly: readOnlyTaxRate,
+    "x-component-props": {
+      disabled: readOnlyTaxRate
+    },
     default: (_defaultValue$taxRate = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.taxRate) !== null && _defaultValue$taxRate !== void 0 ? _defaultValue$taxRate : 0,
     enum: taxRateList,
     "x-rules": [{
@@ -5773,7 +5785,17 @@ var Main$3 = function Main(props) {
   var controller = React.useMemo(function () {
     return props.controller || new InvoiceController();
   }, [props.controller]);
+
+  var _React$useState = React.useState(0),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      key = _React$useState2[0],
+      setKey = _React$useState2[1];
+
+  React.useEffect(function () {
+    setKey(key + 1);
+  }, [controller]);
   return /*#__PURE__*/React.createElement(InvoiceContext.Provider, {
+    key: key,
     value: controller
   }, /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate"

package/dist/index.js

@@ -358,7 +358,7 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
       var _validateFields2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
         var _this3 = this;
 
-        var _errors, _values, arr, i, key, _yield$_validateField, errors, values;
+        var _errors, _values, arr, i, key, _yield$_validateField, errors, values, _this$state$goodsList;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -392,7 +392,26 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                 break;
 
               case 16:
-                // 列表数据
+                if (!this.state.goodsListState.form) {
+                  _context.next = 25;
+                  break;
+                }
+
+                _context.prev = 17;
+                _context.next = 20;
+                return (_this$state$goodsList = this.state.goodsListState.form) === null || _this$state$goodsList === void 0 ? void 0 : _this$state$goodsList.validateFields();
+
+              case 20:
+                _context.next = 25;
+                break;
+
+              case 22:
+                _context.prev = 22;
+                _context.t0 = _context["catch"](17);
+
+                _errors.set('goodsList', _context.t0.errors);
+
+              case 25:
                 _values.set('goodsList', this.state.goodsListState.goodsList.slice()); // 金额（含税）
 
 
@@ -436,12 +455,12 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                   values: _values
                 });
 
-              case 21:
+              case 30:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this);
+        }, _callee, this, [[17, 22]]);
       }));
 
       function validateFields() {
@@ -2391,7 +2410,7 @@ var format2 = function format2(value) {
   if (value === Infinity) return '';
   if ("".concat(value) === 'NaN') return '';
   if (typeof value === 'string') value = parseFloat(value);
-  return value.toFixed(2);
+  return parseFloat(value.toFixed(2));
 };
 /** 格式化 保留15位数字 */
 
@@ -2433,14 +2452,13 @@ var lazyFn$1 = function lazyFn(fn) {
 
 var promptErr = function promptErr(err) {
   if (!err) return false;
-
-  if (err.errors[0].message !== 'lineAmountIncludeTax need to revalidate') {
-    ktsComponentsAntdX3.message.error({
-      key: err.errors[0].message,
-      content: err.errors[0].message
-    });
-  }
-
+  if (err.errors[0].message === 'lineAmountIncludeTax need to revalidate') return true;
+  if (err.errors[0].message === 'priceIncludeTax need to revalidate') return true;
+  ktsComponentsAntdX3.message.error({
+    key: err.errors[0].message,
+    content: err.errors[0].message,
+    duration: 2
+  });
   return true;
 };
 /** 数量改变了 */
@@ -3775,8 +3793,8 @@ var useColumns = (function (form) {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
                         case 0:
-                          if ("".concat(value).split('.')[0].length > 10) {
-                            callback('金额整数部分不能大于10位');
+                          if ("".concat(value).split('.')[0].length > 9) {
+                            callback('金额整数部分不能大于9位');
                           }
 
                         case 1:
@@ -3837,8 +3855,8 @@ var useColumns = (function (form) {
                     while (1) {
                       switch (_context6.prev = _context6.next) {
                         case 0:
-                          if ("".concat(value).split('.')[0].length > 10) {
-                            callback('金额整数部分不能大于10位');
+                          if ("".concat(value).split('.')[0].length > 9) {
+                            callback('金额整数部分不能大于9位');
                           }
 
                         case 1:
@@ -4502,7 +4520,7 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
     },
     dataSource: controller.useMemo(function (s) {
       return s.goodsListState.goodsList;
-    }, []),
+    }, [controller]),
     columns: useColumns(props.form),
     rowSelection: useRowSelection(),
     onRow: function onRow(record) {
@@ -5274,41 +5292,33 @@ var EndowCodeDrawer = (function () {
                   return _context2.abrupt("return");
 
                 case 4:
-                  if (!(endowcodeGoodIndex.length === 1)) {
-                    _context2.next = 17;
-                    break;
-                  }
-
                   getDefaultValue = s.goodsListState.endowCode.getDefaultValue;
 
                   if (!getDefaultValue) {
-                    _context2.next = 14;
+                    _context2.next = 13;
                     break;
                   }
 
                   _context2.t0 = setDefaultValue;
-                  _context2.next = 10;
-                  return getDefaultValue(_objectSpread2({}, good));
+                  _context2.next = 9;
+                  return getDefaultValue(_objectSpread2({}, good), endowcodeGoodIndex.length);
 
-                case 10:
+                case 9:
                   _context2.t1 = _context2.sent;
                   (0, _context2.t0)(_context2.t1);
-                  _context2.next = 15;
-                  break;
-
-                case 14:
-                  setDefaultValue(good);
-
-                case 15:
-                  _context2.next = 18;
+                  _context2.next = 14;
                   break;
 
-                case 17:
-                  setDefaultValue({
-                    taxRate: good.taxRate
-                  });
+                case 13:
+                  if (endowcodeGoodIndex.length === 1) {
+                    setDefaultValue(good);
+                  } else {
+                    setDefaultValue({
+                      taxRate: good.taxRate
+                    });
+                  }
 
-                case 18:
+                case 14:
                 case "end":
                   return _context2.stop();
               }
@@ -5619,7 +5629,9 @@ var DrawerBody$3 = function DrawerBody(props) {
     name: "taxRate",
     type: "string",
     title: "\u7A0E\u7387",
-    readOnly: readOnlyTaxRate,
+    "x-component-props": {
+      disabled: readOnlyTaxRate
+    },
     default: (_defaultValue$taxRate = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.taxRate) !== null && _defaultValue$taxRate !== void 0 ? _defaultValue$taxRate : 0,
     enum: taxRateList,
     "x-rules": [{
@@ -5783,7 +5795,17 @@ var Main$3 = function Main(props) {
   var controller = React__default['default'].useMemo(function () {
     return props.controller || new InvoiceController();
   }, [props.controller]);
+
+  var _React$useState = React__default['default'].useState(0),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      key = _React$useState2[0],
+      setKey = _React$useState2[1];
+
+  React__default['default'].useEffect(function () {
+    setKey(key + 1);
+  }, [controller]);
   return /*#__PURE__*/React__default['default'].createElement(InvoiceContext.Provider, {
+    key: key,
     value: controller
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate"