@kmkf-fe-packages/services-components 0.6.3-alpha.3 → 0.6.3-alpha.30

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

@@ -5,12 +5,12 @@ 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 { ApaasInput } from '@kmkf-fe-packages/basic-components';
+import React from "react";
+import { ApaasInput } from "@kmkf-fe-packages/basic-components";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
 var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
   var _this = this;
   _classCallCheck(this, PaymentTid);
@@ -26,39 +26,71 @@ 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) {
+  _defineProperty(this, "renderClient", function (record) {
     var _ref;
-    var address = JSON.parse(record["".concat(_this.id, "_interceptAddress")] || '[]');
-    var detail = record["".concat(_this.id, "_interceptDetail")];
+    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 = (_ref = address || []) === null || _ref === void 0 ? void 0 : _ref.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('');
+    }).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 value = hasValue ? /*#__PURE__*/React.createElement("div", null, [addressText, detail].join("/"), /*#__PURE__*/React.createElement("br", null), [name, mobile].join("/")) : null;
     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]
+      value: value
     }) : 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)]) && 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 {
+      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 value !== null && value !== void 0 ? value : '--';
+    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;
@@ -70,15 +102,15 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
       component: /*#__PURE__*/React.createElement(ApaasInput, _this.componentConfig)
     });
   });
-  _defineProperty(this, "filterConfig", function (item) {
+  _defineProperty(this, "filterConfig", function () {
     return [];
   });
-  this.name = '新派送地';
-  this.id = "".concat(options.id, "_interceptAddress");
+  this.name = "新派送地";
+  this.id = "".concat(options.id, "_interceptProvince");
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.rules = [];
-  this.align = 'left';
+  this.align = "left";
   this.width = 200;
   this.originId = options.id;
   this.isCombinationComponent = false;

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

@@ -0,0 +1,36 @@
+/// <reference types="react" />
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
+import { ExpressInterceptData } from "@kmkf-fe-packages/kmkf-utils";
+declare class InterceptStatus implements ComponentInterface {
+    name: string;
+    id: string;
+    companyId: string;
+    type: string;
+    rules: any[];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
+    align: ALignType;
+    width: number;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
+    expressInterceptInstance: ExpressInterceptData;
+    constructor(options: PickOption);
+    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) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: {
+            label: string;
+            value: string;
+        }[];
+        filterFn: (value: string[]) => (i: Record) => boolean;
+    };
+}
+export default InterceptStatus;

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

@@ -0,0 +1,84 @@
+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, 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;
+  _classCallCheck(this, InterceptStatus);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "companyId", 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, "children", void 0);
+  _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$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$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) {
+    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) {
+    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 {
+      type: item.type,
+      id: "".concat(item.id, "_interceptStatus"),
+      name: "".concat(item.name, "-\u62E6\u622A\u72B6\u6001"),
+      filterComponentType: 'MultipleSelect',
+      options: _this.expressInterceptInstance.getStatusOptions() || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _value$map, _value$map$flat;
+          return value === null || value === void 0 ? void 0 : (_value$map = value.map(function (v) {
+            return v === null || v === void 0 ? void 0 : v.split(',');
+          })) === null || _value$map === void 0 ? void 0 : (_value$map$flat = _value$map.flat()) === null || _value$map$flat === void 0 ? void 0 : _value$map$flat.includes(_filterFn.filterTableListItemColumnValue(i, item.id, 'interceptStatus'));
+        };
+      }
+    };
+  });
+  this.name = "拦截状态";
+  this.id = "".concat(options.id, "_interceptStatus");
+  this.companyId = "".concat(options.id, "_interceptCompany");
+  this.type = options.type;
+  this.componentConfig = options.componentConfig;
+  this.rules = [];
+  this.align = "left";
+  this.width = 200;
+  this.isCombinationComponent = false;
+  this.children = [];
+  this.effects = options === null || options === void 0 ? void 0 : options.effects;
+  this.expressInterceptInstance = ExpressInterceptData.getInstance();
+});
+export default InterceptStatus;

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

@@ -1,9 +1,10 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
-declare class PaymentTid implements ComponentInterface {
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
+import { ExpressInterceptData } from "@kmkf-fe-packages/kmkf-utils";
+declare class InterceptType implements ComponentInterface {
     name: string;
     id: string;
+    companyId: string;
     type: string;
     rules: any[];
     componentConfig: ComponentInterface["componentConfig"];
@@ -12,13 +13,24 @@ declare class PaymentTid implements ComponentInterface {
     width: number;
     isCombinationComponent: boolean;
     children: ComponentInterface[];
-    addressDateInstance: AddressData;
+    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) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: {
+            label: string;
+            value: string;
+        }[];
+        filterFn: (value: string[]) => (i: Record) => boolean;
+    };
 }
-export default PaymentTid;
+export default InterceptType;

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

@@ -5,15 +5,16 @@ 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 React from "react";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
-var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
+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;
-  _classCallCheck(this, PaymentTid);
+  _classCallCheck(this, InterceptType);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
+  _defineProperty(this, "companyId", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
@@ -22,41 +23,62 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
   _defineProperty(this, "width", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "addressDateInstance", 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: 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 _record;
-    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_interceptType")]) !== null && _record !== void 0 ? _record : '--';
+    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) {
+    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) {
-    var _record2;
-    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_interceptType")]) !== null && _record2 !== void 0 ? _record2 : '--';
+    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 {
+      type: item.type,
+      id: "".concat(item.id, "_interceptType"),
+      name: "".concat(item.name, "-\u62E6\u622A\u7C7B\u578B"),
+      filterComponentType: 'MultipleSelect',
+      options: _this.expressInterceptInstance.getTypeOptions() || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _value$map, _value$map$flat;
+          return value === null || value === void 0 ? void 0 : (_value$map = value.map(function (v) {
+            return v === null || v === void 0 ? void 0 : v.split(',');
+          })) === null || _value$map === void 0 ? void 0 : (_value$map$flat = _value$map.flat()) === null || _value$map$flat === void 0 ? void 0 : _value$map$flat.includes(_filterFn.filterTableListItemColumnValue(i, item.id, 'interceptType'));
+        };
+      }
+    };
   });
-  this.name = '拦截类型';
+  this.name = "拦截类型";
   this.id = "".concat(options.id, "_interceptType");
+  this.companyId = "".concat(options.id, "_interceptCompany");
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.rules = [];
-  this.align = 'left';
+  this.align = "left";
   this.width = 200;
   this.isCombinationComponent = false;
   this.children = [];
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
-  this.addressDateInstance = AddressData.getInstance();
+  this.expressInterceptInstance = ExpressInterceptData.getInstance();
 });
-export default PaymentTid;
+export default InterceptType;

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

@@ -1,9 +1,11 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, ColumnConfig } from '../../type';
-import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
-import InterceptAddress from './InterceptAddress';
-import Express from '../Express';
-import ExpressCode from '../ExpressCode';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
+import { ExpressData, ExpressInterceptData } from "@kmkf-fe-packages/kmkf-utils";
+import InterceptAddress from "./InterceptAddress";
+import InterceptType from "./InterceptType";
+import InterceptStatus from "./InterceptStatus";
+import Express from "../Express";
+import ExpressCode from "../ExpressCode";
 declare class Logistics implements ComponentInterface {
     name: string;
     id: string;
@@ -11,17 +13,58 @@ declare class Logistics implements ComponentInterface {
     rules: any[];
     componentConfig: ComponentInterface["componentConfig"];
     interceptAddress: InterceptAddress;
+    interceptType: InterceptType;
+    interceptStatus: InterceptStatus;
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     express: Express;
     expressCode: ExpressCode;
     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) => {
+        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[];
+    editRender: () => JSX.Element;
+    filterConfig: (item: ColumnConfig) => ({
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[];
+        filterFn: (value: string) => (i: Record) => boolean;
+    } | {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    } | {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: {
+            label: string;
+            value: string;
+        }[];
+        filterFn: (value: string[]) => (i: Record) => boolean;
+    })[];
 }
 export default Logistics;

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

@@ -1,17 +1,20 @@
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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 { LogisticsInterception } from '@kmkf-fe-packages/basic-components';
-import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import React from "react";
+import { LogisticsInterception } from "@kmkf-fe-packages/basic-components";
+import { ExpressData, ExpressInterceptData } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import InterceptAddress from "./InterceptAddress";
+import InterceptType from "./InterceptType";
+import InterceptStatus from "./InterceptStatus";
 import Express from "../Express";
 import ExpressCode from "../ExpressCode";
 var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
@@ -23,16 +26,29 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "interceptAddress", void 0);
+  _defineProperty(this, "interceptType", void 0);
+  _defineProperty(this, "interceptStatus", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "express", void 0);
   _defineProperty(this, "expressCode", void 0);
   _defineProperty(this, "expressDateInstance", void 0);
-  _defineProperty(this, "render", function () {
-    return null;
-  });
+  _defineProperty(this, "expressInterceptData", void 0);
+  _defineProperty(this, "effects", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record), _this.interceptAddress.renderClient(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, /*#__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 {
+      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;
@@ -40,25 +56,38 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "renderExport", function () {
     return null;
   });
-  _defineProperty(this, "editRender", function (value) {
-    var _this$componentConfig, _this$componentConfig2;
+  _defineProperty(this, "editRender", function () {
+    var _this$componentConfig, _this$componentConfig2, _this$effects, _this$effects2, _this$effects2$workOr;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
       rules: _this.rules,
       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(LogisticsInterception, _this.componentConfig)
+      component: /*#__PURE__*/React.createElement(LogisticsInterception, _extends({}, _this.componentConfig, {
+        logisticsOptions: _this.expressDateInstance.getExpressData(),
+        expressInterceptData: _this.expressInterceptData.getExpressData(),
+        isEditing: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.isEditing,
+        logisticsInterceptHandleStatus: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : (_this$effects2$workOr = _this$effects2.workOrderDetail) === null || _this$effects2$workOr === void 0 ? void 0 : _this$effects2$workOr.logisticsInterceptHandleStatus) || ""
+      }))
     });
   });
   _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;
   this.type = options.type;
   this.componentConfig = options.componentConfig;
+  this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.expressDateInstance = ExpressData.getInstance();
+  this.expressInterceptData = ExpressInterceptData.getInstance();
   this.interceptAddress = new InterceptAddress(options);
+  this.interceptType = new InterceptType(options);
+  this.interceptStatus = new InterceptStatus(options);
   this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_interceptCompany"),
     name: "物流信息"
@@ -68,20 +97,19 @@ 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;
       if ((_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required && (!(value !== null && value !== void 0 && value.interceptCompany) || !value.interceptCode)) {
-        return Promise.reject(new Error('请填写物流信息'));
+        return Promise.reject(new Error("请填写物流信息"));
       }
       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('请选择拦截类型'));
+        return Promise.reject(new Error("请选择拦截类型"));
       }
-      var showAddress = _this.expressDateInstance.isShowNewAddress(value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptType);
-      console.log(showAddress);
+      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('请填写新派送地'));
+        return Promise.reject(new Error("请填写新派送地"));
       }
       return Promise.resolve();
     }

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,12 +9,14 @@ 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;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
     editRender: () => JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "MultipleSelect";