@kmkf-fe-packages/services-components 0.7.15-alpha.7 → 0.7.15-alpha.70

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

@@ -1,14 +1,24 @@
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _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; }
 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; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 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 React from 'react';
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../../constant";
+var componentType = {
+  BS_EXCHANGE_GOODS: 'bsExchangeType',
+  BS_REISSUE_GOODS: 'bsReissueType'
+};
 var BsType = /*#__PURE__*/_createClass(function BsType(options) {
   var _this = this;
   _classCallCheck(this, BsType);
@@ -24,32 +34,52 @@ var BsType = /*#__PURE__*/_createClass(function BsType(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "getParentId", function () {
+    var _this$id$split = _this.id.split('_'),
+      _this$id$split2 = _slicedToArray(_this$id$split, 2),
+      key = _this$id$split2[0],
+      name = _this$id$split2[1];
+    return "".concat(key, "_").concat(name);
+  });
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+    var _record$key$component, _find, _this$componentConfig;
+    var _this$getParentId$spl = _this.getParentId().split('_'),
+      _this$getParentId$spl2 = _slicedToArray(_this$getParentId$spl, 1),
+      key = _this$getParentId$spl2[0];
+    if (!(record !== null && record !== void 0 && (_record$key$component = record[key][componentType[_this.type]]) !== null && _record$key$component !== void 0 && _record$key$component.length)) {
+      return null;
+    }
+    var text = (_find = (((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.reasonList) || []).find(function (item) {
+      var _record$key, _record$key$component2;
+      return item.value === ((_record$key = record[key]) === null || _record$key === void 0 ? void 0 : (_record$key$component2 = _record$key[componentType[_this.type]]) === null || _record$key$component2 === void 0 ? void 0 : _record$key$component2[0]);
+    })) === null || _find === void 0 ? void 0 : _find.label;
+    return !isNull(record === null || record === void 0 ? void 0 : record[key]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.getComponentValue(record)
+      value: text
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _this$getComponentVal;
-    return /*#__PURE__*/React.createElement("span", null, (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : "--");
+    return /*#__PURE__*/React.createElement("span", null, (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : '--');
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r[_this.id])) return null;
+    var id = _this.getParentId();
+    if (isNull(r === null || r === void 0 ? void 0 : r[id])) return null;
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    var _find, _this$componentConfig;
-    var type = r !== null && r !== void 0 && r[_this.id] ? r === null || r === void 0 ? void 0 : r[_this.id][0] : "";
-    var text = (_find = (((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.reasonList) || []).find(function (item) {
+    var _r$id, _find2, _this$componentConfig2;
+    var id = _this.getParentId();
+    var type = r !== null && r !== void 0 && r[id] ? r === null || r === void 0 ? void 0 : (_r$id = r[id]) === null || _r$id === void 0 ? void 0 : _r$id[0] : '';
+    var text = (_find2 = (((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.reasonList) || []).find(function (item) {
       return item.value === type;
-    })) === null || _find === void 0 ? void 0 : _find.label;
+    })) === null || _find2 === void 0 ? void 0 : _find2.label;
     return text;
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$getComponentVal2;
-    return (_this$getComponentVal2 = _this.getComponentValue(record)) !== null && _this$getComponentVal2 !== void 0 ? _this$getComponentVal2 : "--";
+    return (_this$getComponentVal2 = _this.getComponentValue(record)) !== null && _this$getComponentVal2 !== void 0 ? _this$getComponentVal2 : '--';
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -57,14 +87,20 @@ var BsType = /*#__PURE__*/_createClass(function BsType(options) {
   _defineProperty(this, "filterConfig", function (item) {
     var _item$config;
     var subKey = item.subKey;
+    console.log('bsTypefilterConfig', item);
     return {
-      searchDefaultConditions: SYMBOL.eq,
+      searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: item.id,
       name: "".concat(item.name, "-\u7C7B\u578B"),
-      filterComponentType: "Cascader",
+      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
+        options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.reasonList) || []
+      },
+      formatFilterValue: function formatFilterValue(val) {
+        if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
+          return val[val.length - 1];
+        }
       },
       filterFn: function filterFn(value) {
         return function (i) {
@@ -79,11 +115,11 @@ var BsType = /*#__PURE__*/_createClass(function BsType(options) {
   this.formField = options.id;
   this.type = options.type;
   this.componentConfig = options.componentConfig;
-  this.align = "left";
+  this.align = 'left';
   this.width = 200;
   this.isCombinationComponent = false;
-  this.canSort = true;
-  this.dataType = "string";
+  this.canSort = false;
+  this.dataType = 'string';
   this.children = [];
 });
 export default BsType;

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

@@ -1,10 +1,11 @@
 export { default as BsType } from "./BsType";
 export { default as BsMemo } from "./BsMemo";
-export { default as BsChildPic } from "./BsChildPic";
-export { default as BsChildName } from "./BsChildName";
-export { default as BsChildCode } from "./BsChildCode";
-export { default as BsChildSku } from "./BsChildSku";
-export { default as BsChildMoney } from "./BsChildMoney";
-export { default as BsChildNumber } from "./BsChildNumber";
-export { default as BsChildShare } from "./BsChildShare";
-export { default as BsChildType } from "./BsChildType";
+export { default as BsHeaderPic } from "./BsHeaderPic";
+export { default as BsHeaderName } from "./BsHeaderName";
+export { default as BsHeaderCode } from "./BsHeaderCode";
+export { default as BsHeaderSku } from "./BsHeaderSku";
+export { default as BsHeaderMoney } from "./BsHeaderMoney";
+export { default as BsHeaderNumber } from "./BsHeaderNumber";
+export { default as BsHeaderShare } from "./BsHeaderShare";
+export { default as BsHeaderType } from "./BsHeaderType";
+export { default as BsHeaderGood } from "./BsHeaderGood";

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

@@ -1,10 +1,11 @@
 export { default as BsType } from "./BsType";
 export { default as BsMemo } from "./BsMemo";
-export { default as BsChildPic } from "./BsChildPic";
-export { default as BsChildName } from "./BsChildName";
-export { default as BsChildCode } from "./BsChildCode";
-export { default as BsChildSku } from "./BsChildSku";
-export { default as BsChildMoney } from "./BsChildMoney";
-export { default as BsChildNumber } from "./BsChildNumber";
-export { default as BsChildShare } from "./BsChildShare";
-export { default as BsChildType } from "./BsChildType";
+export { default as BsHeaderPic } from "./BsHeaderPic";
+export { default as BsHeaderName } from "./BsHeaderName";
+export { default as BsHeaderCode } from "./BsHeaderCode";
+export { default as BsHeaderSku } from "./BsHeaderSku";
+export { default as BsHeaderMoney } from "./BsHeaderMoney";
+export { default as BsHeaderNumber } from "./BsHeaderNumber";
+export { default as BsHeaderShare } from "./BsHeaderShare";
+export { default as BsHeaderType } from "./BsHeaderType";
+export { default as BsHeaderGood } from "./BsHeaderGood";

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

@@ -60,7 +60,11 @@ var EBuyerNick = /*#__PURE__*/_createClass(function EBuyerNick(options) {
     if (buyerNick === undefined && buyerOpenUid === undefined) {
       return /*#__PURE__*/React.createElement("span", null, "--");
     }
-    return /*#__PURE__*/React.createElement("span", null, buyerNick && /*#__PURE__*/React.createElement(PlatBuyer, {
+    return /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, buyerNick && /*#__PURE__*/React.createElement(PlatBuyer, {
       shopId: record === null || record === void 0 ? void 0 : record.shopId,
       buyerNick: buyerNick,
       buyerOpenUid: buyerOpenUid,

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

@@ -12,6 +12,7 @@ declare class BasicCascader implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface['dataType'];
+    format: ComponentInterface['format'];
     constructor(options: PickOption);
     /**
      * 通过值计算展示内容

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

@@ -28,6 +28,7 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "format", void 0);
   _defineProperty(this, "getValue", function (value) {
     var _findLabelBySelectVal, _findLabelBySelectVal2, _this$componentConfig;
     return (_findLabelBySelectVal = findLabelBySelectValue(value, (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.options)) === null || _findLabelBySelectVal === void 0 ? void 0 : (_findLabelBySelectVal2 = _findLabelBySelectVal.map(function (i) {
@@ -139,7 +140,8 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
   this.children = [];
   this.isCombinationComponent = false;
   this.canSort = true;
-  this.dataType = 'object'; // FIXME:  多级下拉这种不知道要如何去做条件判断
+  this.dataType = 'array';
+  this.format = 'cascader';
 }
 
 /**

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 declare type getFormItemProps = {
     name: string;
     title: string;
@@ -19,6 +19,11 @@ export declare const BsGoodImage: ({ item, index }: {
     item: any;
     index: number;
 }) => React.JSX.Element;
-export declare const BsExchangeList: ({ list }: any) => React.JSX.Element;
+export declare const BsExchangeList: ({ list, showHeader }: any) => React.JSX.Element;
 export declare const BsGoodPic: (list: string[]) => React.JSX.Element[];
+export declare const BsGoodsTable: ({ list, showHeader, text, }: {
+    list: any[];
+    showHeader: string[];
+    text?: string | undefined;
+}) => React.JSX.Element;
 export {};

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

@@ -1,12 +1,16 @@
+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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _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 { Form, Button, Modal, Tooltip, Space, Image, Popover } from "antd";
-import React, { useState } from "react";
-import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table } from 'antd';
+import React, { useState, useMemo } from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
 export var getFormItem = function getFormItem(_ref) {
@@ -26,7 +30,7 @@ export var getFormItem = function getFormItem(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "form-item--wrap",
     style: {
-      position: "relative"
+      position: 'relative'
     }
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: name,
@@ -40,43 +44,43 @@ export var showImage = function showImage(_ref2) {
   var item = _ref2.item,
     type = _ref2.type,
     index = _ref2.index;
-  var picUrl = item.picUrl ? (item === null || item === void 0 ? void 0 : item.platform) !== "tabao" ? item.picUrl : item.picUrl + "_40x40.jpg" : defaultImg;
+  var picUrl = item.picUrl ? (item === null || item === void 0 ? void 0 : item.platform) !== 'tabao' ? item.picUrl : item.picUrl + '_40x40.jpg' : defaultImg;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.goodImgBox,
     key: index
-  }, (item === null || item === void 0 ? void 0 : item.platform) === "taobao" ? /*#__PURE__*/React.createElement("a", {
+  }, (item === null || item === void 0 ? void 0 : item.platform) === 'taobao' ? /*#__PURE__*/React.createElement("a", {
     target: "_blank",
     href: "https://item.taobao.com/item.htm?id=".concat(item.numIid)
   }, /*#__PURE__*/React.createElement("img", {
     style: {
-      width: "40px",
-      height: "40px",
-      objectFit: "contain"
+      width: '40px',
+      height: '40px',
+      objectFit: 'contain'
     },
     src: picUrl
   })) : /*#__PURE__*/React.createElement("img", {
     style: {
-      width: "40px",
-      height: "40px",
-      objectFit: "contain"
+      width: '40px',
+      height: '40px',
+      objectFit: 'contain'
     },
     src: picUrl
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.options
-  }, type === "itemId" && /*#__PURE__*/React.createElement(TextTool, {
-    title: "商品id",
+  }, type === 'itemId' && /*#__PURE__*/React.createElement(TextTool, {
+    title: '商品id',
     text: item.numIid
-  }), type === "itemCode" && /*#__PURE__*/React.createElement(TextTool, {
-    title: "商品编码",
+  }), type === 'itemCode' && /*#__PURE__*/React.createElement(TextTool, {
+    title: '商品编码',
     text: item.outerId
-  }), (type === "itemThird" || type === "jstItemThird") && (item.itemId || item.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
-    title: "供应商编码",
+  }), (type === 'itemThird' || type === 'jstItemThird') && (item.itemId || item.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
+    title: '供应商编码',
     text: item.itemId || item.supplierItemOuterId
-  }), (type === "itemThird" || type === "jstItemThird") && item.supplierName && /*#__PURE__*/React.createElement(TextTool, {
-    title: "供应商名称",
+  }), (type === 'itemThird' || type === 'jstItemThird') && item.supplierName && /*#__PURE__*/React.createElement(TextTool, {
+    title: '供应商名称',
     text: item.supplierName
   }), item.propertiesName && /*#__PURE__*/React.createElement(TextTool, {
-    title: "规格",
+    title: '规格',
     text: item.propertiesName
   })));
 };
@@ -89,9 +93,9 @@ var TextTool = function TextTool(_ref3) {
     title: text
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      overflow: "hidden",
-      whiteSpace: "nowrap",
-      textOverflow: "ellipsis"
+      overflow: 'hidden',
+      whiteSpace: 'nowrap',
+      textOverflow: 'ellipsis'
     }
   }, title, ":", text));
 };
@@ -111,7 +115,7 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
       return setVisible(true);
     }
   }, "\u67E5\u770B\u5168\u90E8(".concat(total, ")")), /*#__PURE__*/React.createElement(Modal, {
-    open: visible,
+    visible: visible,
     footer: null,
     onCancel: function onCancel() {
       return setVisible(false);
@@ -119,47 +123,47 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
     title: "\u6240\u6709\u9009\u62E9\u5B9D\u8D1D"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      display: "flex",
-      flexWrap: "wrap"
+      display: 'flex',
+      flexWrap: 'wrap'
     }
   }, allImage.map(function (i, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        width: "50%"
+        width: '50%'
       },
       key: index
     }, /*#__PURE__*/React.createElement("a", {
       href: i.link,
       target: "__blank",
       style: {
-        marginRight: "12px",
-        marginTop: "8px",
-        padding: "2px",
-        border: "1px dashed #ccc",
-        display: "inline-block"
+        marginRight: '12px',
+        marginTop: '8px',
+        padding: '2px',
+        border: '1px dashed #ccc',
+        display: 'inline-block'
       }
     }, /*#__PURE__*/React.createElement("img", {
       alt: "",
       src: i.picUrl || defaultImg,
       style: {
-        width: "72px",
-        height: "72px",
-        objectFit: "contain"
+        width: '72px',
+        height: '72px',
+        objectFit: 'contain'
       }
-    })), /*#__PURE__*/React.createElement("div", null, type === "itemId" && /*#__PURE__*/React.createElement(TextTool, {
-      title: "商品id",
+    })), /*#__PURE__*/React.createElement("div", null, type === 'itemId' && /*#__PURE__*/React.createElement(TextTool, {
+      title: '商品id',
       text: i.numIid
-    }), type === "itemCode" && /*#__PURE__*/React.createElement(TextTool, {
-      title: "商品编码",
+    }), type === 'itemCode' && /*#__PURE__*/React.createElement(TextTool, {
+      title: '商品编码',
       text: i.outerId
-    }), (type === "itemThird" || type === "jstItemThird") && (i.itemId || i.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
-      title: "供应商编码",
+    }), (type === 'itemThird' || type === 'jstItemThird') && (i.itemId || i.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
+      title: '供应商编码',
       text: i.itemId || i.supplierItemOuterId
-    }), (type === "itemThird" || type === "jstItemThird") && i.supplierName && /*#__PURE__*/React.createElement(TextTool, {
-      title: "供应商名称",
+    }), (type === 'itemThird' || type === 'jstItemThird') && i.supplierName && /*#__PURE__*/React.createElement(TextTool, {
+      title: '供应商名称',
       text: i.supplierName
     }), i.propertiesName && /*#__PURE__*/React.createElement(TextTool, {
-      title: "规格",
+      title: '规格',
       text: i.propertiesName
     })));
   }))));
@@ -169,12 +173,12 @@ export var GoodImage = function GoodImage(_ref5) {
   var _list$slice;
   var list = _ref5.list,
     _ref5$type = _ref5.type,
-    type = _ref5$type === void 0 ? "" : _ref5$type;
+    type = _ref5$type === void 0 ? '' : _ref5$type;
   var total = (list === null || list === void 0 ? void 0 : list.length) || 0;
   var initShowTotal = 3;
   return (list === null || list === void 0 ? void 0 : list.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     style: {
-      display: type === "itemSelect" ? "flex" : "block"
+      display: type === 'itemSelect' ? 'flex' : 'block'
     }
   }, list === null || list === void 0 ? void 0 : (_list$slice = list.slice(0, initShowTotal)) === null || _list$slice === void 0 ? void 0 : _list$slice.map(function (item, index) {
     return showImage({
@@ -191,7 +195,7 @@ export var GoodImage = function GoodImage(_ref5) {
 var content = function content(item, index) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
-      textAlign: "center"
+      textAlign: 'center'
     }
   }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
     return /*#__PURE__*/React.createElement("div", {
@@ -211,14 +215,17 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
     var logisticsCompany = item.logisticsCompany;
     var company = ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
-      content: content(item, index)
+      content: content(item, index),
+      overlayStyle: {
+        zIndex: 1080
+      }
     }, /*#__PURE__*/React.createElement("span", {
       key: index,
       style: {
-        color: "#1890ff",
-        cursor: "pointer"
+        color: '#1890ff',
+        cursor: 'pointer'
       }
-    }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join("/") : company ? company : item.logisticsCode) : 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, item.sendName].join("/") : item.sendId ? item.sendId : item.sendName) : null));
+    }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join('/') : company ? company : item.logisticsCode) : 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, item.sendName].join('/') : item.sendId ? item.sendId : item.sendName) : null));
   }) : null;
 };
 //bs商品展示 todo
@@ -227,22 +234,22 @@ export var BsGoodImage = function BsGoodImage(_ref7) {
     index = _ref7.index;
   var picUrl = item.picUrl || defaultImg;
   var keyMap = {
-    name: "bs名称",
-    code: "bs编码",
-    skuId: "bssku编码",
-    money: "bs实付金额",
-    number: "bs数量",
-    share: "bs分摊价",
-    type: "bs赠品类型"
+    name: 'bs名称',
+    code: 'bs编码',
+    skuId: 'bssku编码',
+    money: 'bs实付金额',
+    number: 'bs数量',
+    share: 'bs分摊价',
+    type: 'bs赠品类型'
   };
   return /*#__PURE__*/React.createElement("div", {
     className: styles.goodImgBox,
     key: index
   }, /*#__PURE__*/React.createElement("img", {
     style: {
-      width: "40px",
-      height: "40px",
-      objectFit: "contain"
+      width: '40px',
+      height: '40px',
+      objectFit: 'contain'
     },
     src: picUrl
   }), /*#__PURE__*/React.createElement("div", {
@@ -256,25 +263,20 @@ export var BsGoodImage = function BsGoodImage(_ref7) {
 };
 //bs换货 todo
 export var BsExchangeList = function BsExchangeList(_ref8) {
-  var list = _ref8.list;
+  var list = _ref8.list,
+    showHeader = _ref8.showHeader;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.bsImgBox
   }, list.map(function (item) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-      className: styles.bsImgItem
-    }, ((item === null || item === void 0 ? void 0 : item.returnGood) || []).map(function (t, i) {
-      return BsGoodImage({
-        item: t,
-        index: i
-      });
-    })), "==>", /*#__PURE__*/React.createElement("div", {
-      className: styles.bsImgItem
-    }, ((item === null || item === void 0 ? void 0 : item.returnGood) || []).map(function (t, i) {
-      return BsGoodImage({
-        item: t,
-        index: i
-      });
-    })));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, BsGoodsTable({
+      list: (item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods) || [],
+      showHeader: showHeader,
+      text: '退回'
+    }), BsGoodsTable({
+      list: item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods,
+      showHeader: showHeader,
+      text: '换出'
+    }));
   }));
 };
 //bs图片展示
@@ -285,4 +287,100 @@ export var BsGoodPic = function BsGoodPic(list) {
       src: t
     });
   });
+};
+export var BsGoodsTable = function BsGoodsTable(_ref9) {
+  var list = _ref9.list,
+    showHeader = _ref9.showHeader,
+    _ref9$text = _ref9.text,
+    text = _ref9$text === void 0 ? '' : _ref9$text;
+  //商品信息
+  var GOODS_INFO_COLUMNS = function GOODS_INFO_COLUMNS() {
+    var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    return [{
+      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: 'name',
+      title: "".concat(text, "\u540D\u79F0"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'code',
+      title: "".concat(text, "\u7F16\u7801"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'sku',
+      title: "".concat(text, "sku\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,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      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
+    }];
+  };
+  var newColumns = useMemo(function () {
+    var columnList = [{
+      dataIndex: '',
+      title: '序号',
+      align: 'center',
+      ellipsis: true,
+      width: 50,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React.createElement("span", null, index + 1);
+      }
+    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS(text).filter(function (t) {
+      return showHeader.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
+    })));
+    return columnList;
+  }, [showHeader, list]);
+  return /*#__PURE__*/React.createElement(Table, {
+    columns: newColumns,
+    dataSource: list,
+    rowKey: 'id',
+    size: "small",
+    pagination: false,
+    scroll: {
+      x: '100%'
+    },
+    locale: {
+      emptyText: '暂无数据'
+    }
+  });
 };