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

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

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

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

@@ -1,4 +1,6 @@
 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; }
@@ -11,7 +13,7 @@ import GetFormItem from "../GetFormItem";
 import { JstGoodImage } from "../Common";
 import { JstGoods } from '@kmkf-fe-packages/basic-components';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
   var _this = this,
     _this$componentConfig;
@@ -20,10 +22,13 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(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, "align", void 0);
-  _defineProperty(this, "isCombinationComponent", void 0);
-  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function (value) {
     //兼容多个商品
     return /*#__PURE__*/React.createElement(JstGoodImage, {
@@ -63,40 +68,22 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
       }))
     });
   });
-  _defineProperty(this, "filterConfig", function (item) {
-    return [{
-      id: "".concat(item.id, "_sendName"),
-      name: "jst\u53D1\u8D27\u4ED3\u540D\u79F0",
-      filterComponentType: 'Input',
-      filterFn: function filterFn(value) {
-        return function (i) {
-          var _ref;
-          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
-            var _String;
-            var name = item !== null && item !== void 0 && item.sendName ? (_String = String(item === null || item === void 0 ? void 0 : item.sendName)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
-            return name;
-          });
-        };
-      }
-    }, {
-      id: "".concat(item.id, "_sendId"),
-      name: "jst\u53D1\u8D27\u4ED3\u7F16\u7801",
-      filterComponentType: 'Input',
-      filterFn: function filterFn(value) {
-        return function (i) {
-          var _ref2;
-          return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
-            var _String2;
-            var id = item !== null && item !== void 0 && item.sendId ? (_String2 = String(item === null || item === void 0 ? void 0 : item.sendId)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
-            return id;
-          });
-        };
-      }
-    }];
+  _defineProperty(this, "getColumns", function () {
+    return _objectSpread(_objectSpread({}, _this), {}, {
+      dataIndex: _this.id,
+      title: _this.name,
+      renderExport: _this.renderExport
+    });
+    ;
   });
   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 = 'string';
   this.componentConfig = options.componentConfig;
   this.rules = (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
     required: true,
@@ -121,7 +108,5 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
     }
   }] : [];
   this.align = 'left';
-  this.isCombinationComponent = false;
-  this.children = [];
 });
 export default JstSendGood;

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

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

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

@@ -1,4 +1,6 @@
 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; }
@@ -11,7 +13,7 @@ import GetFormItem from "../GetFormItem";
 import { JstGoodImage } from "../Common";
 import { JstGoods } from '@kmkf-fe-packages/basic-components';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
   var _this = this,
     _this$componentConfig;
@@ -20,10 +22,13 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(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, "align", void 0);
-  _defineProperty(this, "isCombinationComponent", void 0);
-  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function (value) {
     //兼容多个商品
     return /*#__PURE__*/React.createElement(JstGoodImage, {
@@ -63,43 +68,23 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
       }))
     });
   });
-  _defineProperty(this, "filterConfig", function (item) {
-    return [{
-      id: "".concat(item.id, "_supplyName"),
-      name: "jst\u4F9B\u9500\u5546\u540D\u79F0",
-      filterComponentType: 'Input',
-      filterFn: function filterFn(value) {
-        return function (i) {
-          var _ref;
-          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
-            var _String;
-            var name = item !== null && item !== void 0 && item.supplyName ? (_String = String(item === null || item === void 0 ? void 0 : item.supplyName)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
-            return name;
-          });
-        };
-      }
-    }, {
-      id: "".concat(item.id, "_supplyId"),
-      name: "jst\u4F9B\u9500\u5546\u7F16\u7801",
-      filterComponentType: 'Input',
-      filterFn: function filterFn(value) {
-        return function (i) {
-          var _ref2;
-          return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
-            var _String2;
-            var id = item !== null && item !== void 0 && item.supplyId ? (_String2 = String(item === null || item === void 0 ? void 0 : item.supplyId)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
-            return id;
-          });
-        };
-      }
-    }];
+  _defineProperty(this, "getColumns", function () {
+    return _objectSpread(_objectSpread({}, _this), {}, {
+      dataIndex: _this.id,
+      title: _this.name,
+      renderExport: _this.renderExport
+    });
+    ;
   });
   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 = 'string';
   this.componentConfig = options.componentConfig;
-  this.isCombinationComponent = false;
-  this.children = [];
   this.rules = (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
     required: true,
     validator: function validator(_, value) {

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import { ComponentInterface, PickOption, DataType, Record } from '../../type';
 import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 import Express from '../Express';
 import ExpressCode from '../ExpressCode';
@@ -8,29 +8,39 @@ declare class Logistics implements ComponentInterface {
     id: string;
     type: string;
     rules: any[];
+    canFilter: boolean;
+    canGroup: boolean;
+    canHidden: boolean;
+    dataType: DataType;
+    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     expressDateInstance: ExpressData;
     express: Express;
     expressCode: ExpressCode;
-    isCombinationComponent: boolean;
-    children: ComponentInterface[];
     constructor(options: PickOption);
     render: () => null;
     editRender: (value: any) => JSX.Element;
     renderClient: (record: Record) => JSX.Element;
     renderPc: () => null;
     renderExport: () => null;
-    filterConfig: (item: ColumnConfig) => ({
-        id: string;
-        name: string;
-        filterComponentType: "MultipleSelect";
-        options: any[];
-        filterFn: (value: string) => (i: Record) => boolean;
-    } | {
-        id: string;
-        name: string;
-        filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => boolean;
-    })[];
+    getColumns: () => {
+        title: string;
+        children: ((Express & {
+            dataIndex: string;
+            title: string;
+            widget: JSX.Element;
+            groupFieldPath: string;
+            renderExport: (value: string, record: Record) => string | number;
+            render: (value: string, record: Record) => JSX.Element;
+        }) | (ExpressCode & {
+            dataIndex: string;
+            title: string;
+            groupFieldPath: string;
+            renderExport: (value: string, record: Record) => string;
+            render: (value: any, record: Record) => JSX.Element;
+        }))[];
+        canHidden: boolean;
+        dataIndex: string;
+    };
 }
 export default Logistics;

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

@@ -22,12 +22,15 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(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, "expressDateInstance", void 0);
   _defineProperty(this, "express", void 0);
   _defineProperty(this, "expressCode", void 0);
-  _defineProperty(this, "isCombinationComponent", void 0);
-  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function () {
     return null;
   });
@@ -53,16 +56,22 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "renderExport", function () {
     return null;
   });
-  _defineProperty(this, "filterConfig", function (item) {
-    return [_this.express.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
-      subKey: 'expressLogisticsCompany'
-    })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
-      subKey: 'expressLogisticsCode'
-    }))];
+  _defineProperty(this, "getColumns", function () {
+    return {
+      title: _this.name,
+      children: [_this.express.getColumns(), _this.expressCode.getColumns()],
+      canHidden: _this.canHidden,
+      dataIndex: _this.id
+    };
   });
   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 = 'string';
   this.componentConfig = options.componentConfig;
   this.expressDateInstance = ExpressData.getInstance();
   this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
@@ -73,8 +82,6 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
     name: '快递物流单号',
     id: "".concat(this.id, "_expressLogisticsCode")
   }));
-  this.isCombinationComponent = true;
-  this.children = [this.express, this.expressCode];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     validator: function validator(_, value) {
       var _this$componentConfig4;

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

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

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

@@ -1,4 +1,6 @@
 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; }
@@ -7,11 +9,10 @@ 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, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options) {
   var _this = this;
   _classCallCheck(this, BasicMultSelect);
@@ -19,9 +20,12 @@ 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, "isCombinationComponent", void 0);
-  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function (value) {
     return /*#__PURE__*/React.createElement("span", null, " ", value === null || value === void 0 ? void 0 : value.join(','));
   });
@@ -58,28 +62,23 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
       }))
     });
   });
-  _defineProperty(this, "filterConfig", function (item) {
-    var _item$config;
-    return {
-      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;
-        };
-      }
-    };
+  _defineProperty(this, "getColumns", function () {
+    return _objectSpread(_objectSpread({}, _this), {}, {
+      dataIndex: _this.id,
+      title: _this.name,
+      renderExport: _this.renderExport
+    });
+    ;
   });
   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,27 +1,40 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
+import { ComponentInterface, PickOption, DataType, ALignType } 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;
     renderExport: (value: any) => any;
     editRender: () => JSX.Element;
-    filterConfig: (item: ColumnConfig) => {
-        id: string;
-        name: string;
-        filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => boolean;
+    getColumns: () => {
+        title: string;
+        align: ALignType;
+        dataIndex: string;
+        dataType: DataType;
+        canHidden: boolean;
+        canFilter: boolean;
+        canGroup: boolean;
+        type: string;
+        render: (value: any) => any;
+        renderPc: (value: any) => any;
+        componentType: () => JSX.Element;
+        showContains: boolean;
+        renderExport: (value: any) => any;
+        width: number;
     };
 }
 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, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var OrdinaryHeader = /*#__PURE__*/_createClass(function OrdinaryHeader(options) {
   var _this = this;
   _classCallCheck(this, OrdinaryHeader);
@@ -18,12 +18,15 @@ 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, "isCombinationComponent", void 0);
-  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function (value) {
     return /*#__PURE__*/React.createElement("span", null, value);
   });
@@ -56,27 +59,36 @@ var OrdinaryHeader = /*#__PURE__*/_createClass(function OrdinaryHeader(options)
       }))
     });
   });
-  _defineProperty(this, "filterConfig", function (item) {
+  _defineProperty(this, "getColumns", function () {
     return {
-      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);
-        };
-      }
+      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
     };
   });
   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;