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

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

@@ -1,26 +1,26 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare class BasicInput 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: string) => JSX.Element;
     renderPc: (value: any, record: Record) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
     renderClient: (record: Record) => JSX.Element | null;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => any;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default BasicInput;

package/dist/esm/components/TextArea/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; }
@@ -12,7 +10,7 @@ import React from 'react';
 import { ApaasTextArea } 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 BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   var _this = this;
   _classCallCheck(this, BasicInput);
@@ -20,19 +18,20 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
-  _defineProperty(this, "canFilter", void 0);
-  _defineProperty(this, "canGroup", void 0);
-  _defineProperty(this, "canHidden", void 0);
-  _defineProperty(this, "dataType", void 0);
-  _defineProperty(this, "showContains", void 0);
   _defineProperty(this, "componentConfig", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, value);
-  });
+  _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, "_textarea")]) !== null && _record !== void 0 ? _record : '--');
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_textarea")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_textarea")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_textarea")]) !== null && _record2 !== void 0 ? _record2 : '--';
@@ -41,7 +40,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(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 () {
@@ -56,23 +55,27 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, 'textarea')).includes(value);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = true;
-  this.canHidden = true;
-  this.showContains = true;
-  this.dataType = 'string';
   this.componentConfig = options.componentConfig;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default BasicInput;

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

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

package/dist/esm/components/ThirdItemSelect/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; }
@@ -13,7 +11,7 @@ import GetFormItem from "../GetFormItem";
 import ItemEncode from "./ItemEncode";
 import { GoodImage } from "../Common";
 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 ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options) {
   var _this = this,
     _this$componentConfig2;
@@ -22,25 +20,18 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(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, "render", function (value) {
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement(GoodImage, {
-      list: value,
-      type: "itemThird"
-    });
-  });
+  _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: /*#__PURE__*/React.createElement(GoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: "itemThird"
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -54,6 +45,13 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
       type: "itemThird"
     });
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_itemList")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_itemList")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _ref;
     return (_ref = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_itemList")]) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
@@ -76,24 +74,34 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref2;
+          return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, 'itemList') || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
+            var _String, _String2;
+            var id = item !== null && item !== void 0 && item.itemId ? (_String = String(item === null || item === void 0 ? void 0 : item.itemId)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
+            var name = item !== null && item !== void 0 && item.supplierName ? (_String2 = String(item === null || item === void 0 ? void 0 : item.supplierName)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
+            return id || name;
+          });
+        };
+      }
+    };
   });
   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.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
+  this.isCombinationComponent = false;
+  this.children = [];
   this.rules = (_this$componentConfig2 = this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.required ? [{
     required: true,
     validator: function validator(_, value) {

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, DataType, Record, ColumnConfig } from '../../type';
 declare type Value = string | string[] | undefined;
 declare class BasicDataTime implements ComponentInterface {
     name: string;
@@ -12,16 +12,24 @@ declare class BasicDataTime implements ComponentInterface {
     dataType: DataType;
     showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
+    dataMap: Record;
     constructor(options: PickOption);
     render: (value: Value) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: unknown, record: Record) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: unknown, record: Record) => any;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: unknown, record: Record) => any;
+    getKeyByComponentType: (type: string) => "tradeCreateDateTime" | "tradePaymentDateTime" | "tradeDeliveryDateTime" | "tradeClosingDateTime" | undefined;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Date";
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default BasicDataTime;

package/dist/esm/components/TradeDateTime/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; }
@@ -12,7 +10,7 @@ import React from 'react';
 import { DateTime } from "../DataTime";
 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 BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   var _this = this;
   _classCallCheck(this, BasicDataTime);
@@ -26,6 +24,9 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   _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, "dataMap", void 0);
   _defineProperty(this, "render", function (value) {
     return /*#__PURE__*/React.createElement("span", null, Array.isArray(value) ? value.join('~') : /*#__PURE__*/React.createElement("span", null, value));
   });
@@ -39,13 +40,16 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
     var type = _this.type;
-    var map = {
-      TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
-      TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
-      TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
-      TRADE_CLOSING_DATETIME: 'tradeClosingDateTime'
-    };
-    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(map[type])]) !== null && _record !== void 0 ? _record : '--');
+    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(_this.dataMap[type])]) !== null && _record !== void 0 ? _record : '--');
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    var type = _this.type;
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(_this.dataMap[type])])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    var type = _this.type;
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(_this.dataMap[type])];
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
@@ -70,13 +74,36 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _defineProperty(this, "getKeyByComponentType", function (type) {
+    if (type === 'TRADE_CLOSING_DATETIME') {
+      return 'tradeClosingDateTime';
+    }
+    if (type === 'TRADE_CREATE_DATETIME') {
+      return 'tradeCreateDateTime';
+    }
+    if (type === 'TRADE_PAYMENT_DATETIME') {
+      return 'tradePaymentDateTime';
+    }
+    if (type === 'TRADE_DELIVERY_DATETIME') {
+      return 'tradeDeliveryDateTime';
+    }
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Date',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var key = _this.getKeyByComponentType(item.type);
+          var recordDateTime = _filterFn.filterTableListItemColumnValue(i, item.id, key);
+          return _filterFn.filterDateFn(value, recordDateTime);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
@@ -88,5 +115,13 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   this.dataType = 'date';
   this.componentConfig = options.componentConfig;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
+  this.dataMap = {
+    TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
+    TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
+    TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
+    TRADE_CLOSING_DATETIME: 'tradeClosingDateTime'
+  };
 });
 export default BasicDataTime;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, DataType, Record, ColumnConfig } from '../../type';
 declare class ETradeId implements ComponentInterface {
     name: string;
     id: string;
@@ -13,16 +13,21 @@ declare class ETradeId implements ComponentInterface {
     onlyContainsString: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     effects: ComponentInterface["effects"];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: unknown, record: Record) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: unknown, record: Record) => any;
     editRender: (value: any) => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        componentType: (value: any) => JSX.Element;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default ETradeId;

package/dist/esm/components/TradeId/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; }
@@ -12,7 +10,7 @@ import React from 'react';
 import { TradeId } 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 ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   var _this = this;
   _classCallCheck(this, ETradeId);
@@ -28,20 +26,26 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   _defineProperty(this, "onlyContainsString", void 0);
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "effects", 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, record) {
     var _record;
     return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")]) !== null && _record !== void 0 ? _record : '--');
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_tradeId")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_tradeId")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")]) !== null && _record2 !== void 0 ? _record2 : '--';
@@ -65,13 +69,20 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      componentType: _this.editRender
-    });
-    ;
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'tradeId'), value);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
@@ -85,5 +96,7 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   this.componentConfig = options.componentConfig;
   this.effects = options.effects;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default ETradeId;

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

@@ -1,29 +1,28 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare class WorkOrderId 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"];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
     copyHandle: (text: string) => void;
     renderPc: (value: any, record: any) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: any) => any;
-    render: () => null;
     renderClient: () => null;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        componentType: () => JSX.Element;
-        renderExport: (value: any, record: any) => any;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default WorkOrderId;