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

package/dist/esm/components/JstItemSelect/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; }
@@ -14,7 +12,7 @@ import GetFormItem from "../GetFormItem";
 import { GoodImage } from "../Common";
 import { JstItemList } from '@kmkf-fe-packages/basic-components';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
   var _this = this,
     _this$componentConfig;
@@ -23,26 +21,19 @@ var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(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, "align", void 0);
   _defineProperty(this, "expressDateInstance", void 0);
-  _defineProperty(this, "render", function (value) {
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement(GoodImage, {
-      list: value,
-      type: "jstItemThird"
-    });
-  });
+  _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: "jstItemThird"
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -53,6 +44,14 @@ var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
       type: "jstItemThird"
     });
   });
+  _defineProperty(this, "renderLog", function (r) {
+    var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+    if (isNull(list)) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")];
     return (list || []).map(function (item) {
@@ -70,23 +69,44 @@ var JstItemSelect = /*#__PURE__*/_createClass(function JstItemSelect(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _defineProperty(this, "filterConfig", function (item) {
+    var _ref2;
+    return [(_ref2 = {
+      type: item.type,
+      id: "".concat(item.id, "_itemId"),
+      name: "jst\u4F9B\u5E94\u5546\u7F16\u7801"
+    }, _defineProperty(_ref2, "type", item.type), _defineProperty(_ref2, "filterComponentType", 'Input'), _defineProperty(_ref2, "filterFn", function filterFn(value) {
+      return function (i) {
+        var _ref;
+        return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
+          var _String;
+          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;
+          return id;
+        });
+      };
+    }), _ref2), {
+      type: item.type,
+      id: "".concat(item.id, "_supplierName"),
+      name: "jst\u4F9B\u5E94\u5546\u540D\u79F0",
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref3;
+          return (_ref3 = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref3 === void 0 ? void 0 : _ref3.some(function (item) {
+            var _String2;
+            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 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.componentConfig = options.componentConfig;
+  this.isCombinationComponent = false;
+  this.children = [];
   this.rules = (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
     required: true,
     validator: function validator(_, value) {

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

@@ -1,29 +1,37 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
 import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 declare class JstLogistics implements ComponentInterface {
     name: string;
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     align: ALignType;
-    expressDateInstance: ExpressData;
+    expressDateInstance: InstanceType<typeof ExpressData>;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: 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: any) => any;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: any) => any;
-    };
+    filterConfig: (item: ColumnConfig) => ({
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+        options?: undefined;
+    } | {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: any[];
+        filterFn: (value: string) => (i: Record) => any;
+    })[];
 }
 export default JstLogistics;

package/dist/esm/components/JstLogistics/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,11 +8,12 @@ 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 { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import some from 'lodash/some';
 import GetFormItem from "../GetFormItem";
 import { JstGoodImage } from "../Common";
 import { JstGoods } from '@kmkf-fe-packages/basic-components';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
   var _this = this,
     _this$componentConfig3;
@@ -23,26 +22,22 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(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, "align", void 0);
   _defineProperty(this, "expressDateInstance", void 0);
-  _defineProperty(this, "render", function (value) {
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
-      list: value,
-      type: 1
-    });
-  });
+  _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, {
+    var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
+      return !isNull(item);
+    }) : false;
+    return isShow ? /*#__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(JstGoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: 1
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -53,6 +48,14 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
       type: 1
     });
   });
+  _defineProperty(this, "renderLog", function (r) {
+    var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+    if (isNull(list)) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")];
     return (list || []).map(function (item) {
@@ -72,23 +75,41 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(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: "".concat(item.id, "_logisticsCode"),
+      name: "jst\u7269\u6D41\u5355\u53F7",
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'logisticsCode'), value);
+        };
+      }
+    }, {
+      type: item.type,
+      id: "".concat(item.id, "_logisticsCompany"),
+      name: "jst\u7269\u6D41\u516C\u53F8",
+      filterComponentType: 'MultipleSelect',
+      options: _this.expressDateInstance.getExpressData() || [],
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref;
+          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'logisticsCompany').split(',') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
+            var _String;
+            var logisticsCompany = item ? (_String = String(item)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
+            return logisticsCompany;
+          });
+        };
+      }
+    }];
   });
   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.componentConfig = options.componentConfig;
+  this.isCombinationComponent = false;
+  this.children = [];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     required: true,
     validator: function validator(_, value) {

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

@@ -1,27 +1,27 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
 declare class JstSendGood implements ComponentInterface {
     name: string;
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     align: ALignType;
+    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: any) => any;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: any) => any;
-    };
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => any;
+    }[];
 }
 export default JstSendGood;

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

@@ -1,6 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -9,11 +7,12 @@ 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 some from 'lodash/some';
 import GetFormItem from "../GetFormItem";
 import { JstGoodImage } from "../Common";
 import { JstGoods } from '@kmkf-fe-packages/basic-components';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
   var _this = this,
     _this$componentConfig;
@@ -22,25 +21,21 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(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, "align", void 0);
-  _defineProperty(this, "render", function (value) {
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
-      list: value,
-      type: 3
-    });
-  });
+  _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, {
+    var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
+      return !isNull(item);
+    }) : false;
+    return isShow ? /*#__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(JstGoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: 3
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -51,6 +46,14 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
       type: 3
     });
   });
+  _defineProperty(this, "renderLog", function (r) {
+    var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+    if (isNull(list)) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")];
     return (list || []).map(function (item) {
@@ -68,22 +71,42 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(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: "".concat(item.id, "_sendName"),
+      name: "jst\u53D1\u8D27\u4ED3\u540D\u79F0",
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref;
+          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
+            var _String;
+            var name = item !== null && item !== void 0 && item.sendName ? (_String = String(item === null || item === void 0 ? void 0 : item.sendName)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
+            return name;
+          });
+        };
+      }
+    }, {
+      type: item.type,
+      id: "".concat(item.id, "_sendId"),
+      name: "jst\u53D1\u8D27\u4ED3\u7F16\u7801",
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref2;
+          return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
+            var _String2;
+            var id = item !== null && item !== void 0 && item.sendId ? (_String2 = String(item === null || item === void 0 ? void 0 : item.sendId)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
+            return id;
+          });
+        };
+      }
+    }];
   });
   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.componentConfig = options.componentConfig;
   this.rules = (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
     required: true,
@@ -108,5 +131,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
     }
   }] : [];
   this.align = 'left';
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default JstSendGood;

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

@@ -1,27 +1,27 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType, Record } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
 declare class JstSupply implements ComponentInterface {
     name: string;
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     align: ALignType;
+    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: any) => any;
     editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: any) => any;
-    };
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => any;
+    }[];
 }
 export default JstSupply;

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

@@ -1,6 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -9,11 +7,12 @@ 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 some from 'lodash/some';
 import GetFormItem from "../GetFormItem";
 import { JstGoodImage } from "../Common";
 import { JstGoods } from '@kmkf-fe-packages/basic-components';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
   var _this = this,
     _this$componentConfig;
@@ -22,25 +21,21 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(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, "align", void 0);
-  _defineProperty(this, "render", function (value) {
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
-      list: value,
-      type: 2
-    });
-  });
+  _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, {
+    var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
+      return !isNull(item);
+    }) : false;
+    return isShow ? /*#__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(JstGoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: 2
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -51,6 +46,14 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
       type: 2
     });
   });
+  _defineProperty(this, "renderLog", function (r) {
+    var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+    if (isNull(list)) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var list = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")]) || [];
     return list.map(function (item) {
@@ -68,23 +71,45 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(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: "".concat(item.id, "_supplyName"),
+      name: "jst\u4F9B\u9500\u5546\u540D\u79F0",
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref;
+          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
+            var _String;
+            var name = item !== null && item !== void 0 && item.supplyName ? (_String = String(item === null || item === void 0 ? void 0 : item.supplyName)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
+            return name;
+          });
+        };
+      }
+    }, {
+      type: item.type,
+      id: "".concat(item.id, "_supplyId"),
+      name: "jst\u4F9B\u9500\u5546\u7F16\u7801",
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref2;
+          return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, 'jstItemList') || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
+            var _String2;
+            var id = item !== null && item !== void 0 && item.supplyId ? (_String2 = String(item === null || item === void 0 ? void 0 : item.supplyId)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
+            return id;
+          });
+        };
+      }
+    }];
   });
   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.componentConfig = options.componentConfig;
+  this.isCombinationComponent = false;
+  this.children = [];
   this.rules = (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
     required: true,
     validator: function validator(_, value) {