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

package/dist/esm/components/BuyerNick/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; }
@@ -8,30 +6,25 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 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 { BuyerNick } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { BuyerNick } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import PlatBuyer from "../../commonComponents/PlatBuyer";
-import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var EBuyerNick = /*#__PURE__*/_createClass(function EBuyerNick(options) {
   var _this = this,
-    _this$componentConfig3;
+    _this$componentConfig3,
+    _this$componentConfig4;
   _classCallCheck(this, EBuyerNick);
   _defineProperty(this, "name", void 0);
   _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("span", null, value === null || value === void 0 ? void 0 : value.buyerNick);
-  });
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "renderClient", function (record) {
     var _record$_this$id;
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -54,6 +47,16 @@ var EBuyerNick = /*#__PURE__*/_createClass(function EBuyerNick(options) {
       shopList: (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopList) || []
     }));
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_buyerOpenUid")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_buyerNick")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      buyerNick: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_buyerNick")],
+      buyerOpenUid: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_buyerOpenUid")]
+    };
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     return record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_buyerNick")];
   });
@@ -71,26 +74,36 @@ var EBuyerNick = /*#__PURE__*/_createClass(function EBuyerNick(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport,
-      customizeFilter: function customizeFilter(value) {
-        return value === null || value === void 0 ? void 0 : value.buyerNick;
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      type: item.type,
+      id: "".concat(item.id, "_buyerNick"),
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, 'buyerNick')).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 = false;
-  this.componentConfig = options.componentConfig;
+  this.isCombinationComponent = false;
+  this.children = [];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
+    validator: function validator(_, value) {
+      if (!(value !== null && value !== void 0 && value.buyerNick)) {
+        return Promise.reject(new Error('请输入买家昵称'));
+      }
+      return Promise.resolve();
+    }
+  }] : [];
+  this.componentConfig = options.componentConfig;
+  this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
     validator: function validator(_, value) {
       if (!(value !== null && value !== void 0 && value.buyerNick)) {
         return Promise.reject(new Error("请输入买家昵称"));

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

@@ -1,45 +1,33 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType, Record } from '../../type';
-import { FormInstance } from 'antd';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class BasicCascader 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);
-    width?: number | undefined;
-    align?: ALignType | undefined;
-    dataIndex?: string | undefined;
-    editable?: boolean | undefined;
-    formItemIndex?: number | undefined;
-    effects?: {
-        queryWorkOrderDetail: (r: any) => void;
-        isEditing: boolean;
-        form: FormInstance<any>;
-        shopList?: any[] | undefined;
-        shopId?: string | undefined;
-    } | undefined;
     /**
      * 通过值计算展示内容
      * @param value
      * @returns
      */
     getValue: (value: any) => string;
-    render: (value: any) => JSX.Element;
-    renderClient: (record: any) => JSX.Element | null;
-    renderPc: (value: any, record: Record) => JSX.Element;
+    renderClient: (record: any) => React.JSX.Element | null;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => string;
-    editRender: (value: any) => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => string;
+    editRender: () => React.JSX.Element;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Cascader";
+        options: any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default BasicCascader;

package/dist/esm/components/Cascader/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; }
@@ -10,10 +8,11 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { Cascader } from 'antd';
+import intersection from 'lodash/intersection';
 import GetFormItem from "../GetFormItem";
 import { findLabelBySelectValue, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
 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 BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
   var _this = this;
   _classCallCheck(this, BasicCascader);
@@ -21,27 +20,15 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(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, "width", void 0);
-  _defineProperty(this, "align", void 0);
-  _defineProperty(this, "dataIndex", void 0);
-  _defineProperty(this, "editable", void 0);
-  _defineProperty(this, "formItemIndex", void 0);
-  _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "getValue", function (value) {
     var _findLabelBySelectVal, _findLabelBySelectVal2, _this$componentConfig;
     return (_findLabelBySelectVal = findLabelBySelectValue(value, (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.options)) === null || _findLabelBySelectVal === void 0 ? void 0 : (_findLabelBySelectVal2 = _findLabelBySelectVal.map(function (i) {
       return i.label;
     })) === null || _findLabelBySelectVal2 === void 0 ? void 0 : _findLabelBySelectVal2.join(',');
   });
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, _this.getValue(value));
-  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -60,6 +47,13 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
       return i.label;
     })) === null || _findLabelBySelectVal4 === void 0 ? void 0 : _findLabelBySelectVal4.join(','));
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_multSelect")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_multSelect")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _findLabelBySelectVal5, _findLabelBySelectVal6, _ref2, _this$componentConfig3;
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_multSelect")]) === undefined) {
@@ -71,7 +65,7 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
       return i.label;
     })) === null || _findLabelBySelectVal6 === void 0 ? void 0 : _findLabelBySelectVal6.join(',');
   });
-  _defineProperty(this, "editRender", function (value) {
+  _defineProperty(this, "editRender", function () {
     var _this$componentConfig4, _this$componentConfig5, _this$componentConfig6;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
@@ -90,23 +84,36 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(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 {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Cascader',
+      options: transMultSelectOptions((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 = true;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.dataType = 'array';
-  this.showContains = false;
   this.componentConfig = options.componentConfig;
   this.rules = [];
-});
+  this.children = [];
+  this.isCombinationComponent = false;
+}
+
+/**
+ * 通过值计算展示内容
+ * @param value 
+ * @returns 
+ */);
+
 export default BasicCascader;

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare type Value = {
     value?: string[];
     other?: string;
@@ -9,23 +9,27 @@ declare class BasicCheckbox implements ComponentInterface {
     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);
     getValue: (value: Value) => string | null | undefined;
-    render: (value: Value) => JSX.Element;
-    renderPc: (value: any, record: Record) => JSX.Element;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => any;
+    getComponentValue: (r: Record) => {
+        value: any;
+        other: any;
+    };
     renderExport: (value: any, record: Record) => string;
-    renderClient: (record: any) => JSX.Element | null;
-    editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => string;
+    renderClient: (record: any) => React.JSX.Element | null;
+    editRender: () => React.JSX.Element;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[] | undefined;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default BasicCheckbox;

package/dist/esm/components/Checkbox/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"); } }
@@ -8,10 +6,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 { ApaasCheckbox } 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 BasicCheckbox = /*#__PURE__*/_createClass(function BasicCheckbox(options) {
   var _this = this,
     _options$componentCon;
@@ -20,27 +19,21 @@ var BasicCheckbox = /*#__PURE__*/_createClass(function BasicCheckbox(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, "getValue", function (value) {
     var _value$value, _value$value2, _value$value3;
-    if ((value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.length) === 0 && !(value !== null && value !== void 0 && value.other)) return null;
-    var findIndex = (value === null || value === void 0 ? void 0 : (_value$value2 = value.value) === null || _value$value2 === void 0 ? void 0 : _value$value2.findIndex(function (item) {
+    if ((value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.length) === 0 && isNull(value === null || value === void 0 ? void 0 : value.other)) return null;
+    var findIndex = value === null || value === void 0 ? void 0 : (_value$value2 = value.value) === null || _value$value2 === void 0 ? void 0 : _value$value2.findIndex(function (item) {
       return item === '其他';
-    })) || -1;
+    });
     if (findIndex > -1 && value !== null && value !== void 0 && value.other) {
       // @ts-ignore
       value.value[findIndex] = "\u5176\u4ED6(".concat(value === null || value === void 0 ? void 0 : value.other, ")");
     }
     return value === null || value === void 0 ? void 0 : (_value$value3 = value.value) === null || _value$value3 === void 0 ? void 0 : _value$value3.join('/');
   });
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, _this.getValue(value));
-  });
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_checkbox")]) === undefined && (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_checkboxOther")]) === undefined) {
@@ -48,6 +41,23 @@ var BasicCheckbox = /*#__PURE__*/_createClass(function BasicCheckbox(options) {
     }
     return /*#__PURE__*/React.createElement("span", null, record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_checkbox")]) === null || _record === void 0 ? void 0 : _record.join('/'), (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_checkbox")]) && /*#__PURE__*/React.createElement("br", null), (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_checkboxOther")]) || '');
   });
+  _defineProperty(this, "renderLog", function (r) {
+    var _r;
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_checkbox")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_checkboxOther")])) return null;
+    var restOtherOptions = (r === null || r === void 0 ? void 0 : (_r = r["".concat(_this.id, "_checkbox")]) === null || _r === void 0 ? void 0 : _r.filter(function (i) {
+      return i !== '其他';
+    })) || [];
+    if (!isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_checkboxOther")])) {
+      return (restOtherOptions === null || restOtherOptions === void 0 ? void 0 : restOtherOptions.length) > 0 ? restOtherOptions.join('/').concat("/\u5176\u4ED6(".concat(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_checkboxOther")], ")")) : "\u5176\u4ED6(".concat(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_checkboxOther")], ")");
+    }
+    return restOtherOptions.join('/');
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      value: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_checkbox")],
+      other: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_checkboxOther")]
+    };
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_checkbox")]) === undefined) {
@@ -72,22 +82,31 @@ var BasicCheckbox = /*#__PURE__*/_createClass(function BasicCheckbox(options) {
       component: /*#__PURE__*/React.createElement(ApaasCheckbox, _this.componentConfig)
     });
   });
-  _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, _item$config2, _item$config2$options, _item$config3;
+    return {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'MultipleSelect',
+      options: item !== null && item !== void 0 && (_item$config = item.config) !== null && _item$config !== void 0 && _item$config.showOther ? item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : (_item$config2$options = _item$config2.options) === null || _item$config2$options === void 0 ? void 0 : _item$config2$options.concat({
+        label: '其他',
+        value: '其他'
+      }) : (item === null || item === void 0 ? void 0 : (_item$config3 = item.config) === null || _item$config3 === void 0 ? void 0 : _item$config3.options) || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'checkbox')).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.isCombinationComponent = false;
+  this.children = [];
   this.componentConfig = options.componentConfig;
   this.rules = options !== null && options !== void 0 && (_options$componentCon = options.componentConfig) !== null && _options$componentCon !== void 0 && _options$componentCon.required ? [{
     validator: function validator(_, value) {

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 declare type getFormItemProps = {
     name: string;
     title: string;
@@ -6,13 +6,13 @@ declare type getFormItemProps = {
     required: boolean;
     component: JSX.Element | string | null;
 };
-export declare const getFormItem: ({ name, title, rules, required, component }: getFormItemProps) => JSX.Element;
+export declare const getFormItem: ({ name, title, rules, required, component }: getFormItemProps) => React.JSX.Element;
 export declare const showImage: ({ item, type, index }: {
     item: any;
     type: string;
     index: number;
-}) => JSX.Element;
-export declare const ShowTotalImage: ({ total, allImage, type }: any) => JSX.Element;
-export declare const GoodImage: ({ list, type }: any) => JSX.Element | null;
+}) => React.JSX.Element;
+export declare const ShowTotalImage: ({ total, allImage, type }: any) => React.JSX.Element;
+export declare const GoodImage: ({ list, type }: any) => React.JSX.Element | null;
 export declare const JstGoodImage: ({ list, type }: any) => any;
 export {};

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 /**
  * 针对完成时间、创建时间、修改时间定义了3中类型
  */
@@ -8,23 +8,23 @@ declare class CommonDataTime implements ComponentInterface {
     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);
     getValue: (value: string) => string;
-    render: (value: string) => JSX.Element | null;
-    renderClient: (record: any) => JSX.Element | null;
-    renderPc: (value: any, record: Record) => JSX.Element;
+    renderClient: (record: any) => React.JSX.Element | null;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => string;
     editRender: () => null;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => string;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Date";
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default CommonDataTime;

package/dist/esm/components/CommonDataTime/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"); } }
@@ -10,7 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from 'react';
 import moment from 'moment';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 
 /**
  * 针对完成时间、创建时间、修改时间定义了3中类型
@@ -22,19 +20,12 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(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, "getValue", function (value) {
     return moment(value).format('YYYY-MM-DD HH:mm:ss');
   });
-  _defineProperty(this, "render", function (value) {
-    if (!value) return null;
-    return /*#__PURE__*/React.createElement("span", null, _this.getValue(value));
-  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -48,6 +39,13 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
     }
     return /*#__PURE__*/React.createElement("span", null, moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss'));
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
       return '--';
@@ -57,23 +55,28 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
   _defineProperty(this, "editRender", function () {
     return null;
   });
-  _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: 'Date',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var recordDateTime = _filterFn.filterTableListItemColumnValue(i, item.id, '');
+          return _filterFn.filterDateFn(value, recordDateTime);
+        };
+      }
+    };
   });
   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 CommonDataTime;