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

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

@@ -0,0 +1,89 @@
+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 { ApaasInput } from '@kmkf-fe-packages/basic-components';
+import GetFormItem from "../GetFormItem";
+import ItemView from "../../commonComponents/ItemView";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
+var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
+  var _this = this;
+  _classCallCheck(this, PaymentTid);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "rules", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "align", void 0);
+  _defineProperty(this, "width", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "originId", void 0);
+  _defineProperty(this, "addressDateInstance", void 0);
+  _defineProperty(this, "render", function (value, record) {
+    var _ref;
+    var address = JSON.parse(record["".concat(_this.id, "_interceptAddress")] || '[]');
+    var detail = record["".concat(_this.id, "_interceptDetail")];
+    var name = record["".concat(_this.originId, "_interceptReceiverName")];
+    var mobile = record["".concat(_this.originId, "_interceptReceiverMobile")];
+    var addressText = (_ref = address || []) === null || _ref === void 0 ? void 0 : _ref.map(function (suffix) {
+      return _this.addressDateInstance.getNameByCode(suffix);
+    }).join('');
+    var hasValue = addressText || detail || name || mobile;
+    return hasValue ? /*#__PURE__*/React.createElement("div", null, [addressText, detail].join('/'), /*#__PURE__*/React.createElement("br", null), [name, mobile].join('/')) : null;
+  });
+  _defineProperty(this, "renderClient", function (record) {
+    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
+    }) : null;
+  });
+  _defineProperty(this, "renderPc", function (value, record) {
+    if (value === undefined) {
+      return /*#__PURE__*/React.createElement("span", null, "--");
+    }
+    return /*#__PURE__*/React.createElement("span", {
+      className: "pointer",
+      onClick: function onClick() {
+        var _this$effects, _this$effects2;
+        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.queryWorkOrderDetail(record));
+      }
+    }, value);
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    return value !== null && value !== void 0 ? value : '--';
+  });
+  _defineProperty(this, "editRender", function () {
+    var _this$componentConfig, _this$componentConfig2;
+    return /*#__PURE__*/React.createElement(GetFormItem, {
+      title: _this.name,
+      name: _this.id,
+      rules: _this.rules,
+      required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
+      component: /*#__PURE__*/React.createElement(ApaasInput, _this.componentConfig)
+    });
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return [];
+  });
+  this.name = '新派送地';
+  this.id = "".concat(options.id, "_interceptAddress");
+  this.type = options.type;
+  this.componentConfig = options.componentConfig;
+  this.rules = [];
+  this.align = 'left';
+  this.width = 200;
+  this.originId = options.id;
+  this.isCombinationComponent = false;
+  this.children = [];
+  this.effects = options === null || options === void 0 ? void 0 : options.effects;
+  this.addressDateInstance = AddressData.getInstance();
+});
+export default PaymentTid;

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

@@ -0,0 +1,23 @@
+/// <reference types="react" />
+import { ComponentInterface, PickOption, ColumnConfig } from '../../type';
+import InterceptAddress from './InterceptAddress';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+declare class Logistics implements ComponentInterface {
+    name: string;
+    id: string;
+    type: string;
+    rules: any[];
+    componentConfig: ComponentInterface["componentConfig"];
+    interceptAddress: InterceptAddress;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
+    expressDateInstance: ExpressData;
+    constructor(options: PickOption);
+    render: () => null;
+    renderClient: (record: any) => JSX.Element;
+    renderPc: () => null;
+    renderExport: () => null;
+    editRender: (value: any) => JSX.Element;
+    filterConfig: (item: ColumnConfig) => never[];
+}
+export default Logistics;

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

@@ -0,0 +1,76 @@
+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 { LogisticsInterception } from '@kmkf-fe-packages/basic-components';
+import GetFormItem from "../GetFormItem";
+import InterceptAddress from "./InterceptAddress";
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
+  var _this = this;
+  _classCallCheck(this, Logistics);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "rules", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "interceptAddress", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "expressDateInstance", void 0);
+  _defineProperty(this, "render", function () {
+    return null;
+  });
+  _defineProperty(this, "renderClient", function (record) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptAddress.renderClient(record));
+  });
+  _defineProperty(this, "renderPc", function () {
+    return null;
+  });
+  _defineProperty(this, "renderExport", function () {
+    return null;
+  });
+  _defineProperty(this, "editRender", function (value) {
+    var _this$componentConfig, _this$componentConfig2;
+    return /*#__PURE__*/React.createElement(GetFormItem, {
+      title: _this.name,
+      name: _this.id,
+      rules: _this.rules,
+      required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
+      component: /*#__PURE__*/React.createElement(LogisticsInterception, _this.componentConfig)
+    });
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return [];
+  });
+  this.name = options.name;
+  this.id = options.id;
+  this.type = options.type;
+  this.componentConfig = options.componentConfig;
+  this.interceptAddress = new InterceptAddress(options);
+  this.expressDateInstance = ExpressData.getInstance();
+  this.isCombinationComponent = true;
+  this.children = [this.interceptAddress];
+  this.rules = [{
+    validator: function validator(_, value) {
+      var _this$componentConfig3, _this$componentConfig4, _value$interceptAddre;
+      if ((_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required && (!(value !== null && value !== void 0 && value.interceptCompany) || !value.interceptCode)) {
+        return Promise.reject(new Error('请填写物流信息'));
+      }
+      if ((_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required && !(value !== null && value !== void 0 && value.interceptType)) {
+        return Promise.reject(new Error('请选择拦截类型'));
+      }
+      var showAddress = _this.expressDateInstance.isShowNewAddress(value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptType);
+      console.log(showAddress);
+      if (showAddress && (!(value !== null && value !== void 0 && (_value$interceptAddre = value.interceptAddress) !== null && _value$interceptAddre !== void 0 && _value$interceptAddre.length) || !(value !== null && value !== void 0 && value.interceptDetail) || !(value !== null && value !== void 0 && value.interceptReceiverName) || !(value !== null && value !== void 0 && value.interceptReceiverMobile))) {
+        return Promise.reject(new Error('请填写新派送地'));
+      }
+      return Promise.resolve();
+    }
+  }];
+});
+export default Logistics;

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

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

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

@@ -1,6 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -9,10 +7,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from 'react';
+import intersection from 'lodash/intersection';
 import { ApaasMultipleSelect } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options) {
   var _this = this;
   _classCallCheck(this, BasicMultSelect);
@@ -20,12 +19,9 @@ 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(','));
   });
@@ -62,23 +58,28 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _defineProperty(this, "filterConfig", function (item) {
+    var _item$config;
+    return {
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'MultipleSelect',
+      options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'basicMultSelect')).length > 0;
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = false;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.showContains = false;
-  this.dataType = 'array';
   this.componentConfig = options.componentConfig;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default BasicMultSelect;

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

@@ -1,40 +1,27 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
 declare class OrdinaryHeader implements ComponentInterface {
     name: string;
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     effects: ComponentInterface["effects"];
     align: ALignType;
     width: number;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
     render: (value: string) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any) => any;
     renderExport: (value: any) => any;
     editRender: () => JSX.Element;
-    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;
+    filterConfig: (item: ColumnConfig) => {
+        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,15 +18,12 @@ 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);
   });
@@ -59,36 +56,27 @@ 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
+      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,27 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
 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;
     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;
-        type: string;
-        render: (value: any) => any;
-        renderPc: (value: any) => any;
-        componentType: () => JSX.Element;
-        showContains: boolean;
-        renderExport: (value: any) => any;
-        width: number;
+    filterConfig: (item: ColumnConfig) => {
+        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,15 +17,12 @@ 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, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function (value) {
     return /*#__PURE__*/React.createElement("span", null, value);
   });
@@ -52,32 +49,21 @@ 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
+      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 +76,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';
 declare class OrdinarySerial implements ComponentInterface {
     name: string;
     id: string;
@@ -14,27 +14,19 @@ 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;
     renderExport: (value: any) => any;
     editRender: () => JSX.Element;
-    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;
+    filterConfig: (item: ColumnConfig) => {
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default OrdinarySerial;