@kmkf-fe-packages/services-components 0.7.15-alpha.3 → 0.7.15-alpha.31

package/dist/esm/commonComponents/QueryLogisticsTrack/index.js

@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from "react";
-import { Modal, Timeline, message, Input } from "antd";
+import { Modal, Timeline, message } from "antd";
 import { request } from "@kmkf-fe-packages/kmkf-utils";
 var info = Modal.info;
 var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
@@ -48,24 +48,26 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
             }
             return _context.abrupt("return", message.error("缺少物流公司或物流单号"));
           case 2:
+            logisticsTraceSearch();
             //如果是顺丰且没有手机号 要输入手机号
-            if (interceptCompany === "SF" && !interceptSenderMobile) {
-              Modal.confirm({
-                title: "输入手机号",
-                okText: "确定",
-                cancelText: "取消",
-                content: /*#__PURE__*/React.createElement(Input, {
-                  onChange: function onChange(e) {
-                    return setInputVal(e.target.value);
-                  }
-                }),
-                onOk: function onOk() {
-                  logisticsTraceSearch(inputVal);
-                }
-              });
-            } else {
-              logisticsTraceSearch();
-            }
+            // if (interceptCompany === "SF" && !interceptSenderMobile) {
+            //   Modal.confirm({
+            //     title: "查询物流轨迹",
+            //     okText: "查询",
+            //     cancelText: "取消",
+            //     content: (
+            //       <div>
+            //         发件人手机号
+            //         <Input onChange={(e) => setInputVal(e.target.value)}></Input>
+            //       </div>
+            //     ),
+            //     onOk: () => {
+            //       logisticsTraceSearch(inputVal);
+            //     },
+            //   });
+            // } else {
+            //   logisticsTraceSearch();
+            // }
           case 3:
           case "end":
             return _context.stop();
@@ -93,17 +95,17 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
         var result = res.result,
           success = res.success,
           data = res.data,
-          message = res.message;
+          msg = res.message;
         if (result === 100 || success) {
           info({
             title: "物流轨迹",
             okText: "确定",
             icon: null,
             width: modelWidth,
-            content: LogisticsList(data)
+            content: LogisticsList(data === null || data === void 0 ? void 0 : data.traceDetailList)
           });
         } else {
-          message && message.error(message);
+          msg && message.error(msg);
         }
       });
     } catch (err) {

package/dist/esm/components/BS/BsExchange/index.d.ts

@@ -1,8 +1,7 @@
 import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
 import React from "react";
 import BsExchangeImage from "../common/BsExchangeImage";
-import BsType from "../common/BsType";
-import BsMemo from "../common/BsMemo";
+import { BsType, BsMemo } from "../common/index";
 declare class BsExchange implements ComponentInterface {
     name: string;
     id: string;
@@ -24,7 +23,7 @@ declare class BsExchange implements ComponentInterface {
     renderPc: () => null;
     renderLog: (r: Record) => null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: (value: any, record: any) => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
         searchDefaultConditions: "eq";
@@ -42,6 +41,8 @@ declare class BsExchange implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
+        props?: undefined;
+        filterFn?: undefined;
     })[];
 }
 export default BsExchange;

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

@@ -1,12 +1,12 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -18,13 +18,118 @@ import React from "react";
 import GetFormItem from "../../GetFormItem";
 import { GoodImage } from "../../Common";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { BsExchange as Exchange } from "@kmkf-fe-packages/basic-components";
+import { SYMBOL } from "../../../constant";
 import BsExchangeImage from "../common/BsExchangeImage";
-import BsType from "../common/BsType";
-import BsMemo from "../common/BsMemo";
+import { BsType, BsMemo, BsHeaderPic, BsHeaderName, BsHeaderCode, BsHeaderSku, BsHeaderMoney, BsHeaderNumber, BsHeaderShare, BsHeaderType } from "../common/index";
+var returnHeaderMap = {
+  pic: {
+    component: BsHeaderPic,
+    name: "退回图片"
+  },
+  name: {
+    component: BsHeaderName,
+    name: "退回名称"
+  },
+  code: {
+    component: BsHeaderCode,
+    name: "退回编码"
+  },
+  sku: {
+    component: BsHeaderSku,
+    name: "退回sku编码"
+  },
+  money: {
+    component: BsHeaderMoney,
+    name: "退回实付金额"
+  },
+  number: {
+    component: BsHeaderNumber,
+    name: "退回数量"
+  },
+  share: {
+    component: BsHeaderShare,
+    name: "退回分摊价"
+  },
+  type: {
+    component: BsHeaderType,
+    name: "退回赠品类型"
+  }
+};
+var swapOutHeaderMap = {
+  pic: {
+    component: BsHeaderPic,
+    name: "换出图片"
+  },
+  name: {
+    component: BsHeaderName,
+    name: "换出名称"
+  },
+  code: {
+    component: BsHeaderCode,
+    name: "换出编码"
+  },
+  sku: {
+    component: BsHeaderSku,
+    name: "换出sku编码"
+  },
+  money: {
+    component: BsHeaderMoney,
+    name: "换出实付金额"
+  },
+  number: {
+    component: BsHeaderNumber,
+    name: "换出数量"
+  },
+  share: {
+    component: BsHeaderShare,
+    name: "换出分摊价"
+  },
+  type: {
+    component: BsHeaderType,
+    name: "换出赠品类型"
+  }
+};
+var giftHeaderMap = {
+  pic: {
+    component: BsHeaderPic,
+    name: "赠品图片"
+  },
+  name: {
+    component: BsHeaderName,
+    name: "赠品名称"
+  },
+  code: {
+    component: BsHeaderCode,
+    name: "赠品编码"
+  },
+  sku: {
+    component: BsHeaderSku,
+    name: "赠品sku编码"
+  },
+  money: {
+    component: BsHeaderMoney,
+    name: "赠品实付金额"
+  },
+  number: {
+    component: BsHeaderNumber,
+    name: "赠品数量"
+  },
+  share: {
+    component: BsHeaderShare,
+    name: "赠品分摊价"
+  },
+  type: {
+    component: BsHeaderType,
+    name: "赠品赠品类型"
+  }
+};
 var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
-  var _this = this;
+  var _this = this,
+    _options$componentCon,
+    _options$componentCon2,
+    _options$componentCon3;
   _classCallCheck(this, BsExchange);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -58,13 +163,10 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     return null;
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsGoods")];
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    var _ref;
-    return (_ref = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_bsGoods")]) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (i) {
-      return i.numIid;
-    }).join("\n");
+    return null;
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$effects, _this$effects2;
@@ -83,15 +185,48 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return [_this.bsType.filterConfig(item)].concat(_toConsumableArray(_this.goodImage.filterConfig(item)));
+    var _item$config;
+    return [{
+      searchDefaultConditions: SYMBOL.eq,
+      type: item.type,
+      id: "".concat(item.id, "_bsReissueType"),
+      name: "".concat(item.name, "-\u6362\u8D27\u7C7B\u578B"),
+      filterComponentType: "Cascader",
+      props: {
+        options: item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.reasonList
+      },
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "bsReissueType"), value);
+        };
+      }
+    }, {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(item.id, "_bsExchangeReturnGoods"),
+      name: "".concat(_this.name, "-\u9000\u56DE"),
+      filterComponentType: "Input"
+    }, {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(item.id, "_bsExchangeSwapOutGoods"),
+      name: "".concat(_this.name, "-\u6362\u51FA"),
+      filterComponentType: "Input"
+    }, {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(item.id, "_bsExchangeGiftGoods"),
+      name: "".concat(_this.name, "-\u8D60\u54C1"),
+      filterComponentType: "Input"
+    }];
   });
   this.name = options.name;
   this.id = options.id;
-  this.sortField = "".concat(options.id, "_bsGoods");
-  this.formField = "".concat(options.id, "_bsGoods");
+  this.sortField = "".concat(options.id);
+  this.formField = "".concat(options.id);
   this.type = options.type;
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
-  this.isCombinationComponent = false;
+  this.isCombinationComponent = true;
   this.canSort = false;
   this.goodImage = new BsExchangeImage(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id),
@@ -105,7 +240,37 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     id: "".concat(options.id, "_bsReissueType"),
     name: "换货备注"
   }));
-  this.children = [];
+  this.children = [new BsType(_objectSpread(_objectSpread({}, options), {}, {
+    id: "".concat(options.id, "_bsReissueType"),
+    name: "换货类型"
+  })), new BsMemo(_objectSpread(_objectSpread({}, options), {}, {
+    id: "".concat(options.id, "_bsReissueType"),
+    name: "换货备注"
+  }))].concat(_toConsumableArray(((options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []).reduce(function (prv, next) {
+    if (returnHeaderMap[next]) {
+      prv.push(new returnHeaderMap[next].component(_objectSpread(_objectSpread({}, options), {}, {
+        name: returnHeaderMap[next].name,
+        id: "".concat(options.id, "_bsExchangeReturnGoods")
+      })));
+    }
+    return prv;
+  }, [])), _toConsumableArray(((options === null || options === void 0 ? void 0 : (_options$componentCon2 = options.componentConfig) === null || _options$componentCon2 === void 0 ? void 0 : _options$componentCon2.showHeader) || []).reduce(function (prv, next) {
+    if (swapOutHeaderMap[next]) {
+      prv.push(new swapOutHeaderMap[next].component(_objectSpread(_objectSpread({}, options), {}, {
+        name: swapOutHeaderMap[next].name,
+        id: "".concat(options.id, "_bsExchangeSwapOutGoods")
+      })));
+    }
+    return prv;
+  }, [])), _toConsumableArray(((options === null || options === void 0 ? void 0 : (_options$componentCon3 = options.componentConfig) === null || _options$componentCon3 === void 0 ? void 0 : _options$componentCon3.showHeader) || []).reduce(function (prv, next) {
+    if (giftHeaderMap[next]) {
+      prv.push(new giftHeaderMap[next].component(_objectSpread(_objectSpread({}, options), {}, {
+        name: giftHeaderMap[next].name,
+        id: "".concat(options.id, "_bsExchangeGiftGoods")
+      })));
+    }
+    return prv;
+  }, [])));
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
   this.rules = [{
     required: true,
@@ -119,7 +284,14 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   }, {
     validator: function validator(_, value) {
       var _value$bsExchangeType;
+      console.log(value);
       if (value && ["2", "4"].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType = value.bsExchangeType) === null || _value$bsExchangeType === void 0 ? void 0 : _value$bsExchangeType[0])) {
+        var hasNoGood = ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).some(function (item) {
+          return !(item !== null && item !== void 0 && item.bsExchangeReturnGoods.length);
+        });
+        if (hasNoGood) {
+          return Promise.reject(new Error("请选择退回商品后再提交工单"));
+        }
         var hasMore = ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).some(function (item) {
           var returnMoney = ((item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods) || []).reduce(function (prv, next) {
             prv += Number(next.money || 0);
@@ -134,6 +306,12 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
         if (hasMore) {
           return Promise.reject(new Error("换货商品的金额不能大于退回商品的金额"));
         }
+        var hasLen = ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).some(function (item) {
+          return (item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods.length) !== (item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods.length);
+        });
+        if (hasLen) {
+          return Promise.reject(new Error("请核对商品数据，再提交工单"));
+        }
       }
       return Promise.resolve();
     }

package/dist/esm/components/BS/BsGoods/index.d.ts

@@ -15,10 +15,10 @@ declare class BsGoods implements ComponentInterface {
     dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
     renderClient: (record: any) => any;
-    renderPc: (value: unknown, record: Record) => any;
-    renderLog: (r: Record) => any;
+    renderPc: () => null;
+    renderLog: (r: Record) => null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: () => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
         searchDefaultConditions: "like";
@@ -26,6 +26,6 @@ declare class BsGoods implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-    };
+    }[];
 }
 export default BsGoods;

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

@@ -1,4 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -9,11 +11,47 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import GetFormItem from "../../GetFormItem";
 import { BsGoodImage } from "../../Common";
+import { BsHeaderPic, BsHeaderName, BsHeaderCode, BsHeaderSku, BsHeaderMoney, BsHeaderNumber, BsHeaderShare, BsHeaderType } from "../common/index";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { BsGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
+var childHeaderMap = {
+  pic: {
+    component: BsHeaderPic,
+    name: "图片"
+  },
+  name: {
+    component: BsHeaderName,
+    name: "名称"
+  },
+  code: {
+    component: BsHeaderCode,
+    name: "编码"
+  },
+  sku: {
+    component: BsHeaderSku,
+    name: "sku编码"
+  },
+  money: {
+    component: BsHeaderMoney,
+    name: "实付金额"
+  },
+  number: {
+    component: BsHeaderNumber,
+    name: "数量"
+  },
+  share: {
+    component: BsHeaderShare,
+    name: "分摊价"
+  },
+  type: {
+    component: BsHeaderType,
+    name: "赠品类型"
+  }
+};
 var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
   var _this = this,
+    _options$componentCon,
     _this$componentConfig2;
   _classCallCheck(this, BsGoods);
   _defineProperty(this, "name", void 0);
@@ -36,30 +74,17 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
       });
     }) : null;
   });
-  _defineProperty(this, "renderPc", function (value, record) {
-    if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_bsGoods")]) === undefined) {
-      return /*#__PURE__*/React.createElement("span", null, "--");
-    }
-    //兼容多个商品
-    return record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_bsGoods")].map(function (item, index) {
-      return /*#__PURE__*/React.createElement(BsGoodImage, {
-        item: item,
-        index: index
-      });
-    });
+  _defineProperty(this, "renderPc", function () {
+    return null;
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsGoods")])) return null;
-    return _this.renderPc(undefined, r);
+    return null;
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsGoods")];
   });
-  _defineProperty(this, "renderExport", function (value, record) {
-    var _ref;
-    return (_ref = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_bsGoods")]) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (i) {
-      return i.numIid;
-    }).join("\n");
+  _defineProperty(this, "renderExport", function () {
+    return null;
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$effects, _this$effects2;
@@ -78,7 +103,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return {
+    return [{
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_bsGoods"),
@@ -86,7 +111,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
       name: item.name,
       // 过滤组件名称
       filterComponentType: "Input"
-    };
+    }];
   });
   this.name = options.name;
   this.id = options.id;
@@ -94,9 +119,17 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
   this.formField = "".concat(options.id, "_bsGoods");
   this.type = options.type;
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
-  this.isCombinationComponent = false;
+  this.isCombinationComponent = true;
   this.canSort = false;
-  this.children = [];
+  this.children = ((options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []).reduce(function (prv, next) {
+    if (childHeaderMap[next]) {
+      prv.push(new childHeaderMap[next].component(_objectSpread(_objectSpread({}, options), {}, {
+        name: childHeaderMap[next].name,
+        id: "".concat(options.id, "_bsGoods")
+      })));
+    }
+    return prv;
+  }, []);
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
   this.rules = this !== null && this !== void 0 && (_this$componentConfig2 = this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.required ? [{
     required: true,

package/dist/esm/components/BS/BsLogistics/index.d.ts

@@ -1,15 +1,15 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
-import React from "react";
-import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-import Express from "../../Express";
-import ExpressCode from "../../ExpressCode";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import Express from '../../Express';
+import ExpressCode from '../../ExpressCode';
 declare class BsLogistics implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     expressDateInstance: InstanceType<typeof ExpressData>;
     express: Express;
     expressCode: ExpressCode;
@@ -17,7 +17,7 @@ declare class BsLogistics implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
     editRender: (p: any) => React.JSX.Element;
     renderClient: (record: Record) => React.JSX.Element;

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

@@ -8,9 +8,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React from "react";
-import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-import { ExpressLogistics } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import { ExpressLogistics } from '@kmkf-fe-packages/basic-components';
 import Express from "../../Express";
 import ExpressCode from "../../ExpressCode";
 import GetFormItem from "../../GetFormItem";
@@ -66,9 +66,9 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return [_this.express.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
-      subKey: "bsLogisticsCompany"
+      subKey: 'bsLogisticsCompany'
     })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
-      subKey: "bsLogisticsCode"
+      subKey: 'bsLogisticsCode'
     }))];
   });
   this.name = options.name;
@@ -79,33 +79,33 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
   this.componentConfig = options.componentConfig;
   this.expressDateInstance = ExpressData.getInstance();
   this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
-    name: "快递物流公司",
+    name: '快递物流公司',
     id: "".concat(this.id, "_bsLogisticsCompany")
   }));
   this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "快递物流单号",
+    name: '快递物流单号',
     id: "".concat(this.id, "_bsLogisticsCode")
   }));
   this.isCombinationComponent = true;
   this.canSort = false;
-  this.dataType = "object";
+  this.dataType = 'object';
   this.children = [this.express, this.expressCode];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     validator: function validator(_, value) {
       var _this$componentConfig4;
       if ((_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.isSingle) {
         var _this$componentConfig5, _this$componentConfig6;
-        if (((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showField) === "EXPRESS_COMPANY" && !(value !== null && value !== void 0 && value.company)) {
-          return Promise.reject(new Error("请选择物流公司"));
-        } else if (((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.showField) === "EXPRESS_WAYBILL_CODE" && !(value !== null && value !== void 0 && value.order)) {
-          return Promise.reject(new Error("请输入物流单号"));
+        if (((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showHeader) === 'EXPRESS_COMPANY' && !(value !== null && value !== void 0 && value.company)) {
+          return Promise.reject(new Error('请选择物流公司'));
+        } else if (((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.showHeader) === 'EXPRESS_WAYBILL_CODE' && !(value !== null && value !== void 0 && value.order)) {
+          return Promise.reject(new Error('请输入物流单号'));
         }
       } else {
         if (!(value !== null && value !== void 0 && value.company)) {
-          return Promise.reject(new Error("请选择物流公司"));
+          return Promise.reject(new Error('请选择物流公司'));
         }
         if (!(value !== null && value !== void 0 && value.order)) {
-          return Promise.reject(new Error("请输入物流单号"));
+          return Promise.reject(new Error('请输入物流单号'));
         }
       }
       return Promise.resolve();