@kmkf-fe-packages/services-components 1.17.8-beta.0 → 1.17.8-beta.10

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

@@ -1065,7 +1065,7 @@ export var MsgContent = function MsgContent(_ref14) {
   var getColorByStatus = function getColorByStatus(value) {
     var _options$find2;
     return ((_options$find2 = options.find(function (innerItem) {
-      return value === innerItem.label;
+      return value === innerItem.label || value === innerItem.oldValue;
     })) === null || _options$find2 === void 0 ? void 0 : _options$find2.color) || '#000';
   };
   var detailContent = function detailContent(item) {
@@ -1106,7 +1106,7 @@ export var MsgContent = function MsgContent(_ref14) {
         cursor: "pointer"
       }
     }, (_item$msgReceivers2 = item.msgReceivers) !== null && _item$msgReceivers2 !== void 0 && _item$msgReceivers2.some(function (msgItem) {
-      return (msgItem === null || msgItem === void 0 ? void 0 : msgItem.status) === failValue;
+      return Array.isArray(failValue) ? failValue.includes(msgItem === null || msgItem === void 0 ? void 0 : msgItem.status) : (msgItem === null || msgItem === void 0 ? void 0 : msgItem.status) === failValue;
     }) || item.failReason ? /*#__PURE__*/React.createElement(Popover, {
       content: detailContent(item),
       overlayStyle: {

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/JST/JstSendGood/index.d.ts

@@ -19,6 +19,7 @@ declare class JstSendGood implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    format: ComponentInterface["format"];
     constructor(options: PickOption);
     getSortChildFields: (type: string, options: PickOption, fieldType?: string) => any;
     renderClient: (record: Record) => React.JSX.Element | null;
@@ -46,8 +47,5 @@ declare class JstSendGood implements ComponentInterface {
         filterFn: (value: string) => (i: Record) => any;
         props?: undefined;
     })[];
-    formDataTransform: (v: Array<{
-        sendName: string;
-    }>) => string[];
 }
 export default JstSendGood;

package/dist/esm/components/JST/JstSendGood/index.js

@@ -60,17 +60,20 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "format", void 0);
   _defineProperty(this, "getSortChildFields", function (type, options, fieldType) {
     var _typeMap$options$type, _typeMap$options$type2;
     var sendName = {
       name: "发货仓名称",
       key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.sendName),
-      dataType: "string"
+      dataType: "array",
+      format: "input"
     };
     var sendId = {
       name: "发货仓编码",
       key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.sendId),
-      dataType: "string"
+      dataType: "array",
+      format: "input"
     };
     if (fieldType === 'WDT_SEND_GOOD') {
       sendName.options = WdtSendData.getInstance().getWdtSendData() || [];
@@ -202,14 +205,6 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
       }
     }];
   });
-  _defineProperty(this, "formDataTransform", function (v) {
-    var _v$map;
-    return v === null || v === void 0 ? void 0 : (_v$map = v.map(function (item) {
-      return item.sendName;
-    })) === null || _v$map === void 0 ? void 0 : _v$map.filter(function (item) {
-      return !isNull(item);
-    });
-  });
   this.name = _options.name;
   this.id = _options.id;
   this.sortField = "".concat(_options.id, "_").concat((_typeMap$_options$typ = typeMap[_options.type]) === null || _typeMap$_options$typ === void 0 ? void 0 : _typeMap$_options$typ.key);
@@ -244,5 +239,6 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
+  this.format = 'object';
 });
 export default JstSendGood;

package/dist/esm/components/LogisticsMoreInterception/InterceptAddress.js

@@ -34,7 +34,7 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
       var addressText = (_item$interceptAddres = item.interceptAddress) === null || _item$interceptAddres === void 0 ? void 0 : _item$interceptAddres.map(function (suffix) {
         return _this.addressDateInstance.getNameByCode(suffix);
       }).join('');
-      return addressText || item.interceptDetail || item.interceptReceiverName || item.interceptReceiverMobile ? /*#__PURE__*/React.createElement("div", null, "\u5305\u88F9".concat(index + 1, ":"), addressText, item.interceptDetail, item.interceptReceiverName, item.interceptReceiverMobile) : '--';
+      return /*#__PURE__*/React.createElement("div", null, "\u5305\u88F9".concat(index + 1, ":"), addressText || item.interceptDetail || item.interceptReceiverName || item.interceptReceiverMobile ? /*#__PURE__*/React.createElement("div", null, addressText, item.interceptDetail, item.interceptReceiverName, item.interceptReceiverMobile) : "--");
     }));
   });
   _defineProperty(this, "renderClient", function () {

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

@@ -67,7 +67,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
       }).join("");
       return /*#__PURE__*/React.createElement("div", null, list.length > 1 ? "\u5305\u88F9".concat(index + 1, ":") : "", item.interceptCompany ? /*#__PURE__*/React.createElement("div", null, "\u7269\u6D41\u516C\u53F8\uFF1A", _this.expressDateInstance.getExpressNameByCode(item.interceptCompany) || item.interceptCompany) : null, item.interceptCode ? /*#__PURE__*/React.createElement("div", null, "\u7269\u6D41\u5355\u53F7\uFF1A", /*#__PURE__*/React.createElement(CopyText, {
         text: item.interceptCode
-      })) : null, (_item$interceptAddres = item.interceptAddress) !== null && _item$interceptAddres !== void 0 && _item$interceptAddres.length || item.interceptDetail || item.interceptReceiverName || item.interceptReceiverMobile ? /*#__PURE__*/React.createElement("div", null, "\u6D3E\u4EF6\u4FE1\u606F\uFF1A", addressText, item.interceptDetail, " ", item.interceptReceiverName, " ", item.interceptReceiverMobile) : null, item.interceptType ? /*#__PURE__*/React.createElement("div", null, "\u62E6\u622A\u7C7B\u578B\uFF1A", _this.expressInterceptInstance.getTypeNameMap()[item.interceptType]) : null, item.interceptLogisticsStatus ? /*#__PURE__*/React.createElement("div", null, "\u7269\u6D41\u72B6\u6001\uFF1A", (_this$expressIntercep = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep === void 0 ? void 0 : _this$expressIntercep[item.interceptLogisticsStatus], /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
+      })) : null, (_item$interceptAddres = item.interceptAddress) !== null && _item$interceptAddres !== void 0 && _item$interceptAddres.length || item.interceptDetail || item.interceptReceiverName || item.interceptReceiverMobile ? /*#__PURE__*/React.createElement("div", null, "\u6D3E\u4EF6\u4FE1\u606F\uFF1A", addressText, item.interceptDetail, " ", item.interceptReceiverName, item.interceptReceiverMobile) : null, item.interceptType ? /*#__PURE__*/React.createElement("div", null, "\u62E6\u622A\u7C7B\u578B\uFF1A", _this.expressInterceptInstance.getTypeNameMap()[item.interceptType]) : null, item.interceptLogisticsStatus ? /*#__PURE__*/React.createElement("div", null, "\u7269\u6D41\u72B6\u6001\uFF1A", (_this$expressIntercep = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep === void 0 ? void 0 : _this$expressIntercep[item.interceptLogisticsStatus], /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
         modelWidth: 500,
         interceptCompany: item.interceptCompany,
         interceptCode: item.interceptCode,

package/dist/esm/components/LogisticsMoreInterception/interceptSnapshot.js

@@ -28,7 +28,7 @@ var InterceptSnapshot = /*#__PURE__*/_createClass(function InterceptSnapshot(opt
   _defineProperty(this, "renderSnapshot", function (record) {
     var snapshotList = record[_this.id] || [];
     return /*#__PURE__*/React.createElement(React.Fragment, null, snapshotList.map(function (item, index) {
-      return /*#__PURE__*/React.createElement("div", null, "\u5305\u88F9".concat(index + 1, ":"), item);
+      return /*#__PURE__*/React.createElement("div", null, "\u5305\u88F9".concat(index + 1, ":"), item ? item : "--");
     }));
   });
   _defineProperty(this, "getComponentValue", function (r) {

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

@@ -19,22 +19,27 @@ import { SYMBOL } from "../../constant";
 var typeMap = {
   MSG_STATUS: {
     options: [{
+      oldValue: '发送成功',
       value: '执行成功',
       label: '执行成功',
       color: '#52c41a'
     }, {
+      oldValue: '已发送',
       value: '执行中',
       label: '执行中',
       color: '#52c41a'
     }, {
+      oldValue: '发送失败',
       value: '执行失败',
       label: '执行失败',
       color: '#ff4d4f'
     }, {
+      oldValue: '等待发送',
       value: '等待执行',
       label: '等待执行',
       color: '#e7780f'
     }, {
+      oldValue: '等待发送',
       value: '不满足条件，无需执行',
       label: '不满足条件，无需执行',
       color: '#8A8A8A'
@@ -45,7 +50,8 @@ var typeMap = {
     type: 1,
     valueKey: 'status',
     idKey: 'systemOrderId',
-    failValue: '发送失败'
+    // 添加 发送失败 是为了兼容老数据
+    failValue: ['执行失败', '发送失败']
   }
 };
 var msgTypeCh = {

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/type.d.ts

@@ -48,7 +48,7 @@ export interface ComponentInterface {
     width?: number;
     align?: ALignType;
     dataType: "string" | "number" | "boolean" | "array" | "range" | "object";
-    format?: "dateTime" | "date" | "time" | "cascader" | "shopInput" | "staffGroup";
+    format?: "dateTime" | "date" | "time" | "cascader" | "shopInput" | "staffGroup" | "object";
     options?: Array<any>;
     templateId?: string;
     flowTemplateKey?: string;

package/package.json

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