@kmkf-fe-packages/services-components 0.6.3 → 0.7.1-alpha.0

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

@@ -0,0 +1,75 @@
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
+import React from "react";
+import { ExpressData, ExpressInterceptData, LogisticsAddressData } from "@kmkf-fe-packages/kmkf-utils";
+import InterceptSenderMobile from "./interceptSenderMobile";
+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;
+    columnHeader: string | JSX.Element;
+    id: string;
+    type: string;
+    rules: any[];
+    componentConfig: ComponentInterface["componentConfig"];
+    interceptAddress: InterceptAddress;
+    interceptType: InterceptType;
+    interceptLogisticsStatus: InterceptStatus;
+    interceptSenderMobile: InterceptSenderMobile;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
+    express: Express;
+    expressCode: ExpressCode;
+    expressDateInstance: InstanceType<typeof ExpressData>;
+    expressInterceptData: InstanceType<typeof ExpressInterceptData>;
+    logisticsAddressData: InstanceType<typeof LogisticsAddressData>;
+    effects: ComponentInterface["effects"];
+    constructor(options: PickOption);
+    renderClient: (record: any) => React.JSX.Element;
+    renderLog: (record: any) => React.JSX.Element;
+    getComponentValue: (r: Record) => {
+        interceptCompany: any;
+        interceptCode: any;
+        interceptSenderMobile: any;
+        interceptType: any;
+        interceptLogisticsStatus: any;
+        interceptRedirectTo: {
+            province: any;
+            city: any;
+            district: any;
+            detail: any;
+            name: any;
+            mobile: any;
+        };
+    };
+    renderPc: () => null;
+    renderExport: () => null;
+    editRender: () => React.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

@@ -0,0 +1,136 @@
+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, ExpressInterceptData, LogisticsAddressData, isNull } from "@kmkf-fe-packages/kmkf-utils";
+import GetFormItem from "../GetFormItem";
+import InterceptSenderMobile from "./interceptSenderMobile";
+import InterceptAddress from "./InterceptAddress";
+import InterceptType from "./InterceptType";
+import InterceptStatus from "./InterceptStatus";
+import Express from "../Express";
+import ExpressCode from "../ExpressCode";
+import ColumnHeader from "./columnHeader";
+var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
+  var _this = this;
+  _classCallCheck(this, Logistics);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "columnHeader", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "rules", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "interceptAddress", void 0);
+  _defineProperty(this, "interceptType", void 0);
+  _defineProperty(this, "interceptLogisticsStatus", void 0);
+  _defineProperty(this, "interceptSenderMobile", 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, "expressInterceptData", void 0);
+  _defineProperty(this, "logisticsAddressData", 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.interceptSenderMobile.renderClient(record), _this.interceptType.renderClient(record), _this.interceptAddress.renderClient(record), _this.interceptLogisticsStatus.renderClient(record));
+  });
+  _defineProperty(this, "renderLog", function (record) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, !isNull(_this.express.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.name, ": ", _this.express.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.expressCode.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.expressCode.name, ": ", _this.expressCode.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSenderMobile.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSenderMobile.name, ":", " ", _this.interceptSenderMobile.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptType.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptType.name, ": ", _this.interceptType.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptAddress.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptAddress.name, ":", " ", _this.interceptAddress.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptLogisticsStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptLogisticsStatus.name, ":", " ", _this.interceptLogisticsStatus.renderLog(record))));
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      interceptCompany: _this.express.getComponentValue(r),
+      interceptCode: _this.expressCode.getComponentValue(r),
+      interceptSenderMobile: _this.interceptSenderMobile.getComponentValue(r),
+      interceptType: _this.interceptType.getComponentValue(r),
+      interceptLogisticsStatus: _this.interceptLogisticsStatus.getComponentValue(r),
+      interceptRedirectTo: _this.interceptAddress.getComponentValue(r)
+    };
+  });
+  _defineProperty(this, "renderPc", function () {
+    return null;
+  });
+  _defineProperty(this, "renderExport", function () {
+    return null;
+  });
+  _defineProperty(this, "editRender", function () {
+    var _this$componentConfig, _this$componentConfig2, _this$effects;
+    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, _extends({}, _this.componentConfig, {
+        logisticsOptions: _this.expressDateInstance.getExpressData(),
+        expressInterceptData: _this.expressInterceptData.getExpressData(),
+        logisticsAddressData: _this.logisticsAddressData.getAddressData(),
+        isEditing: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.isEditing
+      }))
+    });
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return [_this.express.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: "interceptCompany"
+    })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: "interceptCode"
+    })), _this.interceptSenderMobile.filterConfig(item), _this.interceptLogisticsStatus.filterConfig(item), _this.interceptType.filterConfig(item)];
+  });
+  this.name = options.name;
+  this.columnHeader = /*#__PURE__*/React.createElement(ColumnHeader, {
+    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.logisticsAddressData = LogisticsAddressData.getInstance();
+  this.interceptAddress = new InterceptAddress(options);
+  this.interceptType = new InterceptType(options);
+  this.interceptLogisticsStatus = new InterceptStatus(options);
+  this.interceptSenderMobile = new InterceptSenderMobile(options);
+  this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
+    id: "".concat(options.id, "_interceptCompany"),
+    name: "物流信息"
+  }));
+  this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
+    id: "".concat(options.id, "_interceptCode"),
+    name: "物流单号"
+  }));
+  this.isCombinationComponent = true;
+  this.children = [this.express, this.expressCode, this.interceptType, this.interceptAddress, this.interceptLogisticsStatus];
+  this.rules = [{
+    validator: function validator(_, value) {
+      var _this$componentConfig3, _this$componentConfig4, _value$interceptAddre, _value$interceptSende;
+      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("请填写物流信息"));
+      }
+      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.expressInterceptData.getShowNewAddressMap()["".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("请填写派送地址"));
+      }
+      var showSender = _this.expressInterceptData.getShowSenderMobileMap()["".concat(value === null || value === void 0 ? void 0 : value.interceptType)];
+      if (showSender && !(value !== null && value !== void 0 && value.interceptSenderMobile)) {
+        return Promise.reject(new Error("请填写发件人手机号"));
+      }
+      if (showSender && value !== null && value !== void 0 && value.interceptSenderMobile && !(value !== null && value !== void 0 && (_value$interceptSende = value.interceptSenderMobile) !== null && _value$interceptSende !== void 0 && _value$interceptSende.match(/^[1][0-9]{10}$/))) {
+        return Promise.reject(new Error("请填写正确的发件人手机号"));
+      }
+      return Promise.resolve();
+    }
+  }];
+});
+export default Logistics;

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

@@ -0,0 +1,30 @@
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
+import React from "react";
+declare class InterceptSenderMobile 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[];
+    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) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    };
+}
+export default InterceptSenderMobile;

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

@@ -0,0 +1,74 @@
+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";
+var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMobile(options) {
+  var _this = this;
+  _classCallCheck(this, InterceptSenderMobile);
+  _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, "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) {
+    return record === null || record === void 0 ? 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["".concat(_this.id)];
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    var _record;
+    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : "--";
+  });
+  _defineProperty(this, "editRender", function () {
+    return null;
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      type: item.type,
+      id: "".concat(item.id, "_interceptSenderMobile"),
+      name: "".concat(item.name, "-\u53D1\u4EF6\u4EBA\u624B\u673A\u53F7"),
+      filterComponentType: "Input",
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, "interceptSenderMobile")).includes(value);
+        };
+      }
+    };
+  });
+  this.name = "发件人手机号";
+  this.id = "".concat(options.id, "_interceptSenderMobile");
+  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;
+});
+export default InterceptSenderMobile;

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

@@ -1,27 +1,27 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
-declare type Value = string[];
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare class BasicMultSelect implements ComponentInterface {
     name: string;
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
+    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;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => any;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[];
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default BasicMultSelect;

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

@@ -1,6 +1,4 @@
 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; }
@@ -9,10 +7,11 @@ 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 intersection from 'lodash/intersection';
 import { ApaasMultipleSelect } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options) {
   var _this = this;
   _classCallCheck(this, BasicMultSelect);
@@ -20,20 +19,15 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
-  _defineProperty(this, "canFilter", void 0);
-  _defineProperty(this, "canGroup", void 0);
-  _defineProperty(this, "canHidden", void 0);
-  _defineProperty(this, "dataType", void 0);
-  _defineProperty(this, "showContains", void 0);
   _defineProperty(this, "componentConfig", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, " ", value === null || value === void 0 ? void 0 : value.join(','));
-  });
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _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) {
@@ -43,6 +37,13 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
     }
     return /*#__PURE__*/React.createElement("span", null, record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_basicMultSelect")]) === null || _record === void 0 ? void 0 : _record.join(','));
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_basicMultSelect")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_basicMultSelect")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_basicMultSelect")]) === undefined) {
@@ -62,23 +63,29 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _defineProperty(this, "filterConfig", function (item) {
+    var _item$config;
+    return {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'MultipleSelect',
+      options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'basicMultSelect')).length > 0;
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = false;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.showContains = false;
-  this.dataType = 'array';
   this.componentConfig = options.componentConfig;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default BasicMultSelect;

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

@@ -1,40 +1,29 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
 declare class OrdinaryHeader implements ComponentInterface {
     name: string;
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     effects: ComponentInterface["effects"];
     align: ALignType;
     width: number;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
-    renderPc: (value: any) => any;
+    renderPc: (value: unknown, r: Record) => any;
+    renderLog: (r: Record) => any;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any) => any;
     editRender: () => JSX.Element;
-    getColumns: () => {
-        title: string;
-        align: ALignType;
-        dataIndex: string;
-        dataType: DataType;
-        canHidden: boolean;
-        canFilter: boolean;
-        canGroup: boolean;
+    filterConfig: (item: ColumnConfig) => {
         type: string;
-        render: (value: any) => any;
-        renderPc: (value: any) => any;
-        componentType: () => JSX.Element;
-        showContains: boolean;
-        renderExport: (value: any) => any;
-        width: number;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default OrdinaryHeader;

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

@@ -10,7 +10,7 @@ import React from 'react';
 import GetFormItem from "../GetFormItem";
 import Header from "../OrdinaryHeader";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var OrdinaryHeader = /*#__PURE__*/_createClass(function OrdinaryHeader(options) {
   var _this = this;
   _classCallCheck(this, OrdinaryHeader);
@@ -18,27 +18,29 @@ var OrdinaryHeader = /*#__PURE__*/_createClass(function OrdinaryHeader(options)
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
-  _defineProperty(this, "canFilter", void 0);
-  _defineProperty(this, "canGroup", void 0);
-  _defineProperty(this, "canHidden", void 0);
-  _defineProperty(this, "dataType", void 0);
-  _defineProperty(this, "showContains", void 0);
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "effects", void 0);
   _defineProperty(this, "align", void 0);
   _defineProperty(this, "width", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, value);
-  });
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _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) {
-    return value !== null && value !== void 0 ? 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 : '--';
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
   });
   _defineProperty(this, "renderExport", function (value) {
     return value !== null && value !== void 0 ? value : '--';
@@ -59,36 +61,28 @@ var OrdinaryHeader = /*#__PURE__*/_createClass(function OrdinaryHeader(options)
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
+  _defineProperty(this, "filterConfig", function (item) {
     return {
-      title: _this.name,
-      align: _this.align,
-      dataIndex: _this.id,
-      dataType: _this.dataType,
-      canHidden: _this.canHidden,
-      canFilter: _this.canFilter,
-      canGroup: _this.canGroup,
-      type: _this.type,
-      render: _this.renderPc,
-      renderPc: _this.renderPc,
-      componentType: _this.editRender,
-      showContains: _this.showContains,
-      renderExport: _this.renderExport,
-      width: _this.width
+      type: item.type,
+      id: "".concat(item.id, "_ordinaryMoney"),
+      name: "".concat(item.name, "-\u5F00\u7968\u91D1\u989D"),
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, 'ordinaryMoney')).includes(value);
+        };
+      }
     };
   });
   this.name = '发票抬头';
   this.id = "".concat(options.id, "_ordinaryTaitou");
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = true;
-  this.canHidden = false;
-  this.showContains = false;
-  this.dataType = 'string';
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.align = 'left';
   this.effects = options.effects;
   this.width = 200;
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default OrdinaryHeader;