@kmkf-fe-packages/services-components 1.17.5-beta.13 → 1.17.5-beta.15

package/dist/esm/components/JST/JstSendGood/index.d.ts

@@ -20,7 +20,7 @@ declare class JstSendGood implements ComponentInterface {
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
-    getSortChildFields: (type: string, options: PickOption) => any;
+    getSortChildFields: (type: string, options: PickOption, fieldType?: string) => 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/JST/JstSendGood/index.js

@@ -60,34 +60,29 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
-  _defineProperty(this, "getSortChildFields", function (type, options) {
+  _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"
+    };
+    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"
+    };
+    if (fieldType === 'WDT_SEND_GOOD') {
+      sendName.options = WdtSendData.getInstance().getWdtSendData() || [];
+    }
     if (type === 'all') {
-      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.sendName),
-        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.sendId),
-        dataType: "string"
-      }];
+      return [sendName, sendId];
     }
     if (type === 'sendName') {
-      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.sendName),
-        dataType: "string"
-      }];
+      return [sendName];
     }
     if (type === 'sendId') {
-      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.sendId),
-        dataType: "string"
-      }];
+      return [sendId];
     }
     return [];
   });
@@ -212,7 +207,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   this.sortField = "".concat(_options.id, "_").concat((_typeMap$_options$typ = typeMap[_options.type]) === null || _typeMap$_options$typ === void 0 ? void 0 : _typeMap$_options$typ.key);
   this.formField = "".concat(_options.id, "_").concat((_typeMap$_options$typ2 = typeMap[_options.type]) === null || _typeMap$_options$typ2 === void 0 ? void 0 : _typeMap$_options$typ2.key);
   this.componentConfig = _options.componentConfig;
-  this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || '', _options);
+  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.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{

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

@@ -19,25 +19,25 @@ import { SYMBOL } from "../../constant";
 var typeMap = {
   MSG_STATUS: {
     options: [{
-      value: '发送成功',
-      label: '发送成功',
+      value: '执行成功',
+      label: '执行成功',
       color: '#52c41a'
     }, {
-      value: '已发送',
-      label: '已发送',
+      value: '执行中',
+      label: '执行中',
       color: '#52c41a'
     }, {
-      value: '发送失败',
-      label: '发送失败',
+      value: '执行失败',
+      label: '执行失败',
       color: '#ff4d4f'
     }, {
-      value: '等待发送',
-      label: '等待发送',
+      value: '等待执行',
+      label: '等待执行',
       color: '#e7780f'
     }],
     key: 'msgStatusValues',
     code: 'msgStatus4Search',
-    name: '消息状态',
+    name: '任务状态',
     type: 1,
     valueKey: 'status',
     idKey: 'systemOrderId',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.17.5-beta.13",
+  "version": "1.17.5-beta.15",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a225ce80ae18d2fd0a5d01761ea49b1a3c6a806b",
+  "gitHead": "f5893a7c257c0b77e120b32e5c4bbd9930cb98a1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }