@kmkf-fe-packages/services-components 0.7.15-alpha.4 → 0.7.15-alpha.42

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.js

@@ -1,4 +1,10 @@
 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 _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); }
@@ -10,15 +16,120 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 GetFormItem from "../../GetFormItem";
-import { GoodImage } from "../../Common";
+import { BsGoodsTable } from "../../Common";
 import ItemView from "../../../commonComponents/ItemView";
 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, BsMemo, BsChildPic, BsChildName, BsChildCode, BsChildSku, BsChildMoney, BsChildNumber, BsChildShare, BsChildType } from "../common/index";
+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);
@@ -36,14 +147,30 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   _defineProperty(this, "bsType", void 0);
   _defineProperty(this, "bsMemo", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+    var _this$componentConfig, _this$componentConfig2, _record, _record$bsExchangeTyp, _this$componentConfig3;
+    console.log("bsexchange", record);
+    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
-      label: _this.name,
-      value: /*#__PURE__*/React.createElement(GoodImage, {
-        list: _this.getComponentValue(record),
-        type: "itemId"
+      label: "".concat(_this.name, "-\u9000\u56DE"),
+      value: /*#__PURE__*/React.createElement(BsGoodsTable, {
+        list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeReturnGoods) || [],
+        showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
       })
-    }) : null;
+    }), /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: "".concat(_this.name, "-\u6362\u51FA"),
+      value: /*#__PURE__*/React.createElement(BsGoodsTable, {
+        list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeSwapOutGoods) || [],
+        showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
+      })
+    }), ["3", "4"].includes(record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : (_record$bsExchangeTyp = _record.bsExchangeType) === null || _record$bsExchangeTyp === void 0 ? void 0 : _record$bsExchangeTyp[0]) ? /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: "".concat(_this.name, "-\u8D60\u54C1"),
+      value: /*#__PURE__*/React.createElement(BsGoodsTable, {
+        list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeGiftGoods) || [],
+        showHeader: ((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showHeader) || []
+      })
+    }) : null) : null;
   });
   _defineProperty(this, "renderPc", function () {
     return null;
@@ -58,7 +185,7 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     return null;
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig, _this$effects, _this$effects2;
+    var _this$componentConfig4, _this$effects, _this$effects2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -66,7 +193,7 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       component: /*#__PURE__*/React.createElement(Exchange, _extends({}, _this.componentConfig, {
-        maxLength: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.maxLength) || 20,
+        maxLength: ((_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.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) || [],
         width: "90%"
@@ -115,99 +242,45 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   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),
     name: "换货商品"
   }));
   this.bsType = new BsType(_objectSpread(_objectSpread({}, options), {}, {
-    id: "".concat(options.id, "_bsReissueType"),
+    id: "".concat(options.id),
     name: "换货类型"
   }));
   this.bsMemo = new BsMemo(_objectSpread(_objectSpread({}, options), {}, {
-    id: "".concat(options.id, "_bsReissueType"),
+    id: "".concat(options.id),
     name: "换货备注"
   }));
-  this.children = [new BsType(_objectSpread(_objectSpread({}, options), {}, {
-    id: "".concat(options.id, "_bsReissueType"),
-    name: "换货类型"
-  })), new BsMemo(_objectSpread(_objectSpread({}, options), {}, {
-    id: "".concat(options.id, "_bsReissueType"),
-    name: "换货备注"
-  })), new BsChildPic(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回图片",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildName(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回名称",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回编码",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildSku(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回sku编码",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildMoney(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回实付金额",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildNumber(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回数量",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildShare(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回分摊价",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildType(_objectSpread(_objectSpread({}, options), {}, {
-    name: "退回赠品类型",
-    id: "".concat(options.id, "_bsExchangeReturnGoods")
-  })), new BsChildPic(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出图片",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildName(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出名称",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出编码",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildSku(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出sku编码",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildMoney(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出实付金额",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildNumber(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出数量",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildShare(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出分摊价",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildType(_objectSpread(_objectSpread({}, options), {}, {
-    name: "换出赠品类型",
-    id: "".concat(options.id, "_bsExchangeSwapOutGoods")
-  })), new BsChildPic(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品图片",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  })), new BsChildName(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品名称",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  })), new BsChildCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品编码",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  })), new BsChildSku(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品sku编码",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  })), new BsChildMoney(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品实付金额",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  })), new BsChildNumber(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品数量",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  })), new BsChildShare(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品分摊价",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  })), new BsChildType(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品赠品类型",
-    id: "".concat(options.id, "_bsExchangeGiftGoods")
-  }))];
+  this.children = [this.bsType, this.bsMemo].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,

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

@@ -14,9 +14,9 @@ declare class BsGoods implements ComponentInterface {
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
-    renderClient: (record: any) => any;
-    renderPc: (value: unknown, record: Record) => any;
-    renderLog: (r: Record) => any;
+    renderClient: (record: any) => React.JSX.Element | null;
+    renderPc: () => null;
+    renderLog: (r: Record) => null;
     getComponentValue: (r: Record) => any;
     renderExport: () => null;
     editRender: (p: any) => React.JSX.Element;
@@ -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

@@ -10,14 +10,50 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 GetFormItem from "../../GetFormItem";
-import { BsGoodImage } from "../../Common";
-import { BsChildPic, BsChildName, BsChildCode, BsChildSku, BsChildMoney, BsChildNumber, BsChildShare, BsChildType } from "../common/index";
+import { BsGoodsTable } from "../../Common";
+import { BsHeaderPic, BsHeaderName, BsHeaderCode, BsHeaderSku, BsHeaderMoney, BsHeaderNumber, BsHeaderShare, BsHeaderType } from "../common/index";
+import ItemView from "../../../commonComponents/ItemView";
 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,
-    _this$componentConfig2;
+    _options$componentCon,
+    _this$componentConfig3;
   _classCallCheck(this, BsGoods);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -32,28 +68,21 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? record === null || record === void 0 ? void 0 : record["".concat(_this.id)].map(function (item, index) {
-      return /*#__PURE__*/React.createElement(BsGoodImage, {
-        item: item,
-        index: index
-      });
-    }) : null;
+    var _record, _this$componentConfig;
+    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      value: /*#__PURE__*/React.createElement(BsGoodsTable, {
+        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) || []
+      })
+    })) : 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")];
@@ -62,7 +91,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
     return null;
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig, _this$effects, _this$effects2;
+    var _this$componentConfig2, _this$effects, _this$effects2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -70,7 +99,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       component: /*#__PURE__*/React.createElement(Goods, _extends({}, _this.componentConfig, {
-        maxLength: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.maxLength) || 20,
+        maxLength: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.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) || [],
         width: "90%"
@@ -78,7 +107,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 +115,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
       name: item.name,
       // 过滤组件名称
       filterComponentType: "Input"
-    };
+    }];
   });
   this.name = options.name;
   this.id = options.id;
@@ -94,38 +123,23 @@ 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 = [new BsChildPic(_objectSpread(_objectSpread({}, options), {}, {
-    name: "bs图片",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildName(_objectSpread(_objectSpread({}, options), {}, {
-    name: "名称",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "编码",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildSku(_objectSpread(_objectSpread({}, options), {}, {
-    name: "sku编码",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildMoney(_objectSpread(_objectSpread({}, options), {}, {
-    name: "实付金额",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildNumber(_objectSpread(_objectSpread({}, options), {}, {
-    name: "数量",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildShare(_objectSpread(_objectSpread({}, options), {}, {
-    name: "分摊价",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildType(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品类型",
-    id: "".concat(options.id, "_bsGoods")
-  }))];
+  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 ? [{
+  this.rules = this !== null && this !== void 0 && (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     required: true,
     validator: function validator(_, value) {
-      if (!value || !value.length) {
+      var _value$bsGoods;
+      if (!value || !(value !== null && value !== void 0 && (_value$bsGoods = value.bsGoods) !== null && _value$bsGoods !== void 0 && _value$bsGoods.length)) {
         return Promise.reject(new Error("请选择bs商品"));
       }
       return Promise.resolve();

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;