@kmkf-fe-packages/services-components 1.0.3-alpha.8 → 1.0.4-rc.2

package/README.md

@@ -3,4 +3,3 @@
 - 针对于自定义组件的后缀，在提交的时候是以组件类型的驼峰式来命名的
 
 ---
-

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 declare const _default: (props: {
     text: string;
     showText?: string;

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

@@ -1,5 +1,11 @@
-import React from 'react';
-import { Typography } from 'antd';
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _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 { Typography } from "antd";
 var Paragraph = Typography.Paragraph;
 export default (function (props) {
   var text = props.text,
@@ -9,6 +15,8 @@ export default (function (props) {
     copyable: {
       text: text
     },
-    style: style
+    style: _objectSpread(_objectSpread({}, style), {}, {
+      marginBottom: 0
+    })
   }, showText || text);
 });

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";
+declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany" | "queryWdtLogisticsCompany" | "queryWdtSendData";
 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,8 @@ 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, Result, Button } from "antd";
-import { queryAddressData, queryBsAddressData, queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryWdtAddressData, queryAllLogisticsCompany, queryLabel } from "../../service/api";
+import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryAllLogisticsCompany, queryWdtLogisticsCompany, queryWdtSendData } from "../../service/api";
+import { servers } from '@kmkf-fe-packages/kmkf-utils';
 var Global = function Global(_ref) {
   var children = _ref.children,
     _ref$requestList = _ref.requestList,
@@ -33,14 +34,15 @@ var Global = function Global(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             mapping = {
-              queryAddressData: queryAddressData,
-              queryBsAddressData: queryBsAddressData,
+              queryAddressData: servers.queryAddressData,
+              queryBsAddressData: servers.queryBsAddressData,
               queryExpressInterceptData: queryExpressInterceptData,
               queryLogisticsAddressData: queryLogisticsAddressData,
               queryPlatData: queryPlatData,
-              queryWdtAddressData: queryWdtAddressData,
+              queryWdtAddressData: servers.queryWdtAddressData,
               queryAllLogisticsCompany: queryAllLogisticsCompany,
-              queryLabel: queryLabel
+              queryWdtLogisticsCompany: queryWdtLogisticsCompany,
+              queryWdtSendData: queryWdtSendData
             };
             mergeMapping = _objectSpread(_objectSpread({}, mapping), repeatRequestList);
             promises = [];

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

@@ -73,7 +73,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       label: _this.name,
       value: /*#__PURE__*/React.createElement(JstGoodImage, {
         list: record === null || record === void 0 ? void 0 : record[_this.id],
-        type: 1
+        type: 1,
+        componentType: _this.type
       })
     }) : null;
   });
@@ -120,7 +121,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       }
     }, /*#__PURE__*/React.createElement(JstGoodImage, {
       list: list,
-      type: 1
+      type: 1,
+      componentType: _this.type
     }));
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -147,6 +149,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       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,
       component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
         type: 1,
+        componentType: _this.type,
         options: _this.expressDateInstance.getExpressData(),
         onChange: p === null || p === void 0 ? void 0 : p.onChange
       }))
@@ -201,7 +204,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       return Promise.resolve();
     }
   }] : [];
-  this.expressDateInstance = ExpressData.getInstance();
+  this.expressDateInstance = ExpressData.getInstance(this.type === 'WDT_LOGISTICS' ? 'wdt' : 'default');
   this.sortChildField = this.getSortChildFields(((_this$componentConfig4 = this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showField) || "", _options);
 });
 export default BsLogistics;

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

@@ -24,14 +24,14 @@ var typeMap = {
     typeName: 'bsReissueType',
     remark: 'bsReissueType_memo',
     errMsg: '请选择bs补发商品'
-  },
-  WDT_REISSUE_GOODS: {
-    key: 'wdtReissueGoods',
-    name: '旺店通',
-    typeName: 'wdtReissueType',
-    remark: 'wdtReissueType_memo',
-    errMsg: '请选择旺店通补发商品'
   }
+  // WDT_REISSUE_GOODS: {
+  //   key: 'wdtReissueGoods',
+  //   name: '旺店通',
+  //   typeName: 'wdtReissueType',
+  //   remark: 'wdtReissueType_memo',
+  //   errMsg: '请选择旺店通补发商品',
+  // },
 };
 var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
   var _this = this,

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

@@ -0,0 +1,26 @@
+import { ComponentInterface, PickOption, ALignType, Record } from "../../../type";
+import React from "react";
+declare class SystemOrderNo implements ComponentInterface {
+    name: string;
+    id: string;
+    sortField: string;
+    type: string;
+    componentConfig: ComponentInterface["componentConfig"];
+    align: ALignType;
+    width: number;
+    isCombinationComponent: boolean;
+    formField: string;
+    canSort: boolean;
+    children: ComponentInterface[];
+    dataType: ComponentInterface["dataType"];
+    constructor(options: PickOption);
+    getParentId: () => string;
+    renderClient: (r: any) => React.JSX.Element | null;
+    renderPc: (value: unknown, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => any;
+    renderExport: (value: string, record: Record) => any;
+    editRender: () => null;
+    filterConfig: () => never[];
+}
+export default SystemOrderNo;

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

@@ -0,0 +1,94 @@
+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 ItemView from "../../../commonComponents/ItemView";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+var componentType = {
+  WDT_REISSUE_GOODS: "wdtSystemOrderNo"
+};
+var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
+  var _this = this;
+  _classCallCheck(this, SystemOrderNo);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "align", void 0);
+  _defineProperty(this, "width", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "formField", void 0);
+  _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 (r) {
+    var _r$key;
+    var _this$getParentId$spl = _this.getParentId().split("_"),
+      _this$getParentId$spl2 = _slicedToArray(_this$getParentId$spl, 1),
+      key = _this$getParentId$spl2[0];
+    if (!(r !== null && r !== void 0 && r[key][componentType[_this.type]])) {
+      return null;
+    }
+    var text = r !== null && r !== void 0 && r[key] ? r === null || r === void 0 ? void 0 : (_r$key = r[key]) === null || _r$key === void 0 ? void 0 : _r$key[componentType[_this.type]] : "";
+    return !isNull(r === null || r === void 0 ? void 0 : r[key]) ? /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      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 : "--");
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    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 id = _this.getParentId();
+    var text = r !== null && r !== void 0 && r[id] ? r === null || r === void 0 ? void 0 : r[id] : "";
+    return text;
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    var _this$getComponentVal2;
+    return (_this$getComponentVal2 = _this.getComponentValue(record)) !== null && _this$getComponentVal2 !== void 0 ? _this$getComponentVal2 : "--";
+  });
+  _defineProperty(this, "editRender", function () {
+    return null;
+  });
+  _defineProperty(this, "filterConfig", function () {
+    return [];
+  });
+  this.name = options.name;
+  this.id = options.id;
+  this.sortField = options.id;
+  this.formField = options.id;
+  this.type = options.type;
+  this.componentConfig = options.componentConfig;
+  this.align = "left";
+  this.width = 140;
+  this.isCombinationComponent = false;
+  this.canSort = false;
+  this.dataType = "string";
+  this.children = [];
+});
+export default SystemOrderNo;

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

@@ -61,7 +61,8 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
     }
     return /*#__PURE__*/React.createElement(BsExpressRender, {
       list: record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat((_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.key)],
-      showField: "company"
+      showField: "company",
+      componentType: _this.type
     });
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -108,7 +109,7 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.align = "left";
-  this.expressDateInstance = ExpressData.getInstance();
+  this.expressDateInstance = ExpressData.getInstance(options.type === 'WDT_LOGISTICS' ? 'wdt' : 'default');
   this.width = (options === null || options === void 0 ? void 0 : options.width) || 150;
   this.isCombinationComponent = false;
   this.canSort = false;

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

@@ -4,3 +4,4 @@ export { default as BsHeaderPic } from "./BsHeaderPic";
 export { default as BsHeaderGoodPic } from "./BsHeaderGoodPic";
 export { default as BsHeaderChild } from "./BsHeaderChild";
 export { default as BsHeaderGood } from "./BsHeaderGood";
+export { default as SystemOrderNo } from "./SystemOrderNo";

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

@@ -3,4 +3,5 @@ export { default as BsMemo } from "./BsMemo";
 export { default as BsHeaderPic } from "./BsHeaderPic";
 export { default as BsHeaderGoodPic } from "./BsHeaderGoodPic";
 export { default as BsHeaderChild } from "./BsHeaderChild";
-export { default as BsHeaderGood } from "./BsHeaderGood";
+export { default as BsHeaderGood } from "./BsHeaderGood";
+export { default as SystemOrderNo } from "./SystemOrderNo";

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;
@@ -15,8 +15,8 @@ export declare const showImage: ({ item, type, index, showHeader, }: {
 }) => 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 }: any) => any;
-export declare const BsExpressRender: ({ list, showField }: any) => any;
+export declare const JstGoodImage: ({ list, type, componentType }: any) => any;
+export declare const BsExpressRender: ({ list, showField, componentType }: any) => any;
 export declare const CommonOrderContent: ({ list, valueKey, failValue, options, }: any) => any;
 export declare const BsGoodImage: ({ item, index }: {
     item: any;

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

@@ -12,14 +12,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, Table, message, Typography } from 'antd';
-import React, { useState, useMemo } from 'react';
-import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Typography } from "antd";
+import React, { useState, useMemo } from "react";
+import { ExpressData, WdtSendData } from "@kmkf-fe-packages/kmkf-utils";
 import { getAlipayBillReceipt } from "../../service/api";
-import { CopyToClipboard } from 'react-copy-to-clipboard';
+import { CopyToClipboard } from "react-copy-to-clipboard";
+import CopyText from "../../commonComponents/CopyText";
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
-import CopyText from "../../commonComponents/CopyText";
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -255,10 +255,12 @@ var content = function content(item, index) {
 export var JstGoodImage = function JstGoodImage(_ref6) {
   var _ref6$list = _ref6.list,
     list = _ref6$list === void 0 ? [] : _ref6$list,
-    type = _ref6.type;
+    type = _ref6.type,
+    _ref6$componentType = _ref6.componentType,
+    componentType = _ref6$componentType === void 0 ? '' : _ref6$componentType;
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var logisticsCompany = item.logisticsCompany;
-    var company = ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
+    var company = ExpressData.getInstance(componentType === 'WDT_LOGISTICS' ? 'wdt' : 'default').getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {
@@ -274,17 +276,19 @@ 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, item.sendName].join('/') : item.sendId ? item.sendId : item.sendName) : 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, componentType === 'WDT_SEND_GOOD' ? WdtSendData.getInstance().getWdtSendNameByCode(item.sendName) : item.sendName].join("/") : item.sendId ? item.sendId : componentType === 'WDT_SEND_GOOD' ? WdtSendData.getInstance().getWdtSendNameByCode(item.sendName) : item.sendName) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
   }) : null;
 };
 export var BsExpressRender = function BsExpressRender(_ref7) {
   var _ref7$list = _ref7.list,
     list = _ref7$list === void 0 ? [] : _ref7$list,
     _ref7$showField = _ref7.showField,
-    showField = _ref7$showField === void 0 ? '' : _ref7$showField;
+    showField = _ref7$showField === void 0 ? "" : _ref7$showField,
+    _ref7$componentType = _ref7.componentType,
+    componentType = _ref7$componentType === void 0 ? "" : _ref7$componentType;
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var logisticsCompany = item.logisticsCompany;
-    var company = ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
+    var company = ExpressData.getInstance(componentType === 'WDT_LOGISTICS' ? 'wdt' : 'default').getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {

package/dist/esm/components/JST/JstSendGood/index.js

@@ -12,7 +12,7 @@ import GetFormItem from "../../GetFormItem";
 import { JstGoodImage } from "../../Common";
 import { JstGoods } 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, WdtSendData } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../../constant";
 var typeMap = {
   JST_SEND_GOOD: {
@@ -100,7 +100,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
       label: _this.name,
       value: /*#__PURE__*/React.createElement(JstGoodImage, {
         list: record === null || record === void 0 ? void 0 : record[_this.id],
-        type: 3
+        type: 3,
+        componentType: _this.type
       })
     }) : null;
   });
@@ -114,7 +115,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
       }
     }, /*#__PURE__*/React.createElement(JstGoodImage, {
       list: list,
-      type: 3
+      type: 3,
+      componentType: _this.type
     }));
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -131,7 +133,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
     var _typeMap$_this$type4;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.key)];
     return (list || []).map(function (item) {
-      return [item === null || item === void 0 ? void 0 : item.sendId, item === null || item === void 0 ? void 0 : item.sendName].join("/");
+      return [item === null || item === void 0 ? void 0 : item.sendId, _this.type === 'WDT_SEND_GOOD' ? WdtSendData.getInstance().getWdtSendNameByCode(item === null || item === void 0 ? void 0 : item.sendName) : item === null || item === void 0 ? void 0 : item.sendName].join("/");
     }).join(",");
   });
   _defineProperty(this, "editRender", function (p) {
@@ -143,7 +145,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
-        type: 3
+        type: 3,
+        componentType: _this.type
       }))
     });
   });

package/dist/esm/components/LogisticsInterception/InterceptState.d.ts

@@ -0,0 +1,37 @@
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
+import React from "react";
+declare class InterceptState implements ComponentInterface {
+    name: string;
+    id: string;
+    sortField: string;
+    type: string;
+    rules: any[];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
+    align: ALignType;
+    width: number;
+    isCombinationComponent: boolean;
+    formField: string;
+    canSort: boolean;
+    children: ComponentInterface[];
+    dataType: ComponentInterface["dataType"];
+    options: ComponentInterface["options"];
+    constructor(options: PickOption);
+    getComponentValue: (r: Record) => any;
+    renderClient: (record: any) => React.JSX.Element | null;
+    renderPc: (value: any, record: Record) => any;
+    renderLog: (r: Record) => any;
+    renderExport: (value: any, record: Record) => any;
+    editRender: () => null;
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "in";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        props: {
+            options: any[];
+        };
+    };
+}
+export default InterceptState;

package/dist/esm/components/LogisticsInterception/InterceptState.js

@@ -0,0 +1,89 @@
+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 _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 ItemView from "../../commonComponents/ItemView";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { SYMBOL } from "../../constant";
+var InterceptState = /*#__PURE__*/_createClass(function InterceptState(options) {
+  var _this = this;
+  _classCallCheck(this, InterceptState);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "rules", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "align", void 0);
+  _defineProperty(this, "width", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "formField", void 0);
+  _defineProperty(this, "canSort", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "options", void 0);
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r[_this.id];
+  });
+  _defineProperty(this, "renderClient", function (record) {
+    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
+    }) : null;
+  });
+  _defineProperty(this, "renderPc", function (value, record) {
+    var _record$_this$id;
+    return (_record$_this$id = record === null || record === void 0 ? void 0 : record[_this.id]) !== null && _record$_this$id !== void 0 ? _record$_this$id : "--";
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    return r === null || r === void 0 ? void 0 : r[_this.id];
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    var _record$_this$id2;
+    return (_record$_this$id2 = record === null || record === void 0 ? void 0 : record[_this.id]) !== null && _record$_this$id2 !== void 0 ? _record$_this$id2 : "--";
+  });
+  _defineProperty(this, "editRender", function () {
+    return null;
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      searchDefaultConditions: SYMBOL.in,
+      type: item.type,
+      id: "".concat(item.id, "_qySelfInterceptLogisticsStatus"),
+      name: "".concat(item.name, "-\u62E6\u622A\u72B6\u6001"),
+      filterComponentType: "MultipleSelect",
+      props: {
+        options: _this.options || []
+      }
+    };
+  });
+  this.name = "拦截状态";
+  this.id = "".concat(options.id, "_qySelfInterceptLogisticsStatus");
+  this.sortField = "".concat(options.id, "_qySelfInterceptLogisticsStatus");
+  this.formField = "".concat(options.id, "_qySelfInterceptLogisticsStatus");
+  this.type = options.type;
+  this.componentConfig = options.componentConfig;
+  this.rules = [];
+  this.align = "left";
+  this.width = 200;
+  this.isCombinationComponent = false;
+  this.canSort = true;
+  this.children = [];
+  this.effects = options === null || options === void 0 ? void 0 : options.effects;
+  this.dataType = "string";
+  this.options = [{
+    label: "拦截成功",
+    value: "拦截成功"
+  }, {
+    label: "拦截失败",
+    value: "拦截失败"
+  }];
+});
+export default InterceptState;

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

@@ -6,6 +6,7 @@ import InterceptSnapshot from "./interceptSnapshot";
 import InterceptAddress from "./InterceptAddress";
 import InterceptType from "./InterceptType";
 import InterceptStatus from "./InterceptStatus";
+import InterceptState from "./InterceptState";
 import Express from "../Express";
 import ExpressCode from "../ExpressCode";
 declare class Logistics implements ComponentInterface {
@@ -21,6 +22,7 @@ declare class Logistics implements ComponentInterface {
     interceptLogisticsStatus: InterceptStatus;
     interceptSenderMobile: InterceptSenderMobile;
     interceptSnapshot: InterceptSnapshot;
+    interceptState: InterceptState;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
@@ -50,21 +52,12 @@ declare class Logistics implements ComponentInterface {
             mobile: any;
         };
         interceptSnapshot: any;
+        interceptState: any;
     };
     renderPc: () => null;
     renderExport: () => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
-        searchDefaultConditions: "in";
-        type: string;
-        id: string;
-        name: string;
-        filterComponentType: "MultipleSelect";
-        props: {
-            options: any[];
-        };
-        filterFn: (value: string) => (i: Record) => boolean;
-    } | {
         searchDefaultConditions: "like";
         type: string;
         id: string;
@@ -78,13 +71,8 @@ declare class Logistics implements ComponentInterface {
         name: string;
         filterComponentType: "MultipleSelect";
         props: {
-            options: {
-                label: string;
-                value: string;
-            }[];
+            options: any[];
         };
-        formatFilterValue: (value: string[]) => string[];
-        filterFn: (value: string[]) => (i: Record) => boolean;
     })[];
 }
 export default Logistics;