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

package/dist/esm/components/Payment/PaymentStatus.js

@@ -7,7 +7,7 @@ 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 ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var PaymentStatus = /*#__PURE__*/_createClass(function PaymentStatus(options) {
   var _this = this;
   _classCallCheck(this, PaymentStatus);
@@ -15,18 +15,13 @@ var PaymentStatus = /*#__PURE__*/_createClass(function PaymentStatus(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, "width", void 0);
   _defineProperty(this, "paymentStatus", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, value);
-  });
+  _defineProperty(this, "paymentStatusOptions", void 0);
+  _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,
@@ -35,51 +30,39 @@ var PaymentStatus = /*#__PURE__*/_createClass(function PaymentStatus(options) {
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    return value !== null && value !== void 0 ? value : '--';
+    var _record$_this$id;
+    return (_record$_this$id = record === null || record === void 0 ? void 0 : record[_this.id]) !== null && _record$_this$id !== void 0 ? _record$_this$id : '--';
+  });
+  _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) {
     return value !== null && value !== void 0 ? value : '--';
   });
-  _defineProperty(this, "editRender", function (value) {
+  _defineProperty(this, "editRender", function () {
     return null;
   });
-  _defineProperty(this, "getColumns", function () {
+  _defineProperty(this, "filterConfig", function (item) {
     return {
-      title: _this.name,
-      align: _this.align,
-      dataIndex: _this.id,
-      dataType: _this.dataType,
-      canHidden: _this.canHidden,
-      canFilter: _this.canFilter,
-      canGroup: _this.canGroup,
-      width: _this.width,
-      type: _this.type,
-      render: _this.renderPc,
-      renderPc: _this.renderPc,
-      componentType: _this.editRender,
-      showContains: _this.showContains,
-      renderExport: _this.renderExport,
-      widget: 'selectMultiple',
-      'x-options': Object.keys(_this.paymentStatus).map(function (item) {
-        return {
-          label: _this.paymentStatus[item],
-          value: _this.paymentStatus[item]
+      type: item.type,
+      id: "".concat(item.id, "_enterprisePaymentStatus"),
+      name: "".concat(item.name, "-\u6253\u6B3E\u72B6\u6001"),
+      filterComponentType: 'MultipleSelect',
+      options: _this.paymentStatusOptions,
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, 'enterprisePaymentStatus'));
         };
-      }),
-      'x-style': {
-        width: '356px'
-      },
-      'x-placeholder': '请选择内容'
+      }
     };
   });
   this.name = '打款状态';
   this.id = "".concat(options.id, "_enterprisePaymentStatus");
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = true;
-  this.canHidden = false;
-  this.showContains = false;
-  this.dataType = 'string';
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.align = 'left';
@@ -93,5 +76,29 @@ var PaymentStatus = /*#__PURE__*/_createClass(function PaymentStatus(options) {
     ALI_PAY_FAIL: '支付宝打款失败',
     ALI_PAY_CLOSE: '支付宝打款关闭'
   };
+  this.paymentStatusOptions = [{
+    label: '未打款',
+    value: '未打款'
+  }, {
+    label: '审核通过',
+    value: '审核通过'
+  }, {
+    label: '标记已打款',
+    value: '标记已打款'
+  }, {
+    label: '支付宝待付款',
+    value: '支付宝待付款'
+  }, {
+    label: '支付宝打款成功',
+    value: '支付宝打款成功'
+  }, {
+    label: '支付宝打款失败',
+    value: '支付宝打款失败'
+  }, {
+    label: '支付宝打款关闭',
+    value: '支付宝打款关闭'
+  }];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default PaymentStatus;

package/dist/esm/components/Payment/PaymentTid.d.ts

@@ -1,39 +1,28 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, ALignType } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
 declare class PaymentTid 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;
     width: number;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
-    renderPc: (value: any, record: any) => JSX.Element;
+    renderPc: (value: unknown, record: any) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: string) => string;
     editRender: () => JSX.Element;
-    getColumns: () => {
-        title: string;
-        align: ALignType;
-        dataIndex: string;
-        dataType: DataType;
-        canHidden: boolean;
-        canFilter: boolean;
-        canGroup: boolean;
-        width: number;
+    filterConfig: (item: ColumnConfig) => {
         type: string;
-        render: (value: any, record: any) => JSX.Element;
-        renderPc: (value: any, record: any) => JSX.Element;
-        componentType: () => JSX.Element;
-        showContains: boolean;
-        renderExport: (value: string) => string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default PaymentTid;

package/dist/esm/components/Payment/PaymentTid.js

@@ -9,7 +9,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 PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
   var _this = this;
   _classCallCheck(this, PaymentTid);
@@ -17,17 +17,11 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(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, "width", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, value);
-  });
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -36,7 +30,15 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    return /*#__PURE__*/React.createElement("span", null, value !== null && value !== void 0 ? value : '--');
+    var _record$_this$id;
+    return /*#__PURE__*/React.createElement("span", null, (_record$_this$id = record === null || record === void 0 ? void 0 : record[_this.id]) !== null && _record$_this$id !== void 0 ? _record$_this$id : '--');
+  });
+  _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) {
     return value !== null && value !== void 0 ? value : '--';
@@ -51,35 +53,27 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
       component: /*#__PURE__*/React.createElement(ApaasInput, _this.componentConfig)
     });
   });
-  _defineProperty(this, "getColumns", function () {
+  _defineProperty(this, "filterConfig", function (item) {
     return {
-      title: _this.name,
-      align: _this.align,
-      dataIndex: _this.id,
-      dataType: _this.dataType,
-      canHidden: _this.canHidden,
-      canFilter: _this.canFilter,
-      canGroup: _this.canGroup,
-      width: _this.width,
-      type: _this.type,
-      render: _this.renderPc,
-      renderPc: _this.renderPc,
-      componentType: _this.editRender,
-      showContains: _this.showContains,
-      renderExport: _this.renderExport
+      type: item.type,
+      id: "".concat(item.id, "_enterprisePaymentTid"),
+      name: "".concat(item.name, "-\u8BA2\u5355\u7F16\u53F7"),
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'enterprisePaymentTid'), value);
+        };
+      }
     };
   });
   this.name = '订单编号';
   this.id = "".concat(options.id, "_enterprisePaymentTid");
   this.type = options.type;
-  this.canFilter = true;
-  this.canGroup = true;
-  this.canHidden = false;
-  this.showContains = false;
-  this.dataType = 'string';
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.align = 'left';
   this.width = 200;
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default PaymentTid;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType } from '../../type';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
 import AlipayNick from './AlipayNick';
 import AlipayNo from './AlipayNo';
 import AlipayTime from './AlipayTime';
@@ -12,11 +12,6 @@ declare class Logistics implements ComponentInterface {
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     paymentTid: PaymentTid;
     paymentStatus: PaymentStatus;
@@ -25,101 +20,45 @@ declare class Logistics implements ComponentInterface {
     alipayNick: AlipayNick;
     alipayNo: AlipayNo;
     payTime: AlipayTime;
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: () => null;
     renderClient: (record: any) => JSX.Element;
     renderPc: () => null;
+    renderLog: (record: Record) => JSX.Element;
+    getComponentValue: (r: Record) => {
+        enterprisePaymentAlipayNick: any;
+        enterprisePaymentAlipayNo: any;
+        enterprisePaymentBuyerNick: any;
+        enterprisePaymentRefundFee: any;
+        enterprisePaymentStatus: any;
+        enterprisePaymentTid: any;
+        enterprisePaymentTime: any;
+    };
     renderExport: () => null;
     editRender: (value: any) => JSX.Element;
-    getColumns: () => {
-        title: string;
-        children: ({
-            title: string;
-            align: import("../../type").ALignType;
-            dataIndex: string;
-            dataType: DataType;
-            canHidden: boolean;
-            canFilter: boolean;
-            canGroup: boolean;
-            width: number;
-            type: string;
-            render: (value: any, record: any) => any;
-            renderPc: (value: any, record: any) => any;
-            componentType: (value: any) => null;
-            showContains: boolean;
-            renderExport: (value: any) => any;
-            widget: string;
-            'x-options': {
-                label: string;
-                value: string;
-            }[];
-            'x-style': {
-                width: string;
-            };
-            'x-placeholder': string;
-        } | {
-            title: string;
-            align: import("../../type").ALignType;
-            dataIndex: string;
-            width: number;
-            dataType: DataType;
-            canHidden: boolean;
-            canFilter: boolean;
-            canGroup: boolean;
-            type: string;
-            render: (value: any, record: import("../../type").Record) => JSX.Element;
-            renderPc: (value: any, record: import("../../type").Record) => JSX.Element;
-            componentType: () => JSX.Element;
-            showContains: boolean;
-            renderExport: (value: string) => string;
-        } | {
-            title: string;
-            align: import("../../type").ALignType;
-            dataIndex: string;
-            dataType: DataType;
-            canHidden: boolean;
-            canFilter: boolean;
-            canGroup: boolean;
-            type: string;
-            width: number;
-            render: (value: any, record: import("../../type").Record) => JSX.Element;
-            renderPc: (value: any, record: import("../../type").Record) => JSX.Element;
-            componentType: () => JSX.Element;
-            showContains: boolean;
-            renderExport: (value: any, record: import("../../type").Record) => any;
-        } | {
-            title: string;
-            align: import("../../type").ALignType;
-            dataIndex: string;
-            width: number;
-            dataType: DataType;
-            canHidden: boolean;
-            canFilter: boolean;
-            canGroup: boolean;
-            type: string;
-            render: (value: any, record: any) => JSX.Element;
-            renderPc: (value: any, record: any) => JSX.Element;
-            componentType: () => JSX.Element;
-            showContains: boolean;
-        } | {
-            title: string;
-            align: import("../../type").ALignType;
-            dataIndex: string;
-            width: number;
-            dataType: DataType;
-            canHidden: boolean;
-            canFilter: boolean;
-            canGroup: boolean;
-            type: string;
-            render: (value: any, record: import("../../type").Record) => JSX.Element;
-            renderPc: (value: any, record: import("../../type").Record) => JSX.Element;
-            componentType: () => JSX.Element;
-            showContains: boolean;
-            renderExport: (value: string) => string | null;
-            widget: null;
-        })[];
-        canHidden: boolean;
-        dataIndex: string;
-    };
+    filterConfig: (item: ColumnConfig) => ({
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    } | {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        options: {
+            label: string;
+            value: string;
+        }[];
+        filterFn: (value: string) => (i: Record) => boolean;
+    } | {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string[]) => (i: Record) => boolean;
+    })[];
 }
 export default Logistics;

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

@@ -1,4 +1,6 @@
 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; }
@@ -23,11 +25,6 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(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, "paymentTid", void 0);
   _defineProperty(this, "paymentStatus", void 0);
@@ -36,15 +33,28 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "alipayNick", void 0);
   _defineProperty(this, "alipayNo", void 0);
   _defineProperty(this, "payTime", 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.alipayNick.renderClient(record), _this.paymentAmount.renderClient(record), _this.alipayNo.renderClient(record), _this.buyerNick.renderClient(record), _this.paymentTid.renderClient(record), _this.paymentStatus.renderClient(record), _this.payTime.renderClient(record));
   });
   _defineProperty(this, "renderPc", function () {
     return null;
   });
+  _defineProperty(this, "renderLog", function (record) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, _this.alipayNick.name, ": ", _this.alipayNick.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.paymentAmount.name, ": ", _this.paymentAmount.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.alipayNo.name, ": ", _this.alipayNo.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.buyerNick.name, ": ", _this.buyerNick.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.paymentTid.name, ": ", _this.paymentTid.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.paymentStatus.name, ": ", _this.paymentStatus.renderLog(record)), /*#__PURE__*/React.createElement("div", null, _this.payTime.name, ": ", _this.payTime.renderLog(record)));
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      enterprisePaymentAlipayNick: _this.alipayNick.getComponentValue(r),
+      enterprisePaymentAlipayNo: _this.alipayNo.getComponentValue(r),
+      enterprisePaymentBuyerNick: _this.buyerNick.getComponentValue(r),
+      enterprisePaymentRefundFee: _this.paymentAmount.getComponentValue(r),
+      enterprisePaymentStatus: _this.paymentStatus.getComponentValue(r),
+      enterprisePaymentTid: _this.paymentTid.getComponentValue(r),
+      enterprisePaymentTime: _this.payTime.getComponentValue(r)
+    };
+  });
   _defineProperty(this, "renderExport", function () {
     return null;
   });
@@ -60,22 +70,12 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return {
-      title: _this.name,
-      children: [_this.paymentTid.getColumns(), _this.paymentStatus.getColumns(), _this.paymentAmount.getColumns(), _this.buyerNick.getColumns(), _this.alipayNick.getColumns(), _this.alipayNo.getColumns(), _this.payTime.getColumns()],
-      canHidden: _this.canHidden,
-      dataIndex: _this.id
-    };
+  _defineProperty(this, "filterConfig", function (item) {
+    return [_this.alipayNick.filterConfig(_objectSpread({}, item)), _this.paymentAmount.filterConfig(_objectSpread({}, item)), _this.alipayNo.filterConfig(_objectSpread({}, item)), _this.buyerNick.filterConfig(_objectSpread({}, item)), _this.paymentTid.filterConfig(_objectSpread({}, item)), _this.paymentStatus.filterConfig(_objectSpread({}, item)), _this.payTime.filterConfig(_objectSpread({}, item))];
   });
   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.paymentTid = new PaymentTid(options);
   this.paymentStatus = new PaymentStatus(options);
@@ -84,6 +84,8 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   this.alipayNick = new AlipayNick(options);
   this.alipayNo = new AlipayNo(options);
   this.payTime = new AlipayTime(options);
+  this.isCombinationComponent = true;
+  this.children = [this.alipayNick, this.alipayNo, this.buyerNick, this.paymentAmount, this.paymentStatus, this.paymentTid, this.payTime];
   this.rules = [{
     validator: function validator(_, value) {
       var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$componentConfig6;

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

@@ -1,31 +1,31 @@
 /// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, Record } from '../../type';
 declare type Value = string[] | undefined;
 declare class BasicPicture 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);
     formatPictures: (pictures: string) => string[];
     render: (value: Value) => JSX.Element | null;
     renderPc: (value: any, record: Record) => JSX.Element | JSX.Element[];
+    renderLog: (r: Record) => JSX.Element | JSX.Element[] | null;
+    getComponentValue: (r: Record) => any;
     renderClient: (record: any) => JSX.Element | null;
-    editRender: (value: any) => JSX.Element;
+    editRender: () => JSX.Element;
     /**
      *
      * @returns 图片类型的导出需要在导出时单独处理
      */
     renderExport: () => null;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-    };
+    /**
+     *
+     * @returns 图片不支持过滤
+     */
+    filterConfig: () => never[];
 }
 export default BasicPicture;

package/dist/esm/components/Picture/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; }
@@ -22,12 +20,9 @@ var BasicPicture = /*#__PURE__*/_createClass(function BasicPicture(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, "formatPictures", function (pictures) {
     pictures = pictures.replace(/[\[\]]/g, '');
     pictures = pictures.replace(/\s/g, '');
@@ -74,6 +69,13 @@ var BasicPicture = /*#__PURE__*/_createClass(function BasicPicture(options) {
       }));
     });
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_picture")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_picture")];
+  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -81,7 +83,7 @@ var BasicPicture = /*#__PURE__*/_createClass(function BasicPicture(options) {
       value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
     }) : null;
   });
-  _defineProperty(this, "editRender", function (value) {
+  _defineProperty(this, "editRender", function () {
     var _this$componentConfig, _this$componentConfig2, _this$componentConfig3;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
@@ -97,22 +99,15 @@ var BasicPicture = /*#__PURE__*/_createClass(function BasicPicture(options) {
   _defineProperty(this, "renderExport", function () {
     return null;
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name
-    });
-    ;
+  _defineProperty(this, "filterConfig", function () {
+    return [];
   });
   this.name = options.name;
   this.id = options.id;
   this.type = options.type;
-  this.canFilter = false;
-  this.canGroup = false;
-  this.canHidden = true;
-  this.dataType = 'array';
-  this.showContains = false;
   this.componentConfig = options.componentConfig;
   this.rules = [];
+  this.isCombinationComponent = false;
+  this.children = [];
 });
 export default BasicPicture;