@kmkf-fe-packages/services-components 1.17.9 → 1.18.0

package/dist/esm/components/Input/index.js

@@ -110,7 +110,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   this.workOrderUniqueKey = options === null || options === void 0 ? void 0 : options.workOrderUniqueKey;
   this.rules = [{
     validator: function validator(_, value) {
-      var _this$componentConfig6, _this$componentConfig7, _this$componentConfig8, _this$componentConfig9, _this$componentConfig10;
+      var _this$componentConfig6, _this$componentConfig7, _this$componentConfig8, _this$componentConfig9, _this$componentConfig10, _this$componentConfig11;
       if (!value) {
         return Promise.resolve();
       }
@@ -127,11 +127,14 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
       if (testList.length && !isTest) {
         return Promise.reject(new Error("请填写正确的格式"));
       }
-      if ((_this$componentConfig9 = _this.componentConfig) !== null && _this$componentConfig9 !== void 0 && (_this$componentConfig10 = _this$componentConfig9.rulesOptions) !== null && _this$componentConfig10 !== void 0 && _this$componentConfig10.length) {
-        var _this$componentConfig11;
-        var rulesList = (_this$componentConfig11 = _this.componentConfig) === null || _this$componentConfig11 === void 0 ? void 0 : _this$componentConfig11.rulesOptions.filter(function (item) {
-          var _this$componentConfig12;
-          return (((_this$componentConfig12 = _this.componentConfig) === null || _this$componentConfig12 === void 0 ? void 0 : _this$componentConfig12.selectRules) || []).includes(item.id);
+      if ((_this$componentConfig9 = _this.componentConfig) !== null && _this$componentConfig9 !== void 0 && _this$componentConfig9.isNumber && value > Number.MAX_SAFE_INTEGER) {
+        return Promise.reject(new Error("输入数值超出最大数字上限，请使用文本框替代当前数字输入框组件"));
+      }
+      if ((_this$componentConfig10 = _this.componentConfig) !== null && _this$componentConfig10 !== void 0 && (_this$componentConfig11 = _this$componentConfig10.rulesOptions) !== null && _this$componentConfig11 !== void 0 && _this$componentConfig11.length) {
+        var _this$componentConfig12;
+        var rulesList = (_this$componentConfig12 = _this.componentConfig) === null || _this$componentConfig12 === void 0 ? void 0 : _this$componentConfig12.rulesOptions.filter(function (item) {
+          var _this$componentConfig13;
+          return (((_this$componentConfig13 = _this.componentConfig) === null || _this$componentConfig13 === void 0 ? void 0 : _this$componentConfig13.selectRules) || []).includes(item.id);
         });
         if (!rulesList.length) {
           return Promise.resolve();
@@ -154,8 +157,8 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
     validateTrigger: "onBlur",
     validator: function () {
       var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value) {
-        var _this$componentConfig13;
-        var _resultList$, params, _yield$replaceCheck, resultList, _this$componentConfig14, _this$componentConfig15, _this$componentConfig16, messageMap;
+        var _this$componentConfig14;
+        var _resultList$, params, _yield$replaceCheck, resultList, _this$componentConfig15, _this$componentConfig16, _this$componentConfig17, messageMap;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -165,7 +168,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
               }
               return _context.abrupt("return", Promise.resolve());
             case 2:
-              if (!((_this$componentConfig13 = _this.componentConfig) !== null && _this$componentConfig13 !== void 0 && _this$componentConfig13.replaceWarn)) {
+              if (!((_this$componentConfig14 = _this.componentConfig) !== null && _this$componentConfig14 !== void 0 && _this$componentConfig14.replaceWarn)) {
                 _context.next = 11;
                 break;
               }
@@ -192,7 +195,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
                 currFlow: "数据已存在本模版中，不能重复提交",
                 allWorkOrder: "数据已存在其他模版中，不能重复提交"
               };
-              return _context.abrupt("return", Promise.reject(new Error(messageMap[(_this$componentConfig14 = (_this$componentConfig15 = _this.componentConfig) === null || _this$componentConfig15 === void 0 ? void 0 : (_this$componentConfig16 = _this$componentConfig15.repeatConfig) === null || _this$componentConfig16 === void 0 ? void 0 : _this$componentConfig16.repeatRange) !== null && _this$componentConfig14 !== void 0 ? _this$componentConfig14 : ""] || "内容已存在，不能重复提交")));
+              return _context.abrupt("return", Promise.reject(new Error(messageMap[(_this$componentConfig15 = (_this$componentConfig16 = _this.componentConfig) === null || _this$componentConfig16 === void 0 ? void 0 : (_this$componentConfig17 = _this$componentConfig16.repeatConfig) === null || _this$componentConfig17 === void 0 ? void 0 : _this$componentConfig17.repeatRange) !== null && _this$componentConfig15 !== void 0 ? _this$componentConfig15 : ""] || "内容已存在，不能重复提交")));
             case 11:
             case "end":
               return _context.stop();

package/dist/esm/components/SubForm/index.js

@@ -21,6 +21,7 @@ import BsHeaderChild from "../BS/common/BsHeaderChild";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { difference } from 'lodash';
 import { SYMBOL } from "../../constant";
 var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
   var _this = this;
@@ -160,9 +161,22 @@ var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
         }
         return prv;
       }, {});
-      var msg = (value || []).reduce(function (prv, next) {
+      // TODO: 补充确省字段
+      var fillKeysValue = value === null || value === void 0 ? void 0 : value.map(function (item) {
+        var _this$componentConfig11, _this$componentConfig12;
+        var lostKeys = difference((_this$componentConfig11 = _this.componentConfig) === null || _this$componentConfig11 === void 0 ? void 0 : (_this$componentConfig12 = _this$componentConfig11.tableHeader) === null || _this$componentConfig12 === void 0 ? void 0 : _this$componentConfig12.map(function (item) {
+          return item.key;
+        }), Object.keys(item));
+        if (!isNull(lostKeys)) {
+          return lostKeys.reduce(function (prv, next) {
+            return _objectSpread(_objectSpread({}, prv), {}, _defineProperty({}, next, undefined));
+          }, item);
+        }
+        return item;
+      });
+      var msg = (fillKeysValue || []).reduce(function (prv, next) {
         Object.keys(next).forEach(function (key) {
-          if (result[key] && !next[key]) {
+          if (result[key] && isNull(next[key])) {
             prv = result[key];
           }
         });

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, KmErpSendGood, AfterSalesOrderId } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BasicCascader | BasicCheckbox | FlowWorkOrderId | JstSendGood | JstSupply | LogisticsInterception | LogisticsMoreInterception | MsgStatus | PaymentVoucherCode | StatusSelect | SubForm | TradeId | BasicInput | BasicAddress | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | Label | KmErpSendGood | AfterSalesOrderId;
+export declare const factory: (type: string, options: PickOption) => BasicCascader | StatusSelect | TradeId | BasicInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | KmErpSendGood | AfterSalesOrderId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.17.9",
+  "version": "1.18.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^1.17.9",
-    "@kmkf-fe-packages/kmkf-utils": "^1.17.9",
+    "@kmkf-fe-packages/basic-components": "1.18.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.18.0",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f473c7c5fd4745f82792a9f5ebec47636da5100a",
+  "gitHead": "265fae291ea1a593f34557f5496e072a4b6b2ea4",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }