@kmkf-fe-packages/services-components 0.6.2 → 0.6.3-alpha.1

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from "../../type";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare type Value = {
     buyerNick?: string;
 };
@@ -8,24 +8,21 @@ declare class EBuyerNick implements ComponentInterface {
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     effects: ComponentInterface["effects"];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
     render: (value: Value) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: unknown, record: Record) => JSX.Element;
     renderExport: (value: any, record: any) => any;
     editRender: (value: any) => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: any) => any;
-        customizeFilter: (value: Value) => string | undefined;
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default EBuyerNick;

package/dist/esm/components/BuyerNick/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; }
@@ -8,27 +6,25 @@ 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 { BuyerNick } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { BuyerNick } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import PlatBuyer from "../../commonComponents/PlatBuyer";
-import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var EBuyerNick = /*#__PURE__*/_createClass(function EBuyerNick(options) {
   var _this = this,
-    _this$componentConfig3;
+    _this$componentConfig3,
+    _this$componentConfig4;
   _classCallCheck(this, EBuyerNick);
   _defineProperty(this, "name", void 0);
   _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, "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.buyerNick);
   });
@@ -71,26 +67,35 @@ var EBuyerNick = /*#__PURE__*/_createClass(function EBuyerNick(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport,
-      customizeFilter: function customizeFilter(value) {
-        return value === null || value === void 0 ? void 0 : value.buyerNick;
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      id: "".concat(item.id, "_buyerNick"),
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, 'buyerNick')).includes(value);
+        };
       }
-    });
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.dataType = "string";
-  this.showContains = false;
-  this.componentConfig = options.componentConfig;
+  this.isCombinationComponent = false;
+  this.children = [];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
+    validator: function validator(_, value) {
+      if (!(value !== null && value !== void 0 && value.buyerNick)) {
+        return Promise.reject(new Error('请输入买家昵称'));
+      }
+      return Promise.resolve();
+    }
+  }] : [];
+  this.componentConfig = options.componentConfig;
+  this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
     validator: function validator(_, value) {
       if (!(value !== null && value !== void 0 && value.buyerNick)) {
         return Promise.reject(new Error("请输入买家昵称"));

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

@@ -1,30 +1,14 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType, Record } from '../../type';
-import { FormInstance } from 'antd';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare class BasicCascader 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);
-    width?: number | undefined;
-    align?: ALignType | undefined;
-    dataIndex?: string | undefined;
-    editable?: boolean | undefined;
-    formItemIndex?: number | undefined;
-    effects?: {
-        queryWorkOrderDetail: (r: any) => void;
-        isEditing: boolean;
-        form: FormInstance<any>;
-        shopList?: any[] | undefined;
-        shopId?: string | undefined;
-    } | undefined;
     /**
      * 通过值计算展示内容
      * @param value
@@ -36,10 +20,12 @@ declare class BasicCascader implements ComponentInterface {
     renderPc: (value: any, record: Record) => JSX.Element;
     renderExport: (value: any, record: Record) => string;
     editRender: (value: any) => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => string;
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "Cascader";
+        options: any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default BasicCascader;

package/dist/esm/components/Cascader/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; }
@@ -10,10 +8,11 @@ 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 { Cascader } from 'antd';
+import intersection from 'lodash/intersection';
 import GetFormItem from "../GetFormItem";
 import { findLabelBySelectValue, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
 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 BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
   var _this = this;
   _classCallCheck(this, BasicCascader);
@@ -21,18 +20,9 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(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, "width", void 0);
-  _defineProperty(this, "align", void 0);
-  _defineProperty(this, "dataIndex", void 0);
-  _defineProperty(this, "editable", void 0);
-  _defineProperty(this, "formItemIndex", void 0);
-  _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "getValue", function (value) {
     var _findLabelBySelectVal, _findLabelBySelectVal2, _this$componentConfig;
     return (_findLabelBySelectVal = findLabelBySelectValue(value, (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.options)) === null || _findLabelBySelectVal === void 0 ? void 0 : (_findLabelBySelectVal2 = _findLabelBySelectVal.map(function (i) {
@@ -90,23 +80,35 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(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 {
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Cascader',
+      options: transMultSelectOptions((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 = true;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.dataType = 'array';
-  this.showContains = false;
   this.componentConfig = options.componentConfig;
   this.rules = [];
-});
+  this.children = [];
+  this.isCombinationComponent = false;
+}
+
+/**
+ * 通过值计算展示内容
+ * @param value 
+ * @returns 
+ */);
+
 export default BasicCascader;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare type Value = {
     value?: string[];
     other?: string;
@@ -9,12 +9,9 @@ declare class BasicCheckbox implements ComponentInterface {
     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);
     getValue: (value: Value) => string | null | undefined;
     render: (value: Value) => JSX.Element;
@@ -22,10 +19,12 @@ declare class BasicCheckbox implements ComponentInterface {
     renderExport: (value: any, record: Record) => string;
     renderClient: (record: any) => JSX.Element | null;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => string;
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[] | undefined;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default BasicCheckbox;

package/dist/esm/components/Checkbox/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 _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"); } }
@@ -8,10 +6,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 { ApaasCheckbox } 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 BasicCheckbox = /*#__PURE__*/_createClass(function BasicCheckbox(options) {
   var _this = this,
     _options$componentCon;
@@ -20,12 +19,9 @@ var BasicCheckbox = /*#__PURE__*/_createClass(function BasicCheckbox(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, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "getValue", function (value) {
     var _value$value, _value$value2, _value$value3;
     if ((value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.length) === 0 && !(value !== null && value !== void 0 && value.other)) return null;
@@ -72,22 +68,30 @@ var BasicCheckbox = /*#__PURE__*/_createClass(function BasicCheckbox(options) {
       component: /*#__PURE__*/React.createElement(ApaasCheckbox, _this.componentConfig)
     });
   });
-  _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, _item$config2, _item$config2$options, _item$config3;
+    return {
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'MultipleSelect',
+      options: item !== null && item !== void 0 && (_item$config = item.config) !== null && _item$config !== void 0 && _item$config.showOther ? item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : (_item$config2$options = _item$config2.options) === null || _item$config2$options === void 0 ? void 0 : _item$config2$options.concat({
+        label: '其他',
+        value: '其他'
+      }) : (item === null || item === void 0 ? void 0 : (_item$config3 = item.config) === null || _item$config3 === void 0 ? void 0 : _item$config3.options) || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'checkbox')).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.isCombinationComponent = false;
+  this.children = [];
   this.componentConfig = options.componentConfig;
   this.rules = options !== null && options !== void 0 && (_options$componentCon = options.componentConfig) !== null && _options$componentCon !== void 0 && _options$componentCon.required ? [{
     validator: function validator(_, value) {

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 /**
  * 针对完成时间、创建时间、修改时间定义了3中类型
  */
@@ -8,12 +8,9 @@ declare class CommonDataTime implements ComponentInterface {
     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);
     getValue: (value: string) => string;
     render: (value: string) => JSX.Element | null;
@@ -21,10 +18,11 @@ declare class CommonDataTime implements ComponentInterface {
     renderPc: (value: any, record: Record) => JSX.Element;
     renderExport: (value: any, record: Record) => string;
     editRender: () => null;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => string;
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "Date";
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default CommonDataTime;

package/dist/esm/components/CommonDataTime/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 _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"); } }
@@ -10,7 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from 'react';
 import moment from 'moment';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 
 /**
  * 针对完成时间、创建时间、修改时间定义了3中类型
@@ -22,12 +20,9 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(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, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "getValue", function (value) {
     return moment(value).format('YYYY-MM-DD HH:mm:ss');
   });
@@ -57,23 +52,27 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
   _defineProperty(this, "editRender", function () {
     return null;
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Date',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var recordDateTime = _filterFn.filterTableListItemColumnValue(i, item.id, '');
+          return _filterFn.filterDateFn(value, recordDateTime);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = true;
-  this.canHidden = true;
-  this.showContains = false;
-  this.dataType = 'string';
   this.componentConfig = options.componentConfig;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default CommonDataTime;

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

@@ -0,0 +1,28 @@
+/// <reference types="react" />
+import { ComponentInterface, PickOption, Record, ColumnConfig } from '../../type';
+declare class CompletedUser implements ComponentInterface {
+    name: string;
+    id: string;
+    type: string;
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
+    constructor(options: PickOption);
+    renderPc: (value: string, record: Record) => JSX.Element;
+    renderExport: (value: any, record: Record) => any;
+    render: () => null;
+    renderClient: () => null;
+    editRender: () => null;
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: {
+            label: string;
+            value: string;
+        }[];
+        filterFn: (value: string) => (i: Record) => boolean;
+    };
+}
+export default CompletedUser;

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

@@ -0,0 +1,60 @@
+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 { filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+var CompletedUser = /*#__PURE__*/_createClass(function CompletedUser(options) {
+  var _this = this;
+  _classCallCheck(this, CompletedUser);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "renderPc", function (value, record) {
+    var _record;
+    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--');
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    var _record2;
+    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record2 !== void 0 ? _record2 : '--';
+  });
+  _defineProperty(this, "render", function () {
+    return null;
+  });
+  _defineProperty(this, "renderClient", function () {
+    return null;
+  });
+  _defineProperty(this, "editRender", function () {
+    return null;
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    var _this$effects;
+    return {
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'MultipleSelect',
+      options: ((_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.userList) || [],
+      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 = "completedUserName";
+  this.type = "COMPLETED_USER_INPUT";
+  this.effects = options.effects;
+  this.isCombinationComponent = false;
+  this.children = [];
+});
+export default CompletedUser;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare type Value = string | string[] | undefined;
 export declare const DateTime: ({ value, onChange, ...otherProps }: any) => JSX.Element;
 declare class BasicDataTime implements ComponentInterface {
@@ -7,12 +7,9 @@ declare class BasicDataTime implements ComponentInterface {
     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);
     getValue: (value: Value) => string | undefined;
     render: (value: Value) => JSX.Element;
@@ -20,10 +17,12 @@ declare class BasicDataTime implements ComponentInterface {
     renderPc: (value: any, record: Record) => JSX.Element;
     renderExport: (value: any, record: Record) => any;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => any;
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "Date";
+        options: any[];
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default BasicDataTime;