@kmkf-fe-packages/services-components 1.16.5-alpha.5 → 1.16.5-alpha.6

package/dist/esm/components/BS/BsLogistics/index.js

@@ -79,37 +79,19 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
     }) : null;
   });
   _defineProperty(this, "getSortChildFields", function (type, options) {
-    if (!type) {
-      var _typeMap$options$type, _typeMap$options$type2;
-      return [{
-        name: "物流公司",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.company),
-        options: _this.expressDateInstance.getExpressData(),
-        dataType: "string"
-      }, {
-        name: "物流单号",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.code),
-        dataType: "string"
-      }];
-    }
-    if (type === "logisticsCompany") {
-      var _typeMap$options$type3;
-      return [{
-        name: "物流公司",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.company),
-        options: _this.expressDateInstance.getExpressData(),
-        dataType: "string"
-      }];
-    }
-    if (type === "logisticsCode") {
-      var _typeMap$options$type4;
-      return [{
-        name: "物流单号",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.code),
-        dataType: "string"
-      }];
-    }
-    return [];
+    var _typeMap$options$type, _typeMap$options$type2;
+    return [{
+      name: "物流公司",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.company),
+      options: _this.expressDateInstance.getExpressData(),
+      dataType: "arrayObject",
+      disabled: type === 'logisticsCode'
+    }, {
+      name: "物流单号",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.code),
+      dataType: "arrayObject",
+      disabled: type === 'logisticsCompany'
+    }];
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _typeMap$_this$type;

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

@@ -17,7 +17,14 @@ declare class EItemEncode implements ComponentInterface {
     dataType: ComponentInterface["dataType"];
     showHeader: string[];
     platform?: ComponentInterface["platform"];
+    sortChildField: {
+        name: string;
+        key: string;
+        dataType: string;
+        [key: string]: any;
+    }[];
     constructor(options: PickOption);
+    getSortChildFields: () => any;
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: unknown, record: Record) => React.JSX.Element | null;
     renderLog: (r: Record) => React.JSX.Element | null;

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

@@ -36,6 +36,25 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "showHeader", void 0);
   _defineProperty(this, "platform", void 0);
+  _defineProperty(this, "sortChildField", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    var mapping = {
+      title: '商品名称',
+      outerId: '商品编码',
+      numIid: '商品id',
+      skuId: 'skuId',
+      outerSkuId: 'sku编码',
+      propertiesName: 'sku信息'
+    };
+    return Object.keys(mapping).map(function (item) {
+      return {
+        name: mapping[item],
+        key: "".concat(_this.id, "_").concat(item),
+        dataType: "arrayObject",
+        disabled: !_this.showHeader.includes(item)
+      };
+    });
+  });
   _defineProperty(this, "renderClient", function (record) {
     if (isNull(record === null || record === void 0 ? void 0 : record[_this.id])) return null;
     return /*#__PURE__*/React.createElement(ItemView, {
@@ -153,6 +172,7 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
       return Promise.resolve();
     }
   }] : [];
-  this.dataType = "object";
+  this.dataType = "array";
+  this.sortChildField = this.getSortChildFields();
 });
 export default EItemEncode;

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

@@ -15,6 +15,12 @@ declare class JstItemSelect implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: {
+        name: string;
+        key: string;
+        dataType: string;
+        [key: string]: any;
+    }[];
     constructor(options: PickOption);
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;
@@ -22,6 +28,7 @@ declare class JstItemSelect implements ComponentInterface {
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: any) => any;
     editRender: (p: any) => React.JSX.Element;
+    getSortChildFields: () => any;
     filterConfig: (item: ColumnConfig) => {
         searchDefaultConditions: "like";
         type: string;

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

@@ -16,7 +16,7 @@ import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../../constant";
 var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
   var _this = this,
-    _this$componentConfig3;
+    _this$componentConfig5;
   _classCallCheck(this, JstItemSelect);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -31,6 +31,7 @@ var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -82,6 +83,20 @@ var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
       }))
     });
   });
+  _defineProperty(this, "getSortChildFields", function () {
+    var _this$componentConfig3, _this$componentConfig4;
+    return [{
+      name: "jst供应商名称",
+      key: "".concat(_this.id, "_supplierName"),
+      dataType: "arrayObject",
+      disabled: !((_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.enableSupplierName)
+    }, {
+      name: "jst供应商编码",
+      key: "".concat(_this.id, "_itemId"),
+      dataType: "arrayObject",
+      disabled: !((_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.enableItemId)
+    }];
+  });
   _defineProperty(this, "filterConfig", function (item) {
     return [{
       searchDefaultConditions: SYMBOL.like,
@@ -127,23 +142,23 @@ var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
   this.canSort = false;
   this.children = [];
   this.dataType = "object";
-  this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
+  this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     required: true,
     validator: function validator(_, value) {
-      var _this$componentConfig4, _this$componentConfig5;
+      var _this$componentConfig6, _this$componentConfig7;
       if (!value || !value.length) {
         return Promise.reject(new Error("请选择宝贝"));
       }
       var hasNotId = (value || []).some(function (item) {
         return !item.itemId;
       });
-      if ((_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.enableItemId && hasNotId) {
+      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.enableItemId && hasNotId) {
         return Promise.reject(new Error("请输入供应商编码"));
       }
       var hasNotName = (value || []).some(function (item) {
         return !item.supplierName;
       });
-      if ((_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.enableSupplierName && hasNotName) {
+      if ((_this$componentConfig7 = _this.componentConfig) !== null && _this$componentConfig7 !== void 0 && _this$componentConfig7.enableSupplierName && hasNotName) {
         return Promise.reject(new Error("请输入供应商名称"));
       }
       return Promise.resolve();
@@ -151,5 +166,6 @@ var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
   }] : [];
   this.align = "left";
   this.expressDateInstance = ExpressData.getInstance();
+  this.sortChildField = this.getSortChildFields();
 });
 export default JstItemSelect;

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

@@ -52,37 +52,19 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "getSortChildFields", function (type, options) {
-    if (!type) {
-      var _typeMap$options$type, _typeMap$options$type2;
-      return [{
-        name: "物流公司",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.company),
-        options: _this.expressDateInstance.getExpressData(),
-        dataType: "string"
-      }, {
-        name: "物流单号",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.code),
-        dataType: "string"
-      }];
-    }
-    if (type === "logisticsCompany") {
-      var _typeMap$options$type3;
-      return [{
-        name: "物流公司",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.company),
-        options: _this.expressDateInstance.getExpressData(),
-        dataType: "string"
-      }];
-    }
-    if (type === "logisticsCode") {
-      var _typeMap$options$type4;
-      return [{
-        name: "物流单号",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.code),
-        dataType: "string"
-      }];
-    }
-    return [];
+    var _typeMap$options$type, _typeMap$options$type2;
+    return [{
+      name: "物流公司",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.company),
+      options: _this.expressDateInstance.getExpressData(),
+      dataType: "string",
+      disabled: type === "logisticsCode"
+    }, {
+      name: "物流单号",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.code),
+      dataType: "string",
+      disabled: type === "logisticsCompany"
+    }];
   });
   _defineProperty(this, "renderClient", function (record) {
     var _this$componentConfig;

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;

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

@@ -60,31 +60,25 @@ 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: "arrayObject",
+      disabled: type === 'sendId'
     };
     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: "arrayObject",
+      disabled: type === 'sendName'
     };
     if (fieldType === 'WDT_SEND_GOOD') {
       sendName.options = WdtSendData.getInstance().getWdtSendData() || [];
     }
-    if (type === 'all') {
-      return [sendName, sendId];
-    }
-    if (type === 'sendName') {
-      return [sendName];
-    }
-    if (type === 'sendId') {
-      return [sendId];
-    }
-    return [];
+    return [sendName, sendId];
   });
   _defineProperty(this, "renderClient", function (record) {
     var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
@@ -209,7 +203,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   this.componentConfig = _options.componentConfig;
   this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || '', _options, _options.type);
   this.type = _options.type;
-  this.dataType = "object";
+  this.dataType = "arrayObject";
   this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
     required: true,
     validator: function validator(_, value) {

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

@@ -33,36 +33,17 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(_options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "getSortChildFields", function (type, options) {
-    if (!type) {
-      return [{
-        name: "jst供销商名称",
-        key: "".concat(options.id, "_supplyName"),
-        dataType: "array",
-        format: "input"
-      }, {
-        name: "jst供销商编码",
-        key: "".concat(options.id, "_supplyId"),
-        dataType: "array",
-        format: "input"
-      }];
-    }
-    if (type === "supplyName") {
-      return [{
-        name: "jst供销商名称",
-        key: "".concat(options.id, "_supplyName"),
-        dataType: "array",
-        format: "input"
-      }];
-    }
-    if (type === "supplyId") {
-      return [{
-        name: "jst供销商编码",
-        key: "".concat(options.id, "_supplyId"),
-        dataType: "array",
-        format: "input"
-      }];
-    }
-    return [];
+    return [{
+      name: "jst供销商名称",
+      key: "".concat(options.id, "_supplyName"),
+      dataType: "arrayObject",
+      disabled: type === 'supplyId'
+    }, {
+      name: "jst供销商编码",
+      key: "".concat(options.id, "_supplyId"),
+      dataType: "arrayObject",
+      disabled: type === 'supplyName'
+    }];
   });
   _defineProperty(this, "renderClient", function (record) {
     var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
@@ -157,9 +138,9 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(_options) {
   this.id = _options.id;
   this.sortField = "".concat(_options.id, "_jstItemList");
   this.formField = "".concat(_options.id, "_jstItemList");
-  this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || "", _options);
   this.type = _options.type;
   this.componentConfig = _options.componentConfig;
+  this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || "", _options);
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];

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

@@ -36,32 +36,17 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   _defineProperty(this, "suffixSendId", void 0);
   _defineProperty(this, "suffixSendName", void 0);
   _defineProperty(this, "getSortChildFields", function (type, options) {
-    if (type === 'all') {
-      return [{
-        name: "发货仓名称",
-        key: "".concat(options.id, "_").concat(_this.suffixSendName),
-        dataType: "string"
-      }, {
-        name: "发货仓编码",
-        key: "".concat(options.id, "_").concat(_this.suffixSendId),
-        dataType: "string"
-      }];
-    }
-    if (type === 'sendName') {
-      return [{
-        name: "发货仓名称",
-        key: "".concat(options.id, "_").concat(_this.suffixSendName),
-        dataType: "string"
-      }];
-    }
-    if (type === 'sendId') {
-      return [{
-        name: "发货仓编码",
-        key: "".concat(options.id, "_").concat(_this.suffixSendId),
-        dataType: "string"
-      }];
-    }
-    return [];
+    return [{
+      name: "发货仓名称",
+      key: "".concat(options.id, "_").concat(_this.suffixSendName),
+      dataType: "arrayObject",
+      disabled: type === 'sendId'
+    }, {
+      name: "发货仓编码",
+      key: "".concat(options.id, "_").concat(_this.suffixSendId),
+      dataType: "arrayObject",
+      disabled: type === 'sendName'
+    }];
   });
   _defineProperty(this, "renderClient", function (record) {
     var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {

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,29 +19,39 @@ import { SYMBOL } from "../../constant";
 var typeMap = {
   MSG_STATUS: {
     options: [{
-      value: '发送成功',
-      label: '发送成功',
+      oldValue: '发送成功',
+      value: '执行成功',
+      label: '执行成功',
       color: '#52c41a'
     }, {
-      value: '已发送',
-      label: '已发送',
+      oldValue: '已发送',
+      value: '执行中',
+      label: '执行中',
       color: '#52c41a'
     }, {
-      value: '发送失败',
-      label: '发送失败',
+      oldValue: '发送失败',
+      value: '执行失败',
+      label: '执行失败',
       color: '#ff4d4f'
     }, {
-      value: '等待发送',
-      label: '等待发送',
+      oldValue: '等待发送',
+      value: '等待执行',
+      label: '等待执行',
       color: '#e7780f'
+    }, {
+      oldValue: '等待发送',
+      value: '不满足条件，无需执行',
+      label: '不满足条件，无需执行',
+      color: '#8A8A8A'
     }],
     key: 'msgStatusValues',
     code: 'msgStatus4Search',
-    name: '消息状态',
+    name: '任务状态',
     type: 1,
     valueKey: 'status',
     idKey: 'systemOrderId',
-    failValue: '发送失败'
+    // 添加 发送失败 是为了兼容老数据
+    failValue: ['执行失败', '发送失败']
   }
 };
 var msgTypeCh = {
@@ -175,7 +185,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.dataType = 'object';
+  this.dataType = 'arrayObject';
   this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     required: true,
     validator: function validator(_, value) {

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/components/ThirdItemSelect/index.d.ts

@@ -13,7 +13,14 @@ declare class ThirdItemSelect implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface['dataType'];
+    sortChildField: {
+        name: string;
+        key: string;
+        dataType: string;
+        [key: string]: any;
+    }[];
     constructor(options: PickOption);
+    getSortChildFields: () => any;
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;

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

@@ -15,7 +15,7 @@ import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../constant";
 var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options) {
   var _this = this,
-    _this$componentConfig4;
+    _this$componentConfig6;
   _classCallCheck(this, ThirdItemSelect);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -29,6 +29,21 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    var _this$componentConfig, _this$componentConfig2;
+    return [{
+      name: '供应商编码',
+      key: "".concat(_this.id, "_itemId"),
+      dataType: "arrayObject",
+      disabled: !((_this$componentConfig = _this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.enableItemId)
+    }, {
+      name: '供应商名称',
+      key: "".concat(_this.id, "_supplierName"),
+      dataType: "arrayObject",
+      disabled: !((_this$componentConfig2 = _this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.enableSupplierName)
+    }];
+  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -68,7 +83,7 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
     });
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$effects, _this$effects2;
+    var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -76,9 +91,9 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
-      tooltip: (_this$componentConfig = _this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.showTooltip ? (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.tooltip : '',
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
       component: /*#__PURE__*/React.createElement(ItemEncode, _extends({}, _this.componentConfig, {
-        maxLength: ((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.maxLength) || 20,
+        maxLength: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.maxLength) || 20,
         type: 4,
         shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
         shopList: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList) || [],
@@ -118,28 +133,29 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.dataType = 'object';
-  this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
+  this.dataType = 'array';
+  this.rules = (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
     required: true,
     validator: function validator(_, value) {
-      var _this$componentConfig5, _this$componentConfig6;
+      var _this$componentConfig7, _this$componentConfig8;
       if (!value || !value.length) {
         return Promise.reject(new Error('请选择宝贝'));
       }
       var hasNotId = (value || []).some(function (item) {
         return !item.itemId && !item.supplierItemOuterId;
       });
-      if ((_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.enableItemId && hasNotId) {
+      if ((_this$componentConfig7 = _this.componentConfig) !== null && _this$componentConfig7 !== void 0 && _this$componentConfig7.enableItemId && hasNotId) {
         return Promise.reject(new Error('请输入供应商编码'));
       }
       var hasNotName = (value || []).some(function (item) {
         return !item.supplierName;
       });
-      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.enableSupplierName && hasNotName) {
+      if ((_this$componentConfig8 = _this.componentConfig) !== null && _this$componentConfig8 !== void 0 && _this$componentConfig8.enableSupplierName && hasNotName) {
         return Promise.reject(new Error('请输入供应商名称'));
       }
       return Promise.resolve();
     }
   }] : [];
+  this.sortChildField = this.getSortChildFields();
 });
 export default ThirdItemSelect;

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

package/dist/esm/type.d.ts

@@ -47,8 +47,8 @@ export interface ComponentInterface {
     rules?: any[];
     width?: number;
     align?: ALignType;
-    dataType: "string" | "number" | "boolean" | "array" | "range" | "object";
-    format?: "dateTime" | "date" | "time" | "cascader" | "shopInput" | "staffGroup";
+    dataType: "string" | "number" | "boolean" | "array" | "range" | "object" | "arrayObject";
+    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.16.5-alpha.5",
+  "version": "1.16.5-alpha.6",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "1.16.5-alpha.5",
-    "@kmkf-fe-packages/kmkf-utils": "1.16.5-alpha.5",
+    "@kmkf-fe-packages/basic-components": "1.16.5-alpha.6",
+    "@kmkf-fe-packages/kmkf-utils": "1.16.5-alpha.6",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "31bb738f333e28f2338a7f47d6e89ea8a865287f",
+  "gitHead": "adec71dedd1a96f8077aaba07425a02bcb6c5e04",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }