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

package/dist/esm/components/ReceiverMobile/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 { 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 { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options) {
   var _this = this;
   _classCallCheck(this, ReceiverMobile);
@@ -20,21 +18,15 @@ var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(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, record) {
-    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], record)
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -44,11 +36,18 @@ var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options)
     return /*#__PURE__*/React.createElement("span", {
       className: "pointer",
       onClick: function onClick() {
-        var _this$effects;
-        return _this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail(record);
+        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));
       }
     }, record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_receiveMobile")]);
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_receiveMobile")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_receiveMobile")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     return record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_receiveMobile")];
   });
@@ -67,25 +66,28 @@ var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options)
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      componentType: _this.editRender,
-      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, 'receiveMobile')).includes(value);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.dataType = 'string';
-  this.showContains = true;
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.effects = options.effects;
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default ReceiverMobile;

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

@@ -1,28 +1,27 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare class ReceiverName 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: string, record: any) => JSX.Element;
     renderClient: (record: any) => 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;
-        componentType: () => JSX.Element;
-        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 ReceiverName;

package/dist/esm/components/ReceiverName/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 { 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 { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
   var _this = this;
   _classCallCheck(this, ReceiverName);
@@ -20,21 +18,15 @@ var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(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, record) {
-    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], record)
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -44,11 +36,18 @@ var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
     return /*#__PURE__*/React.createElement("span", {
       className: "pointer",
       onClick: function onClick() {
-        var _this$effects;
-        return _this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail(record);
+        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));
       }
     }, record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_receiveName")]);
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_receiveName")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_receiveName")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     return record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_receiveName")];
   });
@@ -64,25 +63,28 @@ var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      componentType: _this.editRender,
-      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, 'receiveName')).includes(value);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.dataType = 'string';
-  this.showContains = true;
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.effects = options.effects;
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default ReceiverName;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 declare type Value = {
     flag?: number | string;
     remark?: string;
@@ -9,25 +9,28 @@ declare class ERemark implements ComponentInterface {
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     imgList: any[];
     flagColors: string[];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
     render: (value: Value) => JSX.Element;
     renderClient: (record: Record) => JSX.Element | null;
     renderPc: (value: unknown, record: Record) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => {
+        remark: any;
+        flag: any;
+    };
     renderExport: (value: unknown, record: Record) => any;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        componentType: () => JSX.Element;
-        renderExport: (value: unknown, record: Record) => any;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default ERemark;

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

@@ -1,6 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -18,7 +16,7 @@ import trade4 from "./flag/trade-icon-flag-4.png";
 import trade5 from "./flag/trade-icon-flag-5.png";
 import get from 'lodash/get';
 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 ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   var _this = this,
     _this$componentConfig3;
@@ -27,14 +25,11 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(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, "imgList", void 0);
   _defineProperty(this, "flagColors", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function (value) {
     var index = get(value, 'flag');
     return /*#__PURE__*/React.createElement("div", {
@@ -60,10 +55,20 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       style: {
         display: 'inline-block'
       }
-    }, get(record, "".concat(_this.id, "_flag")) + '' ? /*#__PURE__*/React.createElement("i", {
-      className: "dz-iconfont dz-beizhu_qizhi f-lt ft_12 mr_5 ".concat(_this.flagColors[get(record, "".concat(_this.id, "_flag"))])
+    }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? /*#__PURE__*/React.createElement("i", {
+      className: "dz-iconfont dz-beizhu_qizhi f-lt ft_12 mr_5 ".concat(_this.flagColors[Number(get(record, "".concat(_this.id, "_flag")))])
     }) : null, /*#__PURE__*/React.createElement("span", null, get(record, "".concat(_this.id, "_remark"))));
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_flag")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_remark")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      remark: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_remark")],
+      flag: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_flag")]
+    };
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     return get(record, "".concat(_this.id, "_remark"));
   });
@@ -77,23 +82,24 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       component: /*#__PURE__*/React.createElement(Remark, _this.componentConfig)
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      componentType: _this.editRender,
-      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, 'remark')).includes(value);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = false;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.dataType = 'string';
-  this.showContains = false;
   this.componentConfig = options.componentConfig;
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     validator: function validator(_, value) {
@@ -109,5 +115,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   }] : [];
   this.imgList = [trade0, trade1, trade2, trade3, trade4, trade5];
   this.flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default ERemark;

package/dist/esm/components/ReturnLogistics/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 { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 import Express from '../Express';
 import ExpressCode from '../ExpressCode';
@@ -14,33 +14,34 @@ declare class ReturnLogistics implements ComponentInterface {
     dataType: DataType;
     showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
-    expressDateInstance: ExpressData;
+    expressDateInstance: InstanceType<typeof ExpressData>;
     express: Express;
     expressCode: ExpressCode;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: () => null;
-    renderClient: (record: any) => JSX.Element;
+    renderClient: (record: any) => React.JSX.Element;
     renderPc: () => null;
-    renderExport: () => null;
-    editRender: (value: any) => JSX.Element;
-    getColumns: () => {
-        title: string;
-        children: ((Express & {
-            dataIndex: string;
-            title: string;
-            widget: JSX.Element;
-            groupFieldPath: string;
-            renderExport: (value: string, record: import("../../type").Record) => string | number;
-            render: (value: string, record: import("../../type").Record) => JSX.Element;
-        }) | (ExpressCode & {
-            dataIndex: string;
-            title: string;
-            groupFieldPath: string;
-            renderExport: (value: string, record: import("../../type").Record) => string;
-            render: (value: any, record: import("../../type").Record) => JSX.Element;
-        }))[];
-        canHidden: boolean;
-        dataIndex: string;
+    renderLog: (r: Record) => React.JSX.Element;
+    getComponentValue: (r: Record) => {
+        company: any;
+        order: any;
     };
+    renderExport: () => null;
+    editRender: (value: any) => React.JSX.Element;
+    filterConfig: (item: ColumnConfig) => ({
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[];
+        filterFn: (value: string) => (i: Record) => boolean;
+    } | {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    })[];
 }
 export default ReturnLogistics;

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

@@ -31,15 +31,23 @@ var ReturnLogistics = /*#__PURE__*/_createClass(function ReturnLogistics(options
   _defineProperty(this, "expressDateInstance", void 0);
   _defineProperty(this, "express", void 0);
   _defineProperty(this, "expressCode", void 0);
-  _defineProperty(this, "render", function () {
-    return null;
-  });
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "renderClient", function (record) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record));
   });
   _defineProperty(this, "renderPc", function () {
     return null;
   });
+  _defineProperty(this, "renderLog", function (r) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, _this.express.name, ": ", _this.express.renderLog(r)), /*#__PURE__*/React.createElement("div", null, _this.expressCode.name, ": ", _this.expressCode.renderLog(r)));
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      company: _this.express.getComponentValue(r),
+      order: _this.expressCode.getComponentValue(r)
+    };
+  });
   _defineProperty(this, "renderExport", function () {
     return null;
   });
@@ -56,13 +64,12 @@ var ReturnLogistics = /*#__PURE__*/_createClass(function ReturnLogistics(options
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return {
-      title: _this.name,
-      children: [_this.express.getColumns(), _this.expressCode.getColumns()],
-      canHidden: _this.canHidden,
-      dataIndex: _this.id
-    };
+  _defineProperty(this, "filterConfig", function (item) {
+    return [_this.express.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: 'returnLogisticsCompany'
+    })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: 'returnLogisticsCode'
+    }))];
   });
   this.name = options.name;
   this.id = options.id;
@@ -82,6 +89,8 @@ var ReturnLogistics = /*#__PURE__*/_createClass(function ReturnLogistics(options
     name: '退货物流单号',
     id: "".concat(options.id, "_returnLogisticsCode")
   }));
+  this.isCombinationComponent = true;
+  this.children = [this.express, this.expressCode];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     validator: function validator(_, value) {
       var _this$componentConfig4;

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

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

package/dist/esm/components/Select/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 { ApaasSelect } 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 BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
   var _this = this;
   _classCallCheck(this, BasicSelect);
@@ -20,15 +18,9 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(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, "editRender", function () {
     var _this$componentConfig, _this$componentConfig2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
@@ -53,27 +45,40 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
     var _record;
     return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_select")]) !== null && _record !== void 0 ? _record : '--');
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_select")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_select")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_select")]) !== null && _record2 !== void 0 ? _record2 : '--';
   });
-  _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 {
+      type: item.type,
+      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 value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, 'select'));
+        };
+      } // 第一个为选中值，第二个参数为表格行记录值
+    };
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = true;
-  this.canHidden = true;
-  this.showContains = false;
-  this.dataType = 'string';
   this.componentConfig = options.componentConfig;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default BasicSelect;