@kmkf-fe-packages/services-components 2.4.0-rc.0 → 2.4.2-rc.0

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

@@ -17,7 +17,7 @@ import React from "react";
 import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
 import { BsExpressRender } from "../../Common";
 import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
-import { SEARCH_OPTIONS_V2, SYMBOL, batchInput } from "../../../constant";
+import { SEARCH_OPTIONS, SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
   BS_LOGISTICS: {
     key: "bsLogisticsItem"
@@ -40,8 +40,17 @@ var typeMap = {
   GY_LOGISTICS: {
     key: "gyLogisticsItem"
   },
+  JY_LOGISTICS: {
+    key: "jyLogisticsItem"
+  },
+  JKY_LOGISTICS: {
+    key: "jkyLogisticsItem"
+  },
   SKX_LOGISTICS: {
     key: "skxLogisticsItem"
+  },
+  SKX_RETURN_LOGISTICS: {
+    key: "skxReturnLogisticsItem"
   }
 };
 var Express = /*#__PURE__*/_createClass(function Express(options) {
@@ -95,7 +104,20 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$expressDateInst, _this$expressDateInst2;
-    return ((_this$expressDateInst = _this.expressDateInstance) === null || _this$expressDateInst === void 0 ? void 0 : (_this$expressDateInst2 = _this$expressDateInst.getExpressNameByCode) === null || _this$expressDateInst2 === void 0 ? void 0 : _this$expressDateInst2.call(_this$expressDateInst, record === null || record === void 0 ? void 0 : record["".concat(_this.id)])) || (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) || "--";
+    var name = (_this$expressDateInst = _this.expressDateInstance) === null || _this$expressDateInst === void 0 ? void 0 : (_this$expressDateInst2 = _this$expressDateInst.getExpressNameByCode) === null || _this$expressDateInst2 === void 0 ? void 0 : _this$expressDateInst2.call(_this$expressDateInst, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], false);
+    if (!name) {
+      var _typeMap$_this$type3, _items$find;
+      var _this$id$split3 = _this.id.split("_"),
+        _this$id$split4 = _slicedToArray(_this$id$split3, 3),
+        key = _this$id$split4[0],
+        parentKey = _this$id$split4[1],
+        childKey = _this$id$split4[2];
+      var items = record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat((_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.key)];
+      name = items === null || items === void 0 ? void 0 : (_items$find = items.find(function (item) {
+        return item.logisticsCompany === (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
+      })) === null || _items$find === void 0 ? void 0 : _items$find.logisticsCompanyName;
+    }
+    return name || (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) || "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -104,14 +126,17 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
     var _this$expressDateInst3;
     var subKey = item.subKey;
     return _objectSpread({
-      searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: "".concat(item.id, "_").concat(subKey),
       name: "".concat(_this.parentName, "-\u7269\u6D41\u516C\u53F8")
     }, _this.logisticsCompanyFormType === "input" ? {
+      searchDefaultConditions: {
+        in: SYMBOL.in,
+        anylike: SYMBOL.anylike
+      },
       filterComponentType: "SelectInput",
       props: {
-        filterOptions: SEARCH_OPTIONS_V2
+        filterOptions: SEARCH_OPTIONS
       },
       filterFn: function filterFn(value) {
         return function (i) {
@@ -119,13 +144,14 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
         };
       },
       formatFilterValue: function formatFilterValue(value) {
-        if (value.type === "in") {
+        if (["in", "anylike"].includes(value.type)) {
           return batchInput(value.keywords);
         } else {
           return value;
         }
       }
     } : {
+      searchDefaultConditions: SYMBOL.in,
       filterComponentType: "MultipleSelect",
       props: {
         options: ((_this$expressDateInst3 = _this.expressDateInstance) === null || _this$expressDateInst3 === void 0 ? void 0 : _this$expressDateInst3.getExpressData()) || []

package/dist/esm/components/BsE3/BsReissueE3/index.js

@@ -178,11 +178,14 @@ var BsE3Reissue = /*#__PURE__*/_createClass(function BsE3Reissue(options) {
   this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
     required: true,
     validator: function validator(_, value) {
-      var _value, _typeMap$options$type6;
+      var _value, _typeMap$options$type6, _typeMap$options$type8;
       if (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.key)]) !== null && _value !== void 0 && _value.length)) {
         var _typeMap$options$type7;
         return Promise.reject(new Error("".concat((_typeMap$options$type7 = typeMap[options.type]) === null || _typeMap$options$type7 === void 0 ? void 0 : _typeMap$options$type7.errMsg)));
       }
+      if (!value || !(value !== null && value !== void 0 && value["".concat((_typeMap$options$type8 = typeMap[options.type]) === null || _typeMap$options$type8 === void 0 ? void 0 : _typeMap$options$type8.systemOrderNo)])) {
+        return Promise.reject(new Error("\u8BF7\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"));
+      }
       return Promise.resolve();
     }
   }] : [];

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

@@ -1,19 +1,21 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
-import React from "react";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class BasicCascader implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
-    format: ComponentInterface["format"];
-    options: ComponentInterface["options"];
+    dataType: ComponentInterface['dataType'];
+    format: ComponentInterface['format'];
+    options: ComponentInterface['options'];
+    exampleValue?: string;
+    standardDateType: ComponentInterface['standardDateType'];
     constructor(options: PickOption);
     /**
      * 通过值计算展示内容

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

@@ -6,13 +6,13 @@ 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 { Cascader } from "antd";
-import intersection from "lodash/intersection";
+import React from 'react';
+import { Cascader } from 'antd';
+import intersection from 'lodash/intersection';
 import GetFormItem from "../GetFormItem";
-import { findLabelBySelectValue, transMultSelectOptions, tree } from "@kmkf-fe-packages/kmkf-utils";
+import { findLabelBySelectValue, transMultSelectOptions, tree } from '@kmkf-fe-packages/kmkf-utils';
 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 BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
   var _this = this,
@@ -31,11 +31,13 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "format", void 0);
   _defineProperty(this, "options", void 0);
+  _defineProperty(this, "exampleValue", void 0);
+  _defineProperty(this, "standardDateType", void 0);
   _defineProperty(this, "getValues", 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) {
       return i.label;
-    })) === null || _findLabelBySelectVal2 === void 0 ? void 0 : _findLabelBySelectVal2.join(",");
+    })) === null || _findLabelBySelectVal2 === void 0 ? void 0 : _findLabelBySelectVal2.join(',');
   });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -51,7 +53,7 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
     }
     return /*#__PURE__*/React.createElement("span", null, (_ref = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_multSelect")]) || []) === null || _ref === void 0 ? void 0 : (_ref$map = _ref.map(function (item) {
       return item === null || item === void 0 ? void 0 : item.label;
-    })) === null || _ref$map === void 0 ? void 0 : _ref$map.join(","));
+    })) === null || _ref$map === void 0 ? void 0 : _ref$map.join(','));
     // return (
     //   <span>
     //     {findLabelBySelectValue(
@@ -75,11 +77,11 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
   _defineProperty(this, "renderExport", function (value, record) {
     var _ref2, _ref2$map;
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_multSelect")]) === undefined) {
-      return "--";
+      return '--';
     }
     return (_ref2 = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_multSelect")]) || []) === null || _ref2 === void 0 ? void 0 : (_ref2$map = _ref2.map(function (item) {
       return item === null || item === void 0 ? void 0 : item.label;
-    })) === null || _ref2$map === void 0 ? void 0 : _ref2$map.join(",");
+    })) === null || _ref2$map === void 0 ? void 0 : _ref2$map.join(',');
     // return findLabelBySelectValue(
     //   (record?.[`${this.id}_multSelect`] || [])?.map(
     //     (item: any) => item.actived
@@ -98,14 +100,14 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       required: (_this$componentConfig2 = (_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.required) !== null && _this$componentConfig2 !== void 0 ? _this$componentConfig2 : false,
       display: p === null || p === void 0 ? void 0 : p.display,
-      tooltip: (_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.showTooltip ? (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.tooltip : "",
+      tooltip: (_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.showTooltip ? (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.tooltip : '',
       component: /*#__PURE__*/React.createElement(Cascader, _extends({}, _this.componentConfig, {
         placeholder: "\u8BF7\u8F93\u5165".concat(_this.name),
         options: transMultSelectOptions(((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.options) || []),
         fieldNames: {
-          label: "label",
-          value: "actived",
-          children: "children"
+          label: 'label',
+          value: 'actived',
+          children: 'children'
         },
         showSearch: true,
         onChange: p === null || p === void 0 ? void 0 : p.onChange
@@ -122,26 +124,26 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: "Cascader",
+      filterComponentType: 'Cascader',
       props: {
         options: options,
         multiple: true,
-        maxTagCount: "responsive",
+        maxTagCount: 'responsive',
         fieldNames: {
-          label: "label",
-          value: "actived",
-          children: "children"
+          label: 'label',
+          value: 'actived',
+          children: 'children'
         }
       },
       filterFn: function filterFn(value) {
         return function (i) {
-          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, "basicMultSelect")).length > 0;
+          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'basicMultSelect')).length > 0;
         };
       },
       formatFilterValue: function formatFilterValue(val) {
         if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
           return val.map(function (item) {
-            var node = tree.findNodeByValue(options, "actived", item[item.length - 1]);
+            var node = tree.findNodeByValue(options, 'actived', item[item.length - 1]);
             if (node) {
               var label = node.label,
                 actived = node.actived;
@@ -165,9 +167,11 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
   this.children = [];
   this.isCombinationComponent = false;
   this.canSort = true;
-  this.dataType = "array";
-  this.format = "cascader";
+  this.dataType = 'array';
+  this.format = 'cascader';
   this.options = ((_this$componentConfig7 = this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.options) || [];
+  this.standardDateType = 'Array';
+  this.exampleValue = '[{"label":"卖家补偿","actived":3},{"label":"麦基修改","actived":"3-1"}]';
 }
 
 /**

package/dist/esm/components/Common/constants/bs.js

@@ -61,10 +61,10 @@ var getColumns = function getColumns(_ref) {
       width: 100
     }, {
       dataIndex: "share",
-      title: "\u5206\u644A\u4EF7",
+      title: "\u5747\u644A\u5355\u4EF7",
       align: "center",
       ellipsis: true,
-      width: 70
+      width: 120
     }, {
       dataIndex: "type",
       title: "\u8D60\u54C1\u7C7B\u578B",

package/dist/esm/components/Common/constants/columnsBaseInfoMap.js

@@ -7,13 +7,13 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import system from "./system";
 import bs_e3 from "./bs_e3";
 import bs from "./bs";
-import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getSkxColumns } from "@kmkf-fe-packages/basic-components";
+import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getJyColumns, getSkxColumns, getJkyColumns } from "@kmkf-fe-packages/basic-components";
 import defaultColumns from "./defaultColumns";
 export var getColumnsMap = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? "" : _ref$text;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
     text: text
   })), bs_e3()), getWdtColumns({
     text: text,
@@ -26,6 +26,10 @@ export var getColumnsMap = function getColumnsMap(args) {
     text: text
   })), getKmColumns({
     disabled: true
+  })), getJyColumns({
+    disabled: true
+  })), getJkyColumns({
+    disabled: true
   })), getSkxColumns({})), {}, {
     default: defaultColumns({
       text: text

package/dist/esm/components/Common/constants/defaultColumns.js

@@ -60,10 +60,10 @@ var getColumns = function getColumns(_ref) {
       width: 100
     }, {
       dataIndex: "share",
-      title: "\u5206\u644A\u4EF7",
+      title: "\u5747\u644A\u5355\u4EF7",
       align: "center",
       ellipsis: true,
-      width: 70
+      width: 120
     }, {
       dataIndex: "type",
       title: "\u8D60\u54C1\u7C7B\u578B",

package/dist/esm/components/Common/constants/wdt.js

@@ -299,6 +299,110 @@ var getColumns = function getColumns(_ref) {
         };
         return /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
+    }],
+    //旺店通售后商品信息
+    WDT_AFTERSALE_GOODS: [{
+      dataIndex: "oid",
+      title: "原始子单号",
+      align: "center",
+      ellipsis: true,
+      width: 300
+    }, {
+      dataIndex: "goodsName",
+      title: "货品名称",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "goodsNo",
+      title: "货品编码",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "specName",
+      title: "规格名称",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "specNo",
+      title: "商家编码",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "specCode",
+      title: "规格编号",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "barcode",
+      title: "条码",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "apiGoodsName",
+      title: "平台货品名称",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "apiSpecName",
+      title: "平台规格名称",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "suiteName",
+      title: "组合装名称",
+      align: "center",
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: "suiteNo",
+      title: "组合装编号",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "stockinNum",
+      title: "入库数量",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "refundNum",
+      title: "退款数量",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "totalAmount",
+      title: "退货总额",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "refundAmount",
+      title: "已退款金额",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "num",
+      title: "实际发出数量",
+      align: "center",
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: "giftTypeDesc",
+      title: "赠品方式",
+      align: "center",
+      ellipsis: true,
+      width: 150
     }]
   };
   //旺店通补发商品信息

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

@@ -25,13 +25,13 @@ export declare const ShowTotalImage: ({ total, allImage, type, showHeader, }: {
 export declare const GoodImage: ({ list, type, showHeader }: any) => React.JSX.Element | null;
 export declare const JstGoodImage: ({ list, type, platformType, logisticsCompanyFormType, }: any) => any;
 export declare const BsExpressRender: ({ list, showField, platformType, logisticsCompanyFormType, }: any) => any;
-export declare const CommonOrderContent: ({ list, valueKey: initValueKey, failValue, options, isShowPopover, }: any) => any;
+export declare const CommonOrderContent: ({ list, valueKey: initValueKey, failValue, options, isShowPopover, idKey, }: any) => any;
 export declare const BsGoodImage: ({ item, index }: {
     item: any;
     index: number;
 }) => 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 BsGoodPic: (list: string[]) => React.JSX.Element;
 export declare const BsGoodsTable: ({ list, showHeader, text, type, }: {
     list: any[];
     showHeader: (string | ShowHeaderObjType)[];
@@ -40,7 +40,7 @@ export declare const BsGoodsTable: ({ list, showHeader, text, type, }: {
 }) => React.JSX.Element;
 export declare const FileRender: ({ fileList, canDownload }: any) => React.JSX.Element;
 export declare const KmVideoRender: ({ fileList, canDownload }: any) => React.JSX.Element;
-export declare const BsSystemOrderTable: ({ value, type }: any) => React.JSX.Element;
+export declare const BsSystemOrderTable: ({ value, type, showHeader }: any) => React.JSX.Element;
 export declare const MsgContent: ({ horizontal, list, valueKey, failValue, options, }: any) => React.JSX.Element;
 export declare const AlipayBill: (props: any) => React.JSX.Element;
 export declare const RenderPicturePro: (props: any) => React.JSX.Element;

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

@@ -15,15 +15,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Typography } from "antd";
 import { DownloadOutlined } from "@ant-design/icons";
 import React, { useState, useMemo } from "react";
-import { ExpressData, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
+import { ExpressData, SendDataCenter, getSystemShowHead } from "@kmkf-fe-packages/kmkf-utils";
 import { getAlipayBillReceipt } from "../../service/api";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
 import CopyText from "../../commonComponents/CopyText";
-import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
+import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
 import { getColumnsMap } from "./constants/columnsBaseInfoMap";
 import { VideoCameraTwoTone } from "@ant-design/icons";
+import { ApaasImage } from "@kmkf-fe-packages/basic-components";
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -65,17 +66,17 @@ export var showImage = function showImage(_ref2) {
   }, type === "itemCode" && !showHeader.includes("picUrl") ? null : (item === null || item === void 0 ? void 0 : item.platform) === "taobao" ? /*#__PURE__*/React.createElement("a", {
     target: "_blank",
     href: item.numIid ? "https://item.taobao.com/item.htm?id=".concat(item.numIid) : "javascript:void(0);"
-  }, /*#__PURE__*/React.createElement("img", {
+  }, /*#__PURE__*/React.createElement(ApaasImage, {
+    width: 40,
+    height: 40,
     style: {
-      width: "40px",
-      height: "40px",
       objectFit: "contain"
     },
     src: picUrl
-  })) : /*#__PURE__*/React.createElement("img", {
+  })) : /*#__PURE__*/React.createElement(ApaasImage, {
+    width: 40,
+    height: 40,
     style: {
-      width: "40px",
-      height: "40px",
       objectFit: "contain"
     },
     src: picUrl
@@ -249,7 +250,7 @@ var content = function content(item, index) {
   }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F"), item.sid && /*#__PURE__*/React.createElement("span", null, "(\u7CFB\u7EDF\u5355\u53F7:", item.sid, ")")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index
-    }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Image, {
+    }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(ApaasImage, {
       width: 70,
       src: t.picUrl,
       preview: false
@@ -272,7 +273,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
     var company = "";
     if (logisticsCompanyFormType === "input") {
       company = logisticsCompany;
-    } else if (platformType === "gy") {
+    } else if (["gy", "jy"].includes(platformType)) {
       // 管易为了兼容之前的补发物流信息，若不存在logisticsCompanyName值则去匹配物流映射列表展示物流公司名称
       company = ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName;
     } else {
@@ -293,7 +294,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
       text: item.logisticsCode
     })) : company ? company : item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
       text: item.logisticsCode
-    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join("/") : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item)].join("/") : item.sendId ? item.sendId : getSendName(item)) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || "") : null));
+    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join("/") : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item)].join("/") : item.sendId ? item.sendId : getSendName(item)) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || "") : null, type === 5 ? /*#__PURE__*/React.createElement("span", null, item.returnWarehouseName && item.returnWarehouseId ? [item.returnWarehouseId, item.returnWarehouseName].join("/") : item.returnWarehouseId ? item.returnWarehouseId : item.returnWarehouseName) : null));
   }) : null;
 };
 export var BsExpressRender = function BsExpressRender(_ref7) {
@@ -305,8 +306,9 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
     platformType = _ref7$platformType === void 0 ? "default" : _ref7$platformType,
     logisticsCompanyFormType = _ref7.logisticsCompanyFormType;
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
-    var logisticsCompany = item.logisticsCompany;
-    var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany);
+    var logisticsCompany = item.logisticsCompany,
+      logisticsCompanyName = item.logisticsCompanyName;
+    var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany;
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {
@@ -331,7 +333,8 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
     _ref8$options = _ref8.options,
     options = _ref8$options === void 0 ? [] : _ref8$options,
     _ref8$isShowPopover = _ref8.isShowPopover,
-    isShowPopover = _ref8$isShowPopover === void 0 ? true : _ref8$isShowPopover;
+    isShowPopover = _ref8$isShowPopover === void 0 ? true : _ref8$isShowPopover,
+    idKey = _ref8.idKey;
   var getContentData = function getContentData(item, index) {
     if (item.platformId) return {
       text: "平台售后单号",
@@ -343,7 +346,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
     };
     return {
       text: "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
-      id: item.systemOrderId || item.systemOrderNo
+      id: item.systemOrderId || item.systemOrderNo || (item === null || item === void 0 ? void 0 : item[idKey])
     };
   };
   var orderContent = function orderContent(item, index) {
@@ -412,10 +415,10 @@ export var BsGoodImage = function BsGoodImage(_ref9) {
   return /*#__PURE__*/React.createElement("div", {
     className: styles.goodImgBox,
     key: index
-  }, /*#__PURE__*/React.createElement("img", {
+  }, /*#__PURE__*/React.createElement(ApaasImage, {
+    width: 40,
+    height: 40,
     style: {
-      width: "40px",
-      height: "40px",
       objectFit: "contain"
     },
     src: picUrl
@@ -448,12 +451,17 @@ export var BsExchangeList = function BsExchangeList(_ref10) {
 };
 //bs图片展示
 export var BsGoodPic = function BsGoodPic(list) {
-  return list.map(function (t) {
-    return /*#__PURE__*/React.createElement(Image, {
+  return /*#__PURE__*/React.createElement(Image.PreviewGroup, null, list.map(function (t) {
+    var finalSrc = t !== null && t !== void 0 && t.startsWith("http") ? t : "https://kefu.kuaimai.com/".concat(t);
+    return /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, /*#__PURE__*/React.createElement(ApaasImage, {
       width: 60,
-      src: t
-    });
-  });
+      src: finalSrc
+    }));
+  }));
 };
 export var BsGoodsTable = function BsGoodsTable(_ref11) {
   var list = _ref11.list,
@@ -763,7 +771,9 @@ export var KmVideoRender = function KmVideoRender(_ref13) {
 };
 export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
   var value = _ref14.value,
-    type = _ref14.type;
+    type = _ref14.type,
+    _ref14$showHeader = _ref14.showHeader,
+    showHeader = _ref14$showHeader === void 0 ? [] : _ref14$showHeader;
   var columnMap = {
     BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
     KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -771,7 +781,10 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
     WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG.columns,
     BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
     GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
-    JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns
+    JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
+    JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
+    JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
+    WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
   };
   var rowKeyMap = {
     BS_SYSTEM_ORDER: "billNo",
@@ -780,7 +793,10 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
     WDT_SYSTEM_ORDER: "billNo",
     BS_E3_SYSTEM_ORDER: "orderSn",
     GY_SYSTEM_ORDER: "billNo",
-    JST_SYSTEM_ORDER: "oId"
+    JST_SYSTEM_ORDER: "oId",
+    JY_SYSTEM_ORDER: "tradeNo",
+    JKY_SYSTEM_ORDER: "tradeNo",
+    WDT_RETURN_BILL_NO: "refundNo"
   };
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
@@ -797,15 +813,20 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
       };
     }
   };
+  var columns = getSystemShowHead({
+    columns: columnMap[type] || [],
+    showHeader: showHeader
+  });
   return /*#__PURE__*/React.createElement(Table, {
     dataSource: (value === null || value === void 0 ? void 0 : value.showOrderInfo) || [],
-    columns: columnMap[type] || [],
+    columns: columns || [],
     rowSelection: rowSelection,
     rowKey: rowKeyMap[type] || "billNo",
     size: "small",
     pagination: false,
     scroll: {
-      x: "100%"
+      x: "100%",
+      y: 500
     },
     locale: {
       emptyText: "暂无数据"

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

@@ -19,8 +19,8 @@ declare class CommonDataTime implements ComponentInterface {
     constructor(options: PickOption);
     getValues: (value: string) => string;
     renderClient: (record: any) => React.JSX.Element | null;
-    renderPc: (value: any, record: Record) => any;
-    renderLog: (r: Record) => any;
+    renderPc: (value: any, record: Record) => string;
+    renderLog: (r: Record) => string | null;
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => string;
     editRender: () => null;