@kmkf-fe-packages/services-components 1.22.0 → 1.22.1-beta.10

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

@@ -39,6 +39,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
       id: _this.id,
       label: _this.name,
       value: /*#__PURE__*/React.createElement(BsGoodsTable, {
+        type: _this.type,
         list: (record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : _record.bsGoods) || [],
         showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
       })
@@ -51,6 +52,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
     var _this$componentConfig2;
     if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsGoods")])) return null;
     return /*#__PURE__*/React.createElement(BsGoodsTable, {
+      type: _this.type,
       list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsGoods")]) || [],
       showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
     });
@@ -71,7 +73,9 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       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(Goods, _extends({}, _this.componentConfig, {
+      component: /*#__PURE__*/React.createElement(Goods, _extends({
+        type: _this.type
+      }, _this.componentConfig, {
         maxLength: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.maxLength) || 20,
         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) || [],

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

@@ -11,7 +11,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from 'react';
 import GetFormItem from "../../GetFormItem";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_ORDER_STATUS_MAP } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_ORDER_STATUS_MAP, KM_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
 import { BsSystemOrder as SystemOrder } from '@kmkf-fe-packages/basic-components';
 import { BsSystemOrderTable } from "../../Common";
 import { BsHeaderChild } from "../common/index";
@@ -19,7 +19,7 @@ import { SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
   BS_SYSTEM_ORDER: {
     key: 'bsSystemShowOrder',
-    name: 'bs',
+    name: '百胜',
     selectId: 'bsSystemSelectIds',
     columns: [{
       title: "单据类型",
@@ -50,6 +50,7 @@ var typeMap = {
     ]
   },
 
+  KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG,
   WLN_SYSTEM_ORDER: {
     key: 'wlnSystemShowOrder',
     name: '万里牛',
@@ -246,6 +247,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
   this.canSort = false;
   this.children = ((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : (_typeMap$options$type2 = _typeMap$options$type.columns) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.map(function (column) {
     return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+      transformValue: column.render,
       name: column.title,
       id: "".concat(options.id, "_").concat(typeMap[options.type].key, "_").concat(column.dataIndex),
       width: column.width || 150

package/dist/esm/components/BS/common/BsHeaderChild.d.ts

@@ -13,6 +13,7 @@ declare class BsHeaderChild implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface['dataType'];
+    transformValue: (val: any) => any;
     constructor(options: PickOption);
     getParentId: () => string;
     renderClient: (record: any) => React.JSX.Element | null;

package/dist/esm/components/BS/common/BsHeaderChild.js

@@ -29,6 +29,9 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "transformValue", function (val) {
+    return val;
+  });
   _defineProperty(this, "getParentId", function () {
     var _this$id$split = _this.id.split('_'),
       _this$id$split2 = _slicedToArray(_this$id$split, 3),
@@ -54,7 +57,7 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    return r === null || r === void 0 ? void 0 : r[_this.id];
+    return _this.transformValue(r === null || r === void 0 ? void 0 : r[_this.id]);
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$getComponentVal2;
@@ -79,5 +82,8 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   this.canSort = false;
   this.dataType = 'string';
   this.children = [];
+  if (options.transformValue) {
+    this.transformValue = options.transformValue;
+  }
 });
 export default BsHeaderChild;

package/dist/esm/components/BS/common/BsHeaderGood.js

@@ -123,6 +123,18 @@ var HeaderMap = {
     name: "SKU 信息",
     key: "propertiesName",
     width: 140
+  },
+  batch: {
+    component: BsHeaderChild,
+    name: "批次号",
+    key: "batch",
+    width: 140
+  },
+  expireDate: {
+    component: BsHeaderChild,
+    name: "有效期",
+    key: "expireDate",
+    width: 140
   }
 
   // title: '商品名称',
@@ -220,7 +232,9 @@ var BsHeaderGods = /*#__PURE__*/_createClass(function BsHeaderGods(options) {
     money: "实付金额",
     number: "数量",
     share: "分摊价",
-    type: "赠品类型"
+    type: "赠品类型",
+    batch: "批次号",
+    expireDate: "有效期"
   };
   this.children = _toConsumableArray(Object.keys(HeaderMap).reduce(function (prv, key) {
     var _options$componentCon, _options$componentCon2;

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

@@ -20,6 +20,7 @@ import { CopyToClipboard } from 'react-copy-to-clipboard';
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
 import CopyText from "../../commonComponents/CopyText";
+import { KM_SYSTEM_ORDER_CONFIG } from '@kmkf-fe-packages/kmkf-utils';
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -258,7 +259,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
     type = _ref6.type,
     _ref6$platformType = _ref6.platformType,
     platformType = _ref6$platformType === void 0 ? 'default' : _ref6$platformType;
-  var getSendName = function getSendName(item, platformType) {
+  var getSendName = function getSendName(item) {
     return SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendName);
   };
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
@@ -279,7 +280,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
       text: item.logisticsCode
     })) : company ? company : item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
       text: item.logisticsCode
-    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item, 'platformType')].join("/") : item.sendId ? item.sendId : getSendName(item, 'platformType')) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
+    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item)].join("/") : item.sendId ? item.sendId : getSendName(item)) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
   }) : null;
 };
 export var BsExpressRender = function BsExpressRender(_ref7) {
@@ -899,6 +900,87 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
             }];
           }
           break;
+        case 'BS_GOODS':
+          columns = [{
+            dataIndex: 'mark',
+            title: "\u5546\u54C1\u6807\u8BB0",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'skuName',
+            title: "".concat(text, "sku\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 200
+          }, {
+            dataIndex: 'sku',
+            title: "".concat(text, "sku\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'name',
+            title: "".concat(text, "\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 200
+          }, {
+            dataIndex: 'pic',
+            title: "\u56FE\u7247",
+            align: 'center',
+            ellipsis: true,
+            width: 100,
+            render: function render(val) {
+              return /*#__PURE__*/React.createElement(Image, {
+                width: 60,
+                src: val
+              });
+            }
+          }, {
+            dataIndex: 'code',
+            title: "".concat(text, "\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'money',
+            title: "\u5B9E\u4ED8\u91D1\u989D",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'number',
+            title: "".concat(text, "\u6570\u91CF"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'share',
+            title: "\u5206\u644A\u4EF7",
+            align: 'center',
+            ellipsis: true,
+            width: 70
+          }, {
+            dataIndex: 'type',
+            title: "\u8D60\u54C1\u7C7B\u578B",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'batch',
+            title: "\u6279\u6B21\u53F7",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'expireDate',
+            title: "\u6709\u6548\u671F",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }];
+          break;
         default:
           columns = [{
             dataIndex: 'mark',
@@ -1149,6 +1231,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
     // },
     ],
 
+    KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
     WLN_SYSTEM_ORDER: [{
       dataIndex: 'billType',
       title: '单据类型'
@@ -1239,6 +1322,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
   };
   var rowKeyMap = {
     BS_SYSTEM_ORDER: 'billNo',
+    KM_SYSTEM_ORDER: 'billNo',
     WLN_SYSTEM_ORDER: 'billNo',
     WDT_SYSTEM_ORDER: 'billNo',
     BS_E3_SYSTEM_ORDER: 'orderSn'
@@ -1289,6 +1373,7 @@ export var MsgContent = function MsgContent(_ref14) {
     _ref14$options = _ref14.options,
     options = _ref14$options === void 0 ? [] : _ref14$options;
   var msgTypeCh = {
+    pdd: '拼多多',
     ding: '钉钉',
     wechat: '微信',
     qq: 'QQ',
@@ -1333,7 +1418,7 @@ export var MsgContent = function MsgContent(_ref14) {
     var key = item.msgType || 'ding';
     var formatMsgContent = /*#__PURE__*/React.createElement("span", {
       key: index
-    }, msgTypeCh[key], "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
+    }, msgTypeCh[key] || key, "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
     return /*#__PURE__*/React.createElement("div", {
       key: "wrap_".concat(index),
       style: {

package/dist/esm/components/CommonMultiStatus/index.d.ts

@@ -13,6 +13,7 @@ declare class CommonMultiStatus implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface['dataType'];
+    isSingleValue: boolean;
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;

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

@@ -74,13 +74,40 @@ var typeMap = {
     valueKey: 'status',
     idKey: 'systemOrderId',
     failValue: '失败'
+  },
+  BS_E3_WAREHOUSING_STATUS: {
+    options: [{
+      value: '2',
+      label: '已入库',
+      color: '#52c41a'
+    }, {
+      value: '1',
+      label: '部分入库',
+      color: '#e7780f'
+    }, {
+      value: '0',
+      label: '未入库',
+      color: '#ff4d4f'
+    }, {
+      value: '3',
+      label: '已退回给客户',
+      color: '#1B5BF3'
+    }],
+    key: 'bsE3InStockStatusItemList',
+    code: 'bsE3InStockStatusList',
+    name: '商品入库状态',
+    type: 2,
+    valueKey: 'status',
+    idKey: 'systemOrderId',
+    failValue: '失败'
   }
 };
 var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
   var _this = this,
     _typeMap$options$type,
     _typeMap$options$type2,
-    _this$componentConfig8;
+    _this$componentConfig5,
+    _this$componentConfig6;
   _classCallCheck(this, CommonMultiStatus);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -94,8 +121,9 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "isSingleValue", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3, _this$componentConfig;
+    var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3;
     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) {
       return !isNull(item);
     }) : false;
@@ -107,12 +135,12 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
         valueKey: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.valueKey,
         failValue: (_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.failValue,
         options: (_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.options,
-        isShowPopover: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.belongType) !== "wdt"
+        isShowPopover: !_this.isSingleValue
       })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var _typeMap$_this$type4, _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7, _this$componentConfig2;
+    var _typeMap$_this$type4, _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.key)];
     //兼容多个商品
     return /*#__PURE__*/React.createElement("span", {
@@ -124,7 +152,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
       valueKey: (_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.valueKey,
       failValue: (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.failValue,
       options: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.options,
-      isShowPopover: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.belongType) !== "wdt"
+      isShowPopover: !_this.isSingleValue
     }));
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -141,12 +169,12 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     var _typeMap$_this$type10;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type10 = typeMap[_this.type]) === null || _typeMap$_this$type10 === void 0 ? void 0 : _typeMap$_this$type10.key)];
     return (list || []).map(function (item) {
-      var _typeMap$_this$type11, _typeMap$_this$type12, _typeMap$_this$type13, _this$componentConfig3, _typeMap$_this$type16, _typeMap$_this$type17;
+      var _typeMap$_this$type11, _typeMap$_this$type12, _typeMap$_this$type13, _typeMap$_this$type16, _typeMap$_this$type17;
       var currentOption = (_typeMap$_this$type11 = typeMap[_this.type]) === null || _typeMap$_this$type11 === void 0 ? void 0 : (_typeMap$_this$type12 = _typeMap$_this$type11.options) === null || _typeMap$_this$type12 === void 0 ? void 0 : (_typeMap$_this$type13 = _typeMap$_this$type12.find) === null || _typeMap$_this$type13 === void 0 ? void 0 : _typeMap$_this$type13.call(_typeMap$_this$type12, function (option) {
         var _typeMap$_this$type14;
         return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
       });
-      if (((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.belongType) === "wdt") {
+      if (_this.isSingleValue) {
         var _typeMap$_this$type15;
         return currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || '';
       }
@@ -154,15 +182,15 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     }).join(',');
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig4, _this$componentConfig5, _this$componentConfig6, _this$componentConfig7, _typeMap$_this$type18;
+    var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _typeMap$_this$type18;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
       rules: _this.rules,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
-      required: (_this$componentConfig4 = (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.required) !== null && _this$componentConfig4 !== void 0 ? _this$componentConfig4 : false,
-      tooltip: (_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.showTooltip ? (_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.tooltip : '',
+      required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
+      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(Status, _extends({}, _this.componentConfig, {
         type: (_typeMap$_this$type18 = typeMap[_this.type]) === null || _typeMap$_this$type18 === void 0 ? void 0 : _typeMap$_this$type18.type,
         failValue: typeMap[_this.type].failValue
@@ -172,11 +200,11 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   _defineProperty(this, "filterConfig", function (item) {
     var _typeMap$_this$type19, _item$templateConfig;
     return {
-      searchDefaultConditions: _this.type === 'WAREHOUSING_STATUS' ? SYMBOL.in : SYMBOL.like,
+      searchDefaultConditions: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type19 = typeMap[_this.type]) === null || _typeMap$_this$type19 === void 0 ? void 0 : _typeMap$_this$type19.code),
       name: "".concat(_this.name),
-      filterComponentType: _this.type === 'WAREHOUSING_STATUS' ? 'MultipleSelect' : 'SelectInput',
+      filterComponentType: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? 'MultipleSelect' : 'SelectInput',
       props: {
         options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
         fieldNames: {
@@ -190,7 +218,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
           return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type20 = typeMap[_this.type]) === null || _typeMap$_this$type20 === void 0 ? void 0 : _typeMap$_this$type20.code), value);
         };
       },
-      formatFilterValue: _this.type === 'WAREHOUSING_STATUS' ? null : function (value) {
+      formatFilterValue: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? null : function (value) {
         if (value.type === 'keywords') {
           return value.keywords;
         } else {
@@ -211,7 +239,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   this.canSort = false;
   this.children = [];
   this.dataType = 'object';
-  this.rules = (_this$componentConfig8 = this.componentConfig) !== null && _this$componentConfig8 !== void 0 && _this$componentConfig8.required ? [{
+  this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     required: true,
     validator: function validator(_, value) {
       var hasNo = (value || []).some(function (item) {
@@ -226,5 +254,6 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     }
   }] : [];
   this.align = 'left';
+  this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === 'BS_E3_WAREHOUSING_STATUS';
 });
 export default CommonMultiStatus;

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

@@ -57,12 +57,12 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
       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",
+      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: "string",
+      dataType: "arrayObject",
       disabled: type === "logisticsCompany"
     }];
   });
@@ -121,7 +121,7 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       required: (_this$componentConfig3 = (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.required) !== null && _this$componentConfig3 !== void 0 ? _this$componentConfig3 : false,
-      tooltip: (_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.showTooltip ? (_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.tooltip : '',
+      tooltip: (_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.showTooltip ? (_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.tooltip : "",
       component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
         type: 1,
         options: _this.expressDateInstance.getExpressData(),

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

@@ -43,6 +43,13 @@ var typeMap = {
     sendName: "wlnSendName",
     platformType: 'default'
   },
+  KM_SEND_GOOD: {
+    key: "kmSendGood",
+    name: "km",
+    sendId: "kmSendId",
+    sendName: "kmSendName",
+    platformType: 'km'
+  },
   WDT_SEND_GOOD: {
     key: "wdtSendGood",
     name: "wdt",

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

@@ -39,10 +39,15 @@ var typeMap = {
       label: '等待执行',
       color: '#e7780f'
     }, {
-      oldValue: '等待发送',
+      oldValue: '不满足条件，无需执行',
       value: '不满足条件，无需执行',
       label: '不满足条件，无需执行',
       color: '#8A8A8A'
+    }, {
+      oldValue: '暂不满足条件，等待执行',
+      value: '暂不满足条件，等待执行',
+      label: '暂不满足条件，等待执行',
+      color: '#4D90F7'
     }],
     key: 'msgStatusValues',
     code: 'msgStatus4Search',
@@ -55,6 +60,7 @@ var typeMap = {
   }
 };
 var msgTypeCh = {
+  pdd: '拼多多',
   ding: '钉钉',
   wechat: '微信',
   qq: 'QQ',
@@ -134,7 +140,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
         return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
       });
       var key = item.msgType || 'ding';
-      return "".concat(msgTypeCh[key], "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || '');
+      return "".concat(msgTypeCh[key] || key, "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || '');
     }).join(',');
   });
   _defineProperty(this, "editRender", function (p) {

package/dist/esm/components/Picture/index.d.ts

@@ -13,7 +13,7 @@ declare class BasicPicture implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
-    currenEnv: ComponentInterface['platform'];
+    currenEnv: ComponentInterface["platform"];
     constructor(options: PickOption);
     formatPictures: (pictures: string) => string[];
     render: (value: Value) => React.JSX.Element | null;

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

@@ -41,9 +41,9 @@ var BasicPicture = /*#__PURE__*/_createClass(function BasicPicture(options) {
       return null;
     }
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Image.PreviewGroup, {
-      preview: _this.currenEnv === 'ks' ? {
-        getContainer: (_document = document) === null || _document === void 0 ? void 0 : _document.getElementById('root')
-      } : false
+      preview: _this.currenEnv === "ks" ? {
+        getContainer: (_document = document) === null || _document === void 0 ? void 0 : _document.getElementById("root")
+      } : true
     }, value === null || value === void 0 ? void 0 : value.map(function (pic) {
       return /*#__PURE__*/React.createElement("div", {
         style: {

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

@@ -61,7 +61,8 @@ var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) === undefined) {
       return "--";
     }
-    return "".concat(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])], " ").concat(get(record, "".concat(_this.id, "_").concat(typeMap[type], "Other"), ""));
+    var other = get(record, "".concat(_this.id, "_").concat(typeMap[type], "Other"), "");
+    return "".concat(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]).concat(other ? " " + other : "");
   });
   _defineProperty(this, "getKeyByComponentType", function (type) {
     return typeMap[type] || "";
@@ -82,7 +83,7 @@ var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
-      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 : '',
+      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(ApaasRadio, _extends({}, _this.componentConfig, {
         onChange: p === null || p === void 0 ? void 0 : p.onChange
       }))

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

package/dist/esm/factory.js

@@ -1,6 +1,6 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, ErpTradeId, 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,
 // CommonTradeId,
-CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, KmErpSendGood, AfterSalesOrderId, BsE3Goods, BsE3Reissue } from "./index";
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, AfterSalesOrderId, BsE3Goods, BsE3Reissue } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -130,6 +130,7 @@ export var factory = function factory(type, options) {
     case "JST_SUPPLY":
       return new JstSupply(options);
     case "BS_SYSTEM_ORDER":
+    case "KM_SYSTEM_ORDER":
     case "WLN_SYSTEM_ORDER":
     case "WDT_SYSTEM_ORDER":
     case "BS_E3_SYSTEM_ORDER":
@@ -139,6 +140,7 @@ export var factory = function factory(type, options) {
     case "BS_E3_SEND_GOOD":
     case "WLN_SEND_GOOD":
     case "WDT_SEND_GOOD":
+    case "KM_SEND_GOOD":
       return new JstSendGood(options);
     case "BS_POSTING":
       return new BsPosting(options);
@@ -185,6 +187,7 @@ export var factory = function factory(type, options) {
     case "RETURN_GOODS_STATUS":
     case "EXCHANGE_STATUS":
     case "WAREHOUSING_STATUS":
+    case "BS_E3_WAREHOUSING_STATUS":
       return new CommonMultiStatus(options);
     case "MSG_STATUS":
       return new MsgStatus(options);
@@ -222,9 +225,8 @@ export var factory = function factory(type, options) {
       return new PaymentVoucherCode(options);
     case "LABEL":
       return new Label(options);
-    case "KM_SEND_GOOD":
-      // 快麦ERP发货仓
-      return new KmErpSendGood(options);
+    // case "KM_SEND_GOOD": // 快麦ERP发货仓
+    //   return new KmErpSendGood(options);
     case "AFTER_SALES_ORDER_ID":
       // 售后单ID
       return new AfterSalesOrderId(options);

package/dist/esm/type.d.ts

@@ -29,6 +29,7 @@ export declare type FilterConfigType = {
 };
 export declare type FilterComponentType = "MultipleSelect" | "Input" | "Date" | "Cascader" | "ShopList" | "Rate" | "SelectInput";
 export interface ComponentInterface {
+    transformValue?: (val: any) => any;
     id: string;
     sortField: string;
     sortChildField?: {
@@ -269,7 +270,7 @@ export interface ComponentInterface {
     getComponentValue: (r: Record) => any;
     formDataTransform?: (r: any) => any;
 }
-export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey" | "platform" | "parentName" | "width" | "flowTemplateKey">;
+export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey" | "platform" | "parentName" | "width" | "flowTemplateKey" | "transformValue">;
 export declare type ColumnConfig = {
     id: string;
     name: string;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.22.0",
+  "version": "1.22.1-beta.10",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "sync": "yarn build && yalc push",
     "build": "yarn run lint && father build",
     "lint": "eslint '**/*.{ts,tsx}'",
-    "lint:fix": "eslint --fix '**/*.{ts,tsx}'"
+    "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
+    "sync": "yarn build && yalc push"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "1.22.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.22.0",
+    "@kmkf-fe-packages/basic-components": "1.22.1-beta.10",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.10",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "71df1a3bb82c29f2f459f69c5a61c14f1671ccff",
+  "gitHead": "143523e8020568c583dfb07a1044dc12ade967ee",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }