@kmkf-fe-packages/services-components 2.7.0-rc.0 → 2.7.1

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

@@ -25,7 +25,7 @@ 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;
@@ -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
@@ -454,7 +457,7 @@ export var BsGoodPic = function BsGoodPic(list) {
       onClick: function onClick(e) {
         return e.stopPropagation();
       }
-    }, /*#__PURE__*/React.createElement(Image, {
+    }, /*#__PURE__*/React.createElement(ApaasImage, {
       width: 60,
       src: finalSrc
     }));
@@ -768,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,
@@ -776,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",
@@ -785,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) {
@@ -802,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;

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

@@ -40,8 +40,8 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var _record;
-    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : "--";
+    var time = record === null || record === void 0 ? void 0 : record["".concat(_this.id)];
+    return time ? moment(time).format("YYYY-MM-DD HH:mm:ss") : "--";
     // if (record?.[`${this.id}`] === undefined) {
     //   return <span>--</span>;
     // }