@kmkf-fe-packages/services-components 0.6.3 → 0.7.0

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';
+import React from 'react';
 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;
+    renderClient: (record: any) => React.JSX.Element | null;
+    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;
+    editRender: () => React.JSX.Element;
+    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;

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

@@ -1,40 +1,29 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
+import React from 'react';
 declare class OrdinaryMoney 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;
-    renderPc: (value: any) => any;
+    renderPc: (value: unknown, r: Record) => any;
+    renderLog: (r: Record) => any;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any) => any;
-    renderClient: (record: any) => JSX.Element | null;
-    editRender: () => JSX.Element;
-    getColumns: () => {
-        title: string;
-        align: ALignType;
-        dataIndex: string;
-        dataType: DataType;
-        canHidden: boolean;
-        canFilter: boolean;
-        canGroup: boolean;
+    renderClient: (record: any) => React.JSX.Element | null;
+    editRender: () => React.JSX.Element;
+    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 OrdinaryMoney;

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

@@ -9,7 +9,7 @@ import React from 'react';
 import GetFormItem from "../GetFormItem";
 import { ApaasInput } from '@kmkf-fe-packages/basic-components';
 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 OrdinaryMoney = /*#__PURE__*/_createClass(function OrdinaryMoney(options) {
   var _this = this;
   _classCallCheck(this, OrdinaryMoney);
@@ -17,20 +17,22 @@ var OrdinaryMoney = /*#__PURE__*/_createClass(function OrdinaryMoney(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, "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, "renderPc", function (value) {
-    return value !== null && value !== void 0 ? value : '--';
+  _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 : '--';
@@ -39,7 +41,7 @@ var OrdinaryMoney = /*#__PURE__*/_createClass(function OrdinaryMoney(options) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
     }) : null;
   });
   _defineProperty(this, "editRender", function () {
@@ -52,32 +54,22 @@ var OrdinaryMoney = /*#__PURE__*/_createClass(function OrdinaryMoney(options) {
       component: /*#__PURE__*/React.createElement(ApaasInput, _this.componentConfig)
     });
   });
-  _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, "_ordinaryTaitou"),
+      name: "".concat(item.name, "-\u53D1\u7968\u62AC\u5934"),
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, 'ordinaryTaitou')).includes(value);
+        };
+      }
     };
   });
   this.name = '开票金额';
   this.id = "".concat(options.id, "_ordinaryMoney");
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = true;
-  this.canHidden = false;
-  this.showContains = false;
-  this.dataType = 'number';
   this.componentConfig = options.componentConfig;
   this.rules = [{
     validator: function validator(_, value) {
@@ -90,5 +82,7 @@ var OrdinaryMoney = /*#__PURE__*/_createClass(function OrdinaryMoney(options) {
   this.align = 'left';
   this.effects = options.effects;
   this.width = 200;
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default OrdinaryMoney;

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType } from '../../type';
+import { ComponentInterface, PickOption, DataType, ALignType, Record, ColumnConfig } from '../../type';
+import React from 'react';
 declare class OrdinarySerial implements ComponentInterface {
     name: string;
     id: string;
@@ -14,27 +14,21 @@ declare class OrdinarySerial implements ComponentInterface {
     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;
+    renderClient: (record: any) => React.JSX.Element | null;
+    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;
+    editRender: () => React.JSX.Element;
+    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 OrdinarySerial;

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

@@ -9,7 +9,7 @@ import React from 'react';
 import GetFormItem from "../GetFormItem";
 import { ApaasInput } from '@kmkf-fe-packages/basic-components';
 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 OrdinarySerial = /*#__PURE__*/_createClass(function OrdinarySerial(options) {
   var _this = this;
   _classCallCheck(this, OrdinarySerial);
@@ -26,18 +26,25 @@ var OrdinarySerial = /*#__PURE__*/_createClass(function OrdinarySerial(options)
   _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 : '--';
@@ -52,22 +59,17 @@ var OrdinarySerial = /*#__PURE__*/_createClass(function OrdinarySerial(options)
       component: /*#__PURE__*/React.createElement(ApaasInput, _this.componentConfig)
     });
   });
-  _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, "_ordinarySerial"),
+      name: "".concat(item.name, "-\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7"),
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, 'ordinarySerial')).includes(value);
+        };
+      }
     };
   });
   this.name = '纳税人识别号';
@@ -83,5 +85,7 @@ var OrdinarySerial = /*#__PURE__*/_createClass(function OrdinarySerial(options)
   this.align = 'left';
   this.effects = options.effects;
   this.width = 200;
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default OrdinarySerial;

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType } from '../../type';
+import { ComponentInterface, PickOption, DataType, Record, ColumnConfig } from '../../type';
+import React from 'react';
 import OrdinaryHeader from './OrdinaryHeader';
 import OrdinaryMoney from './OrdinaryMoney';
 import OrdinarySerial from './OrdinarySerial';
@@ -17,32 +17,25 @@ declare class Ordinary implements ComponentInterface {
     ordinaryMoney: OrdinaryMoney;
     ordinaryHeader: OrdinaryHeader;
     ordinarySerial: OrdinarySerial;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: () => null;
-    editRender: (value: any) => JSX.Element;
+    editRender: () => React.JSX.Element;
     renderPc: () => null;
-    renderExport: () => null;
-    renderClient: (record: any) => JSX.Element;
-    getColumns: () => {
-        title: string;
-        children: {
-            title: string;
-            align: import("../../type").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;
-        }[];
-        canHidden: boolean;
-        dataIndex: string;
+    renderLog: (r: Record) => React.JSX.Element;
+    getComponentValue: (r: Record) => {
+        ordinaryMoney: any;
+        ordinarySerial: any;
+        ordinaryTaitou: any;
     };
+    renderExport: () => null;
+    renderClient: (record: any) => React.JSX.Element;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    }[];
 }
 export default Ordinary;

package/dist/esm/components/Ordinary/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 _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"); } }
@@ -28,10 +30,9 @@ var Ordinary = /*#__PURE__*/_createClass(function Ordinary(options) {
   _defineProperty(this, "ordinaryMoney", void 0);
   _defineProperty(this, "ordinaryHeader", void 0);
   _defineProperty(this, "ordinarySerial", void 0);
-  _defineProperty(this, "render", function () {
-    return null;
-  });
-  _defineProperty(this, "editRender", function (value) {
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "editRender", function () {
     var _this$componentConfig, _this$componentConfig2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
@@ -44,19 +45,24 @@ var Ordinary = /*#__PURE__*/_createClass(function Ordinary(options) {
   _defineProperty(this, "renderPc", function () {
     return null;
   });
+  _defineProperty(this, "renderLog", function (r) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, _this.ordinaryHeader.name, ": ", _this.ordinaryHeader.renderLog(r)), /*#__PURE__*/React.createElement("div", null, _this.ordinaryMoney.name, ": ", _this.ordinaryMoney.renderLog(r)), /*#__PURE__*/React.createElement("div", null, _this.ordinarySerial.name, ": ", _this.ordinarySerial.renderLog(r)));
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      ordinaryMoney: _this.ordinaryMoney.getComponentValue(r),
+      ordinarySerial: _this.ordinarySerial.getComponentValue(r),
+      ordinaryTaitou: _this.ordinaryHeader.getComponentValue(r)
+    };
+  });
   _defineProperty(this, "renderExport", function () {
     return null;
   });
   _defineProperty(this, "renderClient", function (record) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.ordinaryMoney.renderClient(record), _this.ordinaryHeader.renderClient(record), _this.ordinarySerial.renderClient(record));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.ordinaryHeader.renderClient(record), _this.ordinaryMoney.renderClient(record), _this.ordinarySerial.renderClient(record));
   });
-  _defineProperty(this, "getColumns", function () {
-    return {
-      title: _this.name,
-      children: [_this.ordinaryMoney.getColumns(), _this.ordinaryHeader.getColumns(), _this.ordinarySerial.getColumns()],
-      canHidden: _this.canHidden,
-      dataIndex: _this.id
-    };
+  _defineProperty(this, "filterConfig", function (item) {
+    return [_this.ordinaryMoney.filterConfig(_objectSpread({}, item)), _this.ordinaryHeader.filterConfig(_objectSpread({}, item)), _this.ordinarySerial.filterConfig(_objectSpread({}, item))];
   });
   this.name = options.name;
   this.id = options.id;
@@ -70,6 +76,8 @@ var Ordinary = /*#__PURE__*/_createClass(function Ordinary(options) {
   this.ordinaryMoney = new OrdinaryMoney(options);
   this.ordinaryHeader = new OrdinaryHeader(options);
   this.ordinarySerial = new OrdinarySerial(options);
+  this.isCombinationComponent = true;
+  this.children = [this.ordinaryHeader, this.ordinaryMoney, this.ordinarySerial];
   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.ordinaryMoney)) {

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

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import React from 'react';
 declare const OrdinaryHeaderWrap: (props: JSX.IntrinsicAttributes & {
     value?: any;
     onChange?: any;
     handleChangeSerial: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default OrdinaryHeaderWrap;

package/dist/esm/components/Payment/AlipayNick.d.ts

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