@kmkf-fe-packages/services-components 1.25.1 → 1.26.0

package/dist/esm/commonComponents/GlobalContext/index.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany" | "queryLabel" | "queryWdtLogisticsCompany" | "queryBsE3LogisticsCompany" | "querySendData";
+declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany" | "queryLabel" | "queryWdtLogisticsCompany" | "queryBsE3LogisticsCompany" | "querySendData" | "queryJSTLogisticsCompany" | "queryWLNLogisticsCompany";
 declare const Global: ({ children, requestList, repeatRequestList, }: React.PropsWithChildren<{
     requestList?: RequestType[] | undefined;
     repeatRequestList?: Record<string, () => Promise<any>> | undefined;

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

@@ -15,7 +15,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from "react";
 import { Skeleton, Button, Alert, Space } from "antd";
-import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryLabel, queryAllLogisticsCompany, queryWdtLogisticsCompany, queryBsE3LogisticsCompany, querySendData } from "../../service/api";
+import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryLabel, queryAllLogisticsCompany, queryWdtLogisticsCompany, queryBsE3LogisticsCompany, querySendData, queryJSTLogisticsCompany, queryWLNLogisticsCompany } from "../../service/api";
 import { servers } from "@kmkf-fe-packages/kmkf-utils";
 var Global = function Global(_ref) {
   var children = _ref.children,
@@ -44,7 +44,9 @@ var Global = function Global(_ref) {
               queryWdtAddressData: servers.queryWdtAddressData,
               queryWdtLogisticsCompany: queryWdtLogisticsCompany,
               queryBsE3LogisticsCompany: queryBsE3LogisticsCompany,
-              querySendData: querySendData
+              querySendData: querySendData,
+              queryJSTLogisticsCompany: queryJSTLogisticsCompany,
+              queryWLNLogisticsCompany: queryWLNLogisticsCompany
             };
             mergeMapping = _objectSpread(_objectSpread({}, mapping), repeatRequestList);
             promises = [];

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

@@ -38,7 +38,7 @@ var typeMap = {
     name: "万里牛",
     company: "wlnLogisticsCompany",
     code: "wlnLogisticsCode",
-    platformType: "default"
+    platformType: "wln"
   },
   WDT_LOGISTICS: {
     key: "wdtLogisticsList",
@@ -46,6 +46,13 @@ var typeMap = {
     company: "wdtLogisticsCompany",
     code: "wdtLogisticsCode",
     platformType: "wdt"
+  },
+  JST_LOGISTICS: {
+    key: "jstItemList",
+    name: "聚水潭",
+    company: "logisticsCompany",
+    code: "logisticsCode",
+    platformType: 'jst'
   }
 };
 var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {

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

@@ -21,6 +21,7 @@ import React from "react";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { BsHeaderPic, BsHeaderChild, BsHeaderGoodPic } from "./index";
+import { getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
 var HeaderMap = {
   mark: {
     component: BsHeaderChild,
@@ -46,6 +47,12 @@ var HeaderMap = {
     key: "name",
     width: 200
   },
+  num: {
+    component: BsHeaderChild,
+    name: "商品数量",
+    key: "num",
+    width: 200
+  },
   code: {
     component: BsHeaderChild,
     name: "编码",
@@ -215,15 +222,7 @@ var BsHeaderGods = /*#__PURE__*/function () {
     this.isCombinationComponent = true;
     this.canSort = false;
     this.dataType = "string";
-    this.itemKey = options.type === "ITEM_ENCODE" ? {
-      title: "商品名称",
-      outerId: "商品编码",
-      picUrl: "图片",
-      numIid: "商品id",
-      skuId: "SKU ID",
-      outerSkuId: "SKU 编码",
-      propertiesName: "SKU 信息"
-    } : {
+    this.itemKey = options.type === "ITEM_ENCODE" ? getMapping(columnsGoodsList) : {
       mark: "商品标记",
       pic: "图片",
       name: "名称",
@@ -238,36 +237,6 @@ var BsHeaderGods = /*#__PURE__*/function () {
       expireDate: "有效期"
     };
     this.children = this.getChildren(options);
-    //  [
-    // ...Object.keys(HeaderMap).reduce((prv: any, key: string) => {
-    //   if (options?.componentConfig?.showHeader?.includes(key)) {
-    //     prv.push(
-    //       new HeaderMap[key].component({
-    //         ...options,
-    //         name: this.itemKey[key],
-    //         id: `${options.id}_${HeaderMap[key].key}`,
-    //         width: HeaderMap[key].width,
-    //       })
-    //     );
-    //   }
-    //   return prv;
-    // }, []),
-    // ...(options?.componentConfig?.showHeader || []).reduce(
-    //   (prv: any, next: string) => {
-    //     if (HeaderMap[next]) {
-    //       prv.push(
-    //         new HeaderMap[next].component({
-    //           ...options,
-    //           name: this.itemKey[next],
-    //           id: `${options.id}_${HeaderMap[next].key}`,
-    //         })
-    //       );
-    //     }
-    //     return prv;
-    //   },
-    //   []
-    // ),
-    // ];
   }
   _createClass(BsHeaderGods, [{
     key: "getChildren",
@@ -275,9 +244,13 @@ var BsHeaderGods = /*#__PURE__*/function () {
       var _options$componentCon,
         _this2 = this;
       var showHeader = options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader;
+      var dataIndexList = [];
+      if (!Array.isArray(showHeader)) {
+        dataIndexList = Object.keys(this.itemKey);
+        showHeader = dataIndexList;
+      }
       var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
       var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
-      var dataIndexList = [];
       if (isStringArray) {
         dataIndexList = showHeader;
       } else if (isObjectArray) {

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

@@ -26,7 +26,10 @@ var typeMap = {
     key: "wlnLogisticsItem"
   },
   WDT_LOGISTICS: {
-    key: 'wdtLogisticsItem'
+    key: "wdtLogisticsItem"
+  },
+  JST_LOGISTICS: {
+    key: "jstLogisticsItem"
   }
 };
 var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {

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

@@ -28,6 +28,9 @@ var typeMap = {
   },
   WDT_LOGISTICS: {
     key: "wdtLogisticsItem"
+  },
+  JST_LOGISTICS: {
+    key: "jstLogisticsItem"
   }
 };
 var Express = /*#__PURE__*/_createClass(function Express(options) {

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

@@ -12,9 +12,16 @@ export declare const showImage: ({ item, type, index, showHeader, }: {
     item: any;
     type: string;
     index: number;
-    showHeader: (string | ShowHeaderObjType)[];
+    showHeader: string[];
+}) => React.JSX.Element;
+export declare const ShowTotalImage: ({ total, allImage, type, showHeader, }: {
+    total: number;
+    allImage: {
+        [key: string]: any;
+    }[];
+    type: string;
+    showHeader: string[];
 }) => React.JSX.Element;
-export declare const ShowTotalImage: ({ total, allImage, type, showHeader, }: any) => React.JSX.Element;
 export declare const GoodImage: ({ list, type, showHeader }: any) => React.JSX.Element | null;
 export declare const JstGoodImage: ({ list, type, platformType, }: any) => any;
 export declare const BsExpressRender: ({ list, showField, platformType, }: any) => any;

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

@@ -20,7 +20,7 @@ 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 } from "@kmkf-fe-packages/kmkf-utils";
+import { KM_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -55,23 +55,11 @@ export var showImage = function showImage(_ref2) {
     index = _ref2.index,
     showHeader = _ref2.showHeader;
   var picUrl = item.picUrl ? (item === null || item === void 0 ? void 0 : item.platform) !== "tabao" ? item.picUrl : item.picUrl + "_40x40.jpg" : defaultImg;
-  var showHeaderMap = useMemo(function () {
-    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
-    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
-    var dataIndexList = [];
-    if (isStringArray) {
-      dataIndexList = showHeader;
-    } else if (isObjectArray) {
-      dataIndexList = showHeader.map(function (item) {
-        return item.dataIndex;
-      });
-    }
-    return dataIndexList;
-  }, [showHeader]);
+  var mapping_itemCode = getMapping(columnsGoodsList);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.goodImgBox,
     key: index
-  }, type === "itemCode" && !showHeaderMap.includes("picUrl") ? null : (item === null || item === void 0 ? void 0 : item.platform) === "taobao" ? /*#__PURE__*/React.createElement("a", {
+  }, 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", {
@@ -89,28 +77,20 @@ export var showImage = function showImage(_ref2) {
     },
     src: picUrl
   }), /*#__PURE__*/React.createElement("div", {
-    className: styles.options
+    className: styles.options,
+    onClick: function onClick() {
+      console.log("show---", showHeader);
+    }
   }, type === "itemId" && /*#__PURE__*/React.createElement(TextTool, {
     title: "商品id",
     text: item.numIid
-  }), type === "itemCode" && /*#__PURE__*/React.createElement(React.Fragment, null, showHeaderMap.includes("title") && /*#__PURE__*/React.createElement(TextTool, {
-    title: "商品名称",
-    text: item.title
-  }), showHeaderMap.includes("outerId") && /*#__PURE__*/React.createElement(TextTool, {
-    title: "商品编码",
-    text: item.outerId
-  }), showHeaderMap.includes("numIid") && /*#__PURE__*/React.createElement(TextTool, {
-    title: "商品id",
-    text: item.numIid
-  }), showHeaderMap.includes("skuId") && /*#__PURE__*/React.createElement(TextTool, {
-    title: "SKU ID",
-    text: item.skuId
-  }), showHeaderMap.includes("outerSkuId") && /*#__PURE__*/React.createElement(TextTool, {
-    title: "SKU 编码",
-    text: item.outerSkuId
-  }), showHeaderMap.includes("propertiesName") && /*#__PURE__*/React.createElement(TextTool, {
-    title: "SKU 信息",
-    text: item.propertiesName
+  }), type === "itemCode" && /*#__PURE__*/React.createElement(React.Fragment, null, showHeader.filter(function (dataIndex) {
+    return dataIndex !== "picUrl";
+  }).map(function (dataIndex) {
+    return /*#__PURE__*/React.createElement(TextTool, {
+      title: mapping_itemCode[dataIndex],
+      text: item[dataIndex]
+    });
   })), (type === "itemThird" || type === "jstItemThird") && (item.itemId || item.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
     title: "供应商编码",
     text: item.itemId || item.supplierItemOuterId
@@ -149,19 +129,7 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var showHeaderMap = useMemo(function () {
-    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
-    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
-    var dataIndexList = [];
-    if (isStringArray) {
-      dataIndexList = showHeader;
-    } else if (isObjectArray) {
-      dataIndexList = showHeader.map(function (item) {
-        return item.dataIndex;
-      });
-    }
-    return dataIndexList;
-  }, [showHeader]);
+  var mapping_itemCode = getMapping(columnsGoodsList);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: function onClick() {
@@ -185,7 +153,7 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
         width: "50%"
       },
       key: index
-    }, type === "itemCode" && !showHeaderMap.includes("picUrl") ? null : /*#__PURE__*/React.createElement("a", {
+    }, type === "itemCode" && !showHeader.includes("picUrl") ? null : /*#__PURE__*/React.createElement("a", {
       href: i.link || ((i === null || i === void 0 ? void 0 : i.platform) === "taobao" && i.numIid ? "https://item.taobao.com/item.htm?id=".concat(i.numIid) : "javascript:void(0);"),
       target: "__blank",
       style: {
@@ -206,24 +174,13 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
     })), /*#__PURE__*/React.createElement("div", null, type === "itemId" && /*#__PURE__*/React.createElement(TextTool, {
       title: "商品id",
       text: i.numIid
-    }), type === "itemCode" && /*#__PURE__*/React.createElement(React.Fragment, null, showHeaderMap.includes("title") && /*#__PURE__*/React.createElement(TextTool, {
-      title: "商品名称",
-      text: i.title
-    }), showHeaderMap.includes("outerId") && /*#__PURE__*/React.createElement(TextTool, {
-      title: "商品编码",
-      text: i.outerId
-    }), showHeaderMap.includes("numIid") && /*#__PURE__*/React.createElement(TextTool, {
-      title: "商品id",
-      text: i.numIid
-    }), showHeaderMap.includes("skuId") && /*#__PURE__*/React.createElement(TextTool, {
-      title: "SKU ID",
-      text: i.skuId
-    }), showHeaderMap.includes("outerSkuId") && /*#__PURE__*/React.createElement(TextTool, {
-      title: "SKU 编码",
-      text: i.outerSkuId
-    }), showHeaderMap.includes("propertiesName") && /*#__PURE__*/React.createElement(TextTool, {
-      title: "SKU 信息",
-      text: i.propertiesName
+    }), type === "itemCode" && /*#__PURE__*/React.createElement(React.Fragment, null, showHeader.filter(function (dataIndex) {
+      return dataIndex !== "picUrl";
+    }).map(function (dataIndex) {
+      return /*#__PURE__*/React.createElement(TextTool, {
+        title: mapping_itemCode[dataIndex],
+        text: i[dataIndex]
+      });
     })), (type === "itemThird" || type === "jstItemThird") && (i.itemId || i.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
       title: "供应商编码",
       text: i.itemId || i.supplierItemOuterId
@@ -253,7 +210,9 @@ export var GoodImage = function GoodImage(_ref5) {
     if (isStringArray) {
       dataIndexList = showHeader;
     } else if (isObjectArray) {
-      dataIndexList = showHeader.map(function (item) {
+      dataIndexList = showHeader.filter(function (item) {
+        return item.show !== false;
+      }).map(function (item) {
         return item.dataIndex;
       });
     }
@@ -273,7 +232,7 @@ export var GoodImage = function GoodImage(_ref5) {
   }), total > initShowTotal && /*#__PURE__*/React.createElement(ShowTotalImage, {
     total: total,
     allImage: list,
-    showHeader: showHeader,
+    showHeader: showHeaderMap,
     type: type
   })) : null;
 };
@@ -1459,15 +1418,6 @@ export var MsgContent = function MsgContent(_ref14) {
     failValue = _ref14.failValue,
     _ref14$options = _ref14.options,
     options = _ref14$options === void 0 ? [] : _ref14$options;
-  var msgTypeCh = {
-    ding: "钉钉",
-    wechat: "微信",
-    qq: "QQ",
-    qywx: "企业微信",
-    YZDKH: "邮政拦截",
-    YT: "圆通拦截",
-    feishu: "飞书"
-  };
   var getColorByStatus = function getColorByStatus(value) {
     var _options$find2;
     return ((_options$find2 = options.find(function (innerItem) {

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

@@ -1,6 +1,7 @@
 import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
 import React from "react";
 import { BsHeaderGood } from "../BS/common/index";
+import type { ShowHeaderObjType } from "../../type";
 declare class EItemEncode implements ComponentInterface {
     name: string;
     id: string;
@@ -15,7 +16,7 @@ declare class EItemEncode implements ComponentInterface {
     children: ComponentInterface[];
     goods: BsHeaderGood;
     dataType: ComponentInterface["dataType"];
-    showHeader: string[];
+    showHeader: (string | ShowHeaderObjType)[];
     platform?: ComponentInterface["platform"];
     sortChildField: {
         name: string;

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

@@ -16,6 +16,7 @@ import { BsHeaderGood } from "../BS/common/index";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
+import { columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
 var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
   var _this = this,
     _this$componentConfig3,
@@ -38,41 +39,23 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
   _defineProperty(this, "platform", void 0);
   _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "getSortChildFields", function () {
-    var mapping = {
-      title: "商品名称",
-      outerId: "商品编码",
-      numIid: "商品id",
-      skuId: "skuId",
-      outerSkuId: "sku编码",
-      propertiesName: "sku信息"
-    };
-    return Object.keys(mapping).map(function (item) {
+    return columnsGoodsList.filter(function (item) {
+      return !["picUrl", "num"].includes(item.dataIndex);
+    }).map(function (item) {
       return {
-        name: mapping[item],
-        key: "".concat(_this.id, "_").concat(item),
+        name: item.title,
+        key: "".concat(_this.id, "_").concat(item.dataIndex),
         dataType: "arrayObject",
-        disabled: !_this.showHeader.includes(item)
+        disabled: !_this.showHeader.includes(item.dataIndex)
       };
     });
   });
   _defineProperty(this, "getShowHeader", function (showHeader) {
     if (!Array.isArray(showHeader)) {
-      return ["title",
-      // 商品名称
-      "outerId",
-      // 商品编码
-      "picUrl",
-      // 图片
-      "numIid",
-      // 商品id
-      "skuId",
-      // skuId
-      "outerSkuId",
-      // sku编码
-      "propertiesName" // sku 信息
-      ];
+      return columnsGoodsList.map(function (item) {
+        return item.dataIndex;
+      });
     }
-
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
     if (isStringArray) return showHeader;

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

@@ -1,19 +1,19 @@
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
+import React from "react";
 declare class MsgStatus implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface['componentConfig'];
+    componentConfig: ComponentInterface["componentConfig"];
     align: ALignType;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
-    options: ComponentInterface['options'];
+    dataType: ComponentInterface["dataType"];
+    options: ComponentInterface["options"];
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;

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

@@ -8,61 +8,52 @@ 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 some from 'lodash/some';
+import React from "react";
+import some from "lodash/some";
 import GetFormItem from "../GetFormItem";
 import { MsgContent } from "../Common";
-import { MsgStatus as Status } from '@kmkf-fe-packages/basic-components';
+import { MsgStatus as Status } from "@kmkf-fe-packages/basic-components";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn, msgTypeCh } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
 var typeMap = {
   MSG_STATUS: {
     options: [{
-      oldValue: '发送成功',
-      value: '执行成功',
-      label: '执行成功',
-      color: '#52c41a'
+      oldValue: "发送成功",
+      value: "执行成功",
+      label: "执行成功",
+      color: "#52c41a"
     }, {
-      oldValue: '已发送',
-      value: '执行中',
-      label: '执行中',
-      color: '#52c41a'
+      oldValue: "已发送",
+      value: "执行中",
+      label: "执行中",
+      color: "#52c41a"
     }, {
-      oldValue: '发送失败',
-      value: '执行失败',
-      label: '执行失败',
-      color: '#ff4d4f'
+      oldValue: "发送失败",
+      value: "执行失败",
+      label: "执行失败",
+      color: "#ff4d4f"
     }, {
-      oldValue: '等待发送',
-      value: '等待执行',
-      label: '等待执行',
-      color: '#e7780f'
+      oldValue: "等待发送",
+      value: "等待执行",
+      label: "等待执行",
+      color: "#e7780f"
     }, {
-      oldValue: '等待发送',
-      value: '不满足条件，无需执行',
-      label: '不满足条件，无需执行',
-      color: '#8A8A8A'
+      oldValue: "等待发送",
+      value: "不满足条件，无需执行",
+      label: "不满足条件，无需执行",
+      color: "#8A8A8A"
     }],
-    key: 'msgStatusValues',
-    code: 'msgStatus4Search',
-    name: '任务状态',
+    key: "msgStatusValues",
+    code: "msgStatus4Search",
+    name: "任务状态",
     type: 1,
-    valueKey: 'status',
-    idKey: 'systemOrderId',
+    valueKey: "status",
+    idKey: "systemOrderId",
     // 添加 发送失败 是为了兼容老数据
-    failValue: ['执行失败', '发送失败']
+    failValue: ["执行失败", "发送失败"]
   }
 };
-var msgTypeCh = {
-  ding: '钉钉',
-  wechat: '微信',
-  qq: 'QQ',
-  qywx: '企业微信',
-  YZDKH: '邮政拦截',
-  YT: '圆通拦截',
-  feishu: "飞书"
-};
 var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
   var _this = this,
     _typeMap$options$type,
@@ -133,9 +124,9 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
         var _typeMap$_this$type14;
         return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
       });
-      var key = item.msgType || 'ding';
-      return "".concat(msgTypeCh[key], "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || '');
-    }).join(',');
+      var key = item.msgType || "ding";
+      return "".concat(msgTypeCh[key], "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || "" : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || "");
+    }).join(",");
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _typeMap$_this$type16;
@@ -146,7 +137,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
-      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
       component: /*#__PURE__*/React.createElement(Status, _extends({}, _this.componentConfig, {
         type: (_typeMap$_this$type16 = typeMap[_this.type]) === null || _typeMap$_this$type16 === void 0 ? void 0 : _typeMap$_this$type16.type,
         failValue: typeMap[_this.type].failValue
@@ -160,12 +151,12 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type17 = typeMap[_this.type]) === null || _typeMap$_this$type17 === void 0 ? void 0 : _typeMap$_this$type17.code),
       name: "".concat(_this.name),
-      filterComponentType: 'MultipleSelect',
+      filterComponentType: "MultipleSelect",
       props: {
         options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
         fieldNames: {
-          label: 'label',
-          value: 'value'
+          label: "label",
+          value: "value"
         }
       },
       filterFn: function filterFn(value) {
@@ -187,7 +178,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.dataType = 'weakenArray';
+  this.dataType = "weakenArray";
   this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     required: true,
     validator: function validator(_, value) {
@@ -202,7 +193,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
       return Promise.resolve();
     }
   }] : [];
-  this.align = 'left';
+  this.align = "left";
   this.options = (_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.options;
 });
 export default MsgStatus;

package/dist/esm/components/{JST/JstLogistics → Reissue/Logistics}/index.d.ts

@@ -1,7 +1,7 @@
 import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../../type";
 import React from "react";
 import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-declare class JstLogistics implements ComponentInterface {
+declare class Logistics implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
@@ -60,4 +60,4 @@ declare class JstLogistics implements ComponentInterface {
         formatFilterValue?: undefined;
     })[];
 }
-export default JstLogistics;
+export default Logistics;

package/dist/esm/components/{JST/JstLogistics → Reissue/Logistics}/index.js

@@ -16,12 +16,6 @@ import ItemView from "../../../commonComponents/ItemView";
 import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
-  JST_LOGISTICS: {
-    key: "jstItemList",
-    name: "jst",
-    company: "logisticsCompany",
-    code: "logisticsCode"
-  },
   REISSUE_LOGISTICS: {
     key: "reissueLogisticsList",
     name: "reissue",
@@ -29,14 +23,14 @@ var typeMap = {
     code: "reissueLogisticsCode"
   }
 };
-var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
+var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
   var _this = this,
     _typeMap$_options$typ,
     _typeMap$_options$typ2,
     _this$componentConfig8,
     _this$componentConfig9,
     _this$componentConfig10;
-  _classCallCheck(this, JstLogistics);
+  _classCallCheck(this, Logistics);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "sortField", void 0);
@@ -203,4 +197,4 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
   this.expressDateInstance = ExpressData.getInstance((_this$componentConfig9 = this.componentConfig) === null || _this$componentConfig9 === void 0 ? void 0 : _this$componentConfig9.logistics);
   this.sortChildField = this.getSortChildFields(((_this$componentConfig10 = this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.showField) || "", _options);
 });
-export default JstLogistics;
+export default Logistics;

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
-import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, AfterSalesOrderId, BsE3Goods, BsE3Reissue, MemberLevel } from "./index";
+import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, AfterSalesOrderId, BsE3Goods, BsE3Reissue, MemberLevel } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BsLogistics | ItemEnCode | JstLogistics | JstSendGood | MsgStatus | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId;
+export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | JstSendGood | MsgStatus | ReissueLogistics | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | JstSupply | BsGoods | BsE3Goods | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId;

package/dist/esm/factory.js

@@ -1,4 +1,4 @@
-import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect,
+import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect,
 // CommonTradeId,
 CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, AfterSalesOrderId, BsE3Goods, BsE3Reissue, MemberLevel } from "./index";
 export var factory = function factory(type, options) {
@@ -122,9 +122,8 @@ export var factory = function factory(type, options) {
       return new CommonDataTime(options);
     case "TEMPLATE_ID_INPUT":
       return new TemplateSelect(options);
-    case "JST_LOGISTICS":
     case "REISSUE_LOGISTICS":
-      return new JstLogistics(options);
+      return new ReissueLogistics(options);
     case "JST_ITEM_SELECT_THIRD":
       return new JstItemSelect(options);
     case "JST_SUPPLY":
@@ -171,6 +170,7 @@ export var factory = function factory(type, options) {
     case "BS_E3_LOGISTICS":
     case "WLN_LOGISTICS":
     case "WDT_LOGISTICS":
+    case "JST_LOGISTICS":
       return new BsLogistics(options);
     case "FLOW_WORK_ORDER_ID_INPUT":
       return new FlowWorkOrderId(options);

package/dist/esm/index.d.ts

@@ -34,7 +34,7 @@ export { default as SystemOrderNo } from "./components/SystemOrderNo";
 export { default as Ordinary } from "./components/Ordinary";
 export { default as ThirdItemSelect } from "./components/ThirdItemSelect";
 export { default as Payment } from "./components/Payment";
-export { default as JstLogistics } from "./components/JST/JstLogistics";
+export { default as ReissueLogistics } from "./components/Reissue/Logistics";
 export { default as JstItemSelect } from "./components/JST/JstItemSelect";
 export { default as JstSendGood } from "./components/JST/JstSendGood";
 export { default as JstSupply } from "./components/JST/JstSupply";

package/dist/esm/index.js

@@ -34,7 +34,7 @@ export { default as SystemOrderNo } from "./components/SystemOrderNo";
 export { default as Ordinary } from "./components/Ordinary";
 export { default as ThirdItemSelect } from "./components/ThirdItemSelect";
 export { default as Payment } from "./components/Payment";
-export { default as JstLogistics } from "./components/JST/JstLogistics";
+export { default as ReissueLogistics } from "./components/Reissue/Logistics";
 export { default as JstItemSelect } from "./components/JST/JstItemSelect";
 export { default as JstSendGood } from "./components/JST/JstSendGood";
 export { default as JstSupply } from "./components/JST/JstSupply";

package/dist/esm/service/api.d.ts

@@ -8,6 +8,8 @@ export declare const queryLogisticsAddressData: () => Promise<void>;
 export declare const queryAllLogisticsCompany: () => Promise<void>;
 export declare const queryWdtLogisticsCompany: () => Promise<void>;
 export declare const queryBsE3LogisticsCompany: () => Promise<void>;
+export declare const queryJSTLogisticsCompany: () => Promise<void>;
+export declare const queryWLNLogisticsCompany: () => Promise<void>;
 export declare const querySendData: () => Promise<void>;
 export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
 export declare const queryLabel: () => Promise<any>;

package/dist/esm/service/api.js

@@ -266,6 +266,18 @@ export var queryBsE3LogisticsCompany = function queryBsE3LogisticsCompany() {
     instance.expressData = data;
   }).catch(console.log);
 };
+export var queryJSTLogisticsCompany = function queryJSTLogisticsCompany() {
+  var instance = ExpressData.getInstance('jst');
+  return servers.JST.getLogisticsDataAsync().then(function (data) {
+    instance.expressData = data;
+  }).catch(console.log);
+};
+export var queryWLNLogisticsCompany = function queryWLNLogisticsCompany() {
+  var instance = ExpressData.getInstance('wln');
+  return servers.WLN.getLogisticsDataAsync().then(function (data) {
+    instance.expressData = data;
+  }).catch(console.log);
+};
 export var querySendData = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.25.1",
+  "version": "1.26.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "1.25.1",
-    "@kmkf-fe-packages/kmkf-utils": "1.25.1",
+    "@kmkf-fe-packages/basic-components": "1.26.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.26.0",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fe8404f42c30b927e372cba3eac352b365da758a",
+  "gitHead": "adac4396452e1d31651bf5e712b78e96b6619954",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }