@kmkf-fe-packages/services-components 0.6.3-alpha.16 → 0.6.3-alpha.21

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

@@ -7,6 +7,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 GetFormItem from "../GetFormItem";
 import { JstGoodImage } from "../Common";
 import { JstGoods } from '@kmkf-fe-packages/basic-components';
@@ -24,18 +25,17 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
   _defineProperty(this, "align", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "render", function (value) {
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
-      list: value,
-      type: 3
-    });
-  });
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+    var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
+      return !isNull(item);
+    }) : false;
+    return isShow ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: /*#__PURE__*/React.createElement(JstGoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: 3
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {

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

@@ -10,7 +10,6 @@ declare class JstSupply implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: any) => JSX.Element;
     renderClient: (record: Record) => JSX.Element | null;
     renderPc: (value: any, record: Record) => JSX.Element;
     renderLog: (r: Record) => JSX.Element | null;

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

@@ -7,6 +7,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 GetFormItem from "../GetFormItem";
 import { JstGoodImage } from "../Common";
 import { JstGoods } from '@kmkf-fe-packages/basic-components';
@@ -24,18 +25,17 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
   _defineProperty(this, "align", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "render", function (value) {
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
-      list: value,
-      type: 2
-    });
-  });
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+    var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
+      return !isNull(item);
+    }) : false;
+    return isShow ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: /*#__PURE__*/React.createElement(JstGoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: 2
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {

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

@@ -15,7 +15,6 @@ declare class Logistics implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: () => null;
     editRender: (value: any) => JSX.Element;
     renderClient: (record: Record) => JSX.Element;
     renderPc: () => null;

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

@@ -28,9 +28,6 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "expressCode", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "render", function () {
-    return null;
-  });
   _defineProperty(this, "editRender", function (value) {
     var _this$componentConfig, _this$componentConfig2;
     return /*#__PURE__*/React.createElement(GetFormItem, {

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

@@ -13,14 +13,20 @@ declare class PaymentTid implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     originId: string;
-    addressDateInstance: typeof AddressData;
+    addressDateInstance: AddressData;
     constructor(options: PickOption);
-    render: (value: any, record: any) => JSX.Element | null;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any, record: Record) => JSX.Element;
     renderLog: (r: Record) => JSX.Element | null;
-    getComponentValue: (r: Record) => {};
-    renderExport: (value: any, record: Record) => null;
+    getComponentValue: (r: Record) => {
+        province: any;
+        city: any;
+        district: any;
+        detail: any;
+        name: any;
+        mobile: any;
+    };
+    renderExport: (value: any, record: Record) => string | null;
     editRender: () => JSX.Element;
     filterConfig: (item: ColumnConfig) => never[];
 }

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

@@ -26,29 +26,15 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "originId", void 0);
   _defineProperty(this, "addressDateInstance", void 0);
-  _defineProperty(this, "render", function (value, record) {
-    var _ref;
-    var province = record["".concat(_this.id, "_interceptProvince")];
-    var city = record["".concat(_this.id, "_interceptCity")];
-    var district = record["".concat(_this.id, "_interceptDistrict")];
-    var detail = record["".concat(_this.id, "_interceptDetail")];
-    var name = record["".concat(_this.originId, "_interceptReceiverName")];
-    var mobile = record["".concat(_this.originId, "_interceptReceiverMobile")];
-    var addressText = (_ref = [province, city, district]) === null || _ref === void 0 ? void 0 : _ref.map(function (suffix) {
-      return _this.addressDateInstance.getNameByCode(suffix);
-    }).join("");
-    var hasValue = addressText || detail || name || mobile;
-    return hasValue ? /*#__PURE__*/React.createElement("div", null, [addressText, detail].join("/"), /*#__PURE__*/React.createElement("br", null), [name, mobile].join("/")) : null;
-  });
   _defineProperty(this, "renderClient", function (record) {
-    var _ref2;
+    var _ref;
     var province = record["".concat(_this.originId, "_interceptProvince")];
     var city = record["".concat(_this.originId, "_interceptCity")];
     var district = record["".concat(_this.originId, "_interceptDistrict")];
     var detail = record["".concat(_this.originId, "_interceptDetail")];
     var name = record["".concat(_this.originId, "_interceptReceiverName")];
     var mobile = record["".concat(_this.originId, "_interceptReceiverMobile")];
-    var addressText = (_ref2 = [province, city, district]) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (suffix) {
+    var addressText = (_ref = [province, city, district]) === null || _ref === void 0 ? void 0 : _ref.map(function (suffix) {
       return _this.addressDateInstance.getNameByCode(suffix);
     }).join("");
     var hasValue = addressText || detail || name || mobile;
@@ -60,26 +46,51 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    if (value === undefined) {
+    var _ref2;
+    var province = record["".concat(_this.originId, "_interceptProvince")];
+    var city = record["".concat(_this.originId, "_interceptCity")];
+    var district = record["".concat(_this.originId, "_interceptDistrict")];
+    var detail = record["".concat(_this.originId, "_interceptDetail")];
+    var name = record["".concat(_this.originId, "_interceptReceiverName")];
+    var mobile = record["".concat(_this.originId, "_interceptReceiverMobile")];
+    if (province === undefined) {
       return /*#__PURE__*/React.createElement("span", null, "--");
     }
-    return /*#__PURE__*/React.createElement("span", {
-      className: "pointer",
-      onClick: function onClick() {
-        var _this$effects, _this$effects2;
-        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail) === "function" && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.queryWorkOrderDetail(record));
-      }
-    }, value);
+    var addressText = (_ref2 = [province, city, district]) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (suffix) {
+      return _this.addressDateInstance.getNameByCode(suffix);
+    }).join("");
+    return /*#__PURE__*/React.createElement("span", null, "".concat(addressText).concat(detail), /*#__PURE__*/React.createElement("br", null), "".concat(name, " ").concat(mobile));
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptProvince")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptDetail")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptReceiverName")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptReceiverMobile")])) return null;
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptDetail")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptReceiverName")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptReceiverMobile")])) return null;
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    return {};
+    return {
+      province: r === null || r === void 0 ? void 0 : r["".concat(_this.originId, "_interceptProvince")],
+      city: r === null || r === void 0 ? void 0 : r["".concat(_this.originId, "_interceptCity")],
+      district: r === null || r === void 0 ? void 0 : r["".concat(_this.originId, "_interceptDistrict")],
+      detail: r === null || r === void 0 ? void 0 : r["".concat(_this.originId, "_interceptDetail")],
+      name: r === null || r === void 0 ? void 0 : r["".concat(_this.originId, "_interceptReceiverName")],
+      mobile: r === null || r === void 0 ? void 0 : r["".concat(_this.originId, "_interceptReceiverMobile")]
+    };
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    return null;
+    var _ref3;
+    var _this$getComponentVal = _this.getComponentValue(record),
+      province = _this$getComponentVal.province,
+      city = _this$getComponentVal.city,
+      district = _this$getComponentVal.district,
+      detail = _this$getComponentVal.detail,
+      name = _this$getComponentVal.name,
+      mobile = _this$getComponentVal.mobile;
+    if ([province, detail, name, mobile].every(function (item) {
+      return isNull(item);
+    })) return null;
+    var addressText = (_ref3 = [province, city, district]) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (suffix) {
+      return _this.addressDateInstance.getNameByCode(suffix);
+    }).join("");
+    return "".concat(addressText).concat(detail, " ").concat(name).concat(mobile);
   });
   _defineProperty(this, "editRender", function () {
     var _this$componentConfig, _this$componentConfig2;

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

@@ -13,15 +13,20 @@ declare class InterceptStatus implements ComponentInterface {
     width: number;
     isCombinationComponent: boolean;
     children: ComponentInterface[];
-    expressDataInstance: typeof ExpressInterceptData;
+    expressInterceptInstance: ExpressInterceptData;
     constructor(options: PickOption);
-    render: (value: any, record: any) => JSX.Element;
     getComponentValue: (r: Record) => any;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any, record: Record) => any;
     renderLog: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
     editRender: () => null;
-    filterConfig: (item: ColumnConfig) => never[];
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[];
+        filterFn: (value: string) => (i: Record) => boolean;
+    };
 }
 export default InterceptStatus;

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

@@ -7,7 +7,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { ExpressInterceptData } from "@kmkf-fe-packages/kmkf-utils";
 var InterceptStatus = /*#__PURE__*/_createClass(function InterceptStatus(options) {
   var _this = this;
@@ -23,36 +23,46 @@ var InterceptStatus = /*#__PURE__*/_createClass(function InterceptStatus(options
   _defineProperty(this, "width", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "expressDataInstance", void 0);
-  _defineProperty(this, "render", function (value, record) {
-    return /*#__PURE__*/React.createElement("span", null, "TODO");
-  });
+  _defineProperty(this, "expressInterceptInstance", void 0);
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r[_this.id];
   });
   _defineProperty(this, "renderClient", function (record) {
+    var _this$expressIntercep;
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.expressDataInstance.getStatusNameMap()["".concat(record === null || record === void 0 ? void 0 : record[_this.companyId], "_").concat(record === null || record === void 0 ? void 0 : record[_this.id])]
+      value: (_this$expressIntercep = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep === void 0 ? void 0 : _this$expressIntercep["".concat(record === null || record === void 0 ? void 0 : record[_this.id])]
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var _this$expressDataInst;
-    return (_this$expressDataInst = _this.expressDataInstance.getStatusNameMap()["".concat(record === null || record === void 0 ? void 0 : record[_this.companyId], "_").concat(record === null || record === void 0 ? void 0 : record[_this.id])]) !== null && _this$expressDataInst !== void 0 ? _this$expressDataInst : "--";
+    var _this$expressIntercep2, _this$expressIntercep3;
+    return (_this$expressIntercep2 = (_this$expressIntercep3 = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep3 === void 0 ? void 0 : _this$expressIntercep3["".concat(record === null || record === void 0 ? void 0 : record[_this.id])]) !== null && _this$expressIntercep2 !== void 0 ? _this$expressIntercep2 : "--";
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptStatus")])) return null;
-    return _this.expressDataInstance.getTypeNameMap()[r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptStatus")]];
+    var _this$expressIntercep4;
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    return (_this$expressIntercep4 = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep4 === void 0 ? void 0 : _this$expressIntercep4[r === null || r === void 0 ? void 0 : r["".concat(_this.id)]];
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    return _this.renderPc("", record);
+    var _this$expressIntercep5, _this$expressIntercep6;
+    return (_this$expressIntercep5 = (_this$expressIntercep6 = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep6 === void 0 ? void 0 : _this$expressIntercep6["".concat(record === null || record === void 0 ? void 0 : record[_this.id])]) !== null && _this$expressIntercep5 !== void 0 ? _this$expressIntercep5 : "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return [];
+    return {
+      id: item.id,
+      name: "".concat(item.name, "-\u62E6\u622A\u72B6\u6001"),
+      filterComponentType: 'MultipleSelect',
+      options: _this.expressInterceptInstance.getExpressData() || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id));
+        };
+      }
+    };
   });
   this.name = "拦截状态";
   this.id = "".concat(options.id, "_interceptStatus");
@@ -65,6 +75,6 @@ var InterceptStatus = /*#__PURE__*/_createClass(function InterceptStatus(options
   this.isCombinationComponent = false;
   this.children = [];
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
-  this.expressDataInstance = ExpressInterceptData.getInstance();
+  this.expressInterceptInstance = ExpressInterceptData.getInstance();
 });
 export default InterceptStatus;

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

@@ -13,15 +13,20 @@ declare class InterceptType implements ComponentInterface {
     width: number;
     isCombinationComponent: boolean;
     children: ComponentInterface[];
-    expressDataInstance: typeof ExpressInterceptData;
+    expressInterceptInstance: ExpressInterceptData;
     constructor(options: PickOption);
-    render: (value: any, record: any) => JSX.Element;
     getComponentValue: (r: Record) => any;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any, record: Record) => any;
     renderLog: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
     editRender: () => null;
-    filterConfig: (item: ColumnConfig) => never[];
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[];
+        filterFn: (value: string) => (i: Record) => boolean;
+    };
 }
 export default InterceptType;

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

@@ -7,7 +7,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { ExpressInterceptData } from "@kmkf-fe-packages/kmkf-utils";
 var InterceptType = /*#__PURE__*/_createClass(function InterceptType(options) {
   var _this = this;
@@ -23,36 +23,46 @@ var InterceptType = /*#__PURE__*/_createClass(function InterceptType(options) {
   _defineProperty(this, "width", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "expressDataInstance", void 0);
-  _defineProperty(this, "render", function (value, record) {
-    return /*#__PURE__*/React.createElement("span", null, "TODO");
-  });
+  _defineProperty(this, "expressInterceptInstance", void 0);
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r[_this.id];
   });
   _defineProperty(this, "renderClient", function (record) {
+    var _this$expressIntercep;
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.expressDataInstance.getTypeNameMap()["".concat(record === null || record === void 0 ? void 0 : record[_this.companyId], "_").concat(record === null || record === void 0 ? void 0 : record[_this.id])]
+      value: (_this$expressIntercep = _this.expressInterceptInstance.getTypeNameMap()) === null || _this$expressIntercep === void 0 ? void 0 : _this$expressIntercep["".concat(record === null || record === void 0 ? void 0 : record[_this.id])]
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var _this$expressDataInst;
-    return (_this$expressDataInst = _this.expressDataInstance.getTypeNameMap()["".concat(record === null || record === void 0 ? void 0 : record[_this.companyId], "_").concat(record === null || record === void 0 ? void 0 : record[_this.id])]) !== null && _this$expressDataInst !== void 0 ? _this$expressDataInst : "--";
+    var _this$expressIntercep2;
+    return (_this$expressIntercep2 = _this.expressInterceptInstance.getTypeNameMap()["".concat(record === null || record === void 0 ? void 0 : record[_this.id])]) !== null && _this$expressIntercep2 !== void 0 ? _this$expressIntercep2 : "--";
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptType")])) return null;
-    return _this.expressDataInstance.getTypeNameMap()[r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_interceptType")]];
+    var _this$expressIntercep3;
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    return (_this$expressIntercep3 = _this.expressInterceptInstance.getTypeNameMap()) === null || _this$expressIntercep3 === void 0 ? void 0 : _this$expressIntercep3[r === null || r === void 0 ? void 0 : r["".concat(_this.id)]];
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    return _this.renderPc("", record);
+    var _this$expressIntercep4, _this$expressIntercep5;
+    return (_this$expressIntercep4 = (_this$expressIntercep5 = _this.expressInterceptInstance.getTypeNameMap()) === null || _this$expressIntercep5 === void 0 ? void 0 : _this$expressIntercep5["".concat(record === null || record === void 0 ? void 0 : record[_this.id])]) !== null && _this$expressIntercep4 !== void 0 ? _this$expressIntercep4 : "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return [];
+    return {
+      id: item.id,
+      name: "".concat(item.name, "-\u62E6\u622A\u7C7B\u578B"),
+      filterComponentType: 'MultipleSelect',
+      options: _this.expressInterceptInstance.getExpressData() || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id));
+        };
+      }
+    };
   });
   this.name = "拦截类型";
   this.id = "".concat(options.id, "_interceptType");
@@ -65,6 +75,6 @@ var InterceptType = /*#__PURE__*/_createClass(function InterceptType(options) {
   this.isCombinationComponent = false;
   this.children = [];
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
-  this.expressDataInstance = ExpressInterceptData.getInstance();
+  this.expressInterceptInstance = ExpressInterceptData.getInstance();
 });
 export default InterceptType;

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

@@ -19,17 +19,40 @@ declare class Logistics implements ComponentInterface {
     children: ComponentInterface[];
     express: Express;
     expressCode: ExpressCode;
-    expressDateInstance: typeof ExpressData;
-    expressInterceptData: typeof ExpressInterceptData;
+    expressDateInstance: ExpressData;
+    expressInterceptData: ExpressInterceptData;
     effects: ComponentInterface["effects"];
     constructor(options: PickOption);
-    render: () => null;
     renderClient: (record: any) => JSX.Element;
     renderLog: (record: any) => JSX.Element;
-    getComponentValue: (r: Record) => {};
+    getComponentValue: (r: Record) => {
+        interceptCompany: any;
+        interceptCode: any;
+        interceptType: any;
+        interceptStatus: any;
+        interceptRedirectTo: {
+            province: any;
+            city: any;
+            district: any;
+            detail: any;
+            name: any;
+            mobile: any;
+        };
+    };
     renderPc: () => null;
     renderExport: () => null;
     editRender: (value: any) => JSX.Element;
-    filterConfig: (item: ColumnConfig) => never[];
+    filterConfig: (item: ColumnConfig) => ({
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[];
+        filterFn: (value: string) => (i: Record) => boolean;
+    } | {
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    })[];
 }
 export default Logistics;

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

@@ -35,17 +35,20 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "expressDateInstance", void 0);
   _defineProperty(this, "expressInterceptData", void 0);
   _defineProperty(this, "effects", void 0);
-  _defineProperty(this, "render", function () {
-    return null;
-  });
   _defineProperty(this, "renderClient", function (record) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record), _this.interceptType.renderClient(record), _this.interceptAddress.renderClient(record), _this.interceptStatus.renderClient(record));
   });
   _defineProperty(this, "renderLog", function (record) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderLog(record), _this.expressCode.renderLog(record), _this.interceptType.renderLog(record), _this.interceptAddress.renderLog(record), _this.interceptStatus.renderLog(record));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, _this.express.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.expressCode.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.interceptType.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.interceptAddress.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.interceptStatus.renderLog(record)));
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    return {};
+    return {
+      interceptCompany: _this.express.getComponentValue(r),
+      interceptCode: _this.expressCode.getComponentValue(r),
+      interceptType: _this.interceptType.getComponentValue(r),
+      interceptStatus: _this.interceptStatus.getComponentValue(r),
+      interceptRedirectTo: _this.interceptAddress.getComponentValue(r)
+    };
   });
   _defineProperty(this, "renderPc", function () {
     return null;
@@ -69,7 +72,11 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return [];
+    return [_this.express.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: 'interceptCompany'
+    })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: 'interceptCode'
+    })), _this.interceptStatus.filterConfig(item), _this.interceptType.filterConfig(item)];
   });
   this.name = options.name;
   this.id = options.id;
@@ -90,7 +97,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
     name: "物流单号"
   }));
   this.isCombinationComponent = true;
-  this.children = [this.express, this.expressCode, this.interceptAddress];
+  this.children = [this.express, this.expressCode, this.interceptType, this.interceptAddress, this.interceptStatus];
   this.rules = [{
     validator: function validator(_, value) {
       var _this$componentConfig3, _this$componentConfig4, _value$interceptAddre;
@@ -100,7 +107,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
       if ((_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required && !(value !== null && value !== void 0 && value.interceptType)) {
         return Promise.reject(new Error("请选择拦截类型"));
       }
-      var showAddress = _this.expressData.getShowNewAddressMap()["".concat(value === null || value === void 0 ? void 0 : value.interceptCompany, "_").concat(value === null || value === void 0 ? void 0 : value.interceptType)];
+      var showAddress = _this.expressInterceptData.getShowNewAddressMap()["".concat(value === null || value === void 0 ? void 0 : value.interceptCompany, "_").concat(value === null || value === void 0 ? void 0 : value.interceptType)];
       if (showAddress && (!(value !== null && value !== void 0 && (_value$interceptAddre = value.interceptAddress) !== null && _value$interceptAddre !== void 0 && _value$interceptAddre.length) || !(value !== null && value !== void 0 && value.interceptDetail) || !(value !== null && value !== void 0 && value.interceptReceiverName) || !(value !== null && value !== void 0 && value.interceptReceiverMobile))) {
         return Promise.reject(new Error("请填写新派送地"));
       }

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

@@ -1,6 +1,5 @@
 /// <reference types="react" />
 import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
-declare type Value = string[];
 declare class BasicMultSelect implements ComponentInterface {
     name: string;
     id: string;
@@ -10,7 +9,6 @@ declare class BasicMultSelect implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: Value) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any, record: Record) => JSX.Element;
     renderLog: (r: Record) => JSX.Element | null;

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

@@ -22,14 +22,12 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, " ", value === null || value === void 0 ? void 0 : value.join(','));
-  });
   _defineProperty(this, "renderClient", function (record) {
+    var _record$_this$id;
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: record === null || record === void 0 ? void 0 : (_record$_this$id = record[_this.id]) === null || _record$_this$id === void 0 ? void 0 : _record$_this$id.join(',')
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {

package/dist/esm/components/Ordinary/OrdinaryHeader.d.ts

@@ -12,7 +12,6 @@ declare class OrdinaryHeader implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: unknown, r: Record) => any;
     renderLog: (r: Record) => any;

package/dist/esm/components/Ordinary/OrdinaryHeader.js

@@ -24,14 +24,11 @@ var OrdinaryHeader = /*#__PURE__*/_createClass(function OrdinaryHeader(options)
   _defineProperty(this, "width", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, value);
-  });
   _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: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, r) {

package/dist/esm/components/Ordinary/OrdinaryMoney.d.ts

@@ -12,7 +12,6 @@ declare class OrdinaryMoney implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
     renderPc: (value: unknown, r: Record) => any;
     renderLog: (r: Record) => any;
     getComponentValue: (r: Record) => any;

package/dist/esm/components/Ordinary/OrdinaryMoney.js

@@ -23,9 +23,6 @@ var OrdinaryMoney = /*#__PURE__*/_createClass(function OrdinaryMoney(options) {
   _defineProperty(this, "width", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, value);
-  });
   _defineProperty(this, "renderPc", function (value, r) {
     var _r;
     return (_r = r === null || r === void 0 ? void 0 : r["".concat(_this.id)]) !== null && _r !== void 0 ? _r : '--';
@@ -44,7 +41,7 @@ var OrdinaryMoney = /*#__PURE__*/_createClass(function OrdinaryMoney(options) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
     }) : null;
   });
   _defineProperty(this, "editRender", function () {

package/dist/esm/components/Ordinary/OrdinarySerial.d.ts

@@ -17,7 +17,6 @@ declare class OrdinarySerial implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: unknown, r: Record) => any;
     renderLog: (r: Record) => any;