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

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';
+import React from 'react';
 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[];
-    renderClient: (record: any) => JSX.Element | null;
-    editRender: (value: any) => JSX.Element;
+    render: (value: Value) => React.JSX.Element | null;
+    renderPc: (value: any, record: Record) => React.JSX.Element | React.JSX.Element[];
+    renderLog: (r: Record) => React.JSX.Element | React.JSX.Element[] | null;
+    getComponentValue: (r: Record) => any;
+    renderClient: (record: any) => React.JSX.Element | null;
+    editRender: () => React.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;

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

@@ -0,0 +1,31 @@
+import React from 'react';
+import { ComponentInterface, ColumnConfig, Record } from '../../type';
+import { PlatData } from '@kmkf-fe-packages/kmkf-utils';
+declare class PlatForm implements ComponentInterface {
+    name: string;
+    id: string;
+    type: string;
+    componentConfig: ComponentInterface["componentConfig"];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
+    platInstance: PlatData;
+    constructor();
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderExport: (value: any, record: Record) => string;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => any;
+    renderClient: () => null;
+    editRender: () => null;
+    filterConfig: (item: ColumnConfig) => {
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        filterFn: (value: string) => (i: Record) => boolean;
+        options: {
+            label: string;
+            value: string;
+        }[];
+    };
+}
+export default PlatForm;

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

@@ -0,0 +1,67 @@
+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 _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"); } }
+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 { PlatData, filterFn as _filterFn, isNull } from '@kmkf-fe-packages/kmkf-utils';
+var PlatForm = /*#__PURE__*/_createClass(function PlatForm() {
+  var _this = this;
+  _classCallCheck(this, PlatForm);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "platInstance", void 0);
+  _defineProperty(this, "renderPc", function (value, record) {
+    var _platMap$record;
+    var platMap = _this.platInstance.getPlatMap();
+    return /*#__PURE__*/React.createElement("span", null, (_platMap$record = platMap === null || platMap === void 0 ? void 0 : platMap[record === null || record === void 0 ? void 0 : record["".concat(_this.id)]]) !== null && _platMap$record !== void 0 ? _platMap$record : '--');
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    var _platMap$record2;
+    var platMap = _this.platInstance.getPlatMap();
+    return (_platMap$record2 = platMap === null || platMap === void 0 ? void 0 : platMap[record === null || record === void 0 ? void 0 : record["".concat(_this.id)]]) !== null && _platMap$record2 !== void 0 ? _platMap$record2 : '--';
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r[_this.id])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r[_this.id];
+  });
+  _defineProperty(this, "renderClient", function () {
+    return null;
+  });
+  _defineProperty(this, "editRender", function () {
+    return null;
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    var platData = _this.platInstance.getPlatSelectList();
+    return {
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'MultipleSelect',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, ''));
+        };
+      },
+      options: platData
+    };
+  });
+  this.name = "平台";
+  this.id = "platform";
+  this.type = "PLATFORM_INPUT";
+  this.isCombinationComponent = false;
+  this.children = [];
+  this.platInstance = PlatData.getInstance();
+});
+export default PlatForm;

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

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const Popover: ({ Overlay, ShowComponent }: any) => JSX.Element;
+import React from 'react';
+declare const Popover: ({ Overlay, ShowComponent }: any) => React.JSX.Element;
 export default Popover;

package/dist/esm/components/Radio/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,22 +9,27 @@ declare class BasicRadio 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);
-    render: (value: Value) => JSX.Element;
-    renderPc: (value: any, record: Record) => JSX.Element;
+    render: (value: Value) => React.JSX.Element;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => {
+        value: any;
+        other: any;
+    };
     renderExport: (value: any, record: Record) => string;
-    renderClient: (record: Record) => JSX.Element | null;
-    editRender: () => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        renderExport: (value: any, record: Record) => string;
+    renderClient: (record: Record) => 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 BasicRadio;

package/dist/esm/components/Radio/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"); } }
@@ -11,7 +9,7 @@ import React from 'react';
 import { ApaasRadio } 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';
 import get from 'lodash/get';
 var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {
   var _this = this,
@@ -21,12 +19,9 @@ var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(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, "render", function (value) {
     var _value$value;
     return /*#__PURE__*/React.createElement("span", null, value === null || value === void 0 ? void 0 : value.value, (value === null || value === void 0 ? void 0 : value.value) && (value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.indexOf('其他')) > -1 && (value === null || value === void 0 ? void 0 : value.other) && "(".concat(value === null || value === void 0 ? void 0 : value.other, ")"));
@@ -37,6 +32,16 @@ var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {
     }
     return /*#__PURE__*/React.createElement("span", null, record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_radio")], record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_radioOther")]);
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_radio")]) && isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_radioOther")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return {
+      value: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_radio")],
+      other: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_radioOther")]
+    };
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_radio")]) === undefined) {
       return '--';
@@ -60,22 +65,31 @@ var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {
       component: /*#__PURE__*/React.createElement(ApaasRadio, _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 value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, 'radio'));
+        };
+      } // 第一个为选中值，第二个参数为表格行记录值
+    };
   });
   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.isCombinationComponent = false;
+  this.children = [];
   this.componentConfig = options.componentConfig;
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     validator: function validator(_, value) {

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, Record } from '../../type';
+import React from 'react';
 declare type Value = {
     name: string;
     value: number;
@@ -10,25 +10,20 @@ declare class BasicRate implements ComponentInterface {
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     rateMap: {
         [prop in number]: string;
     };
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: Value) => JSX.Element;
-    renderClient: (record: Record) => JSX.Element | null;
-    renderPc: (value: any, record: Record) => JSX.Element | null;
+    render: (value: Value) => React.JSX.Element;
+    renderClient: (record: Record) => React.JSX.Element | null;
+    renderPc: (value: any, record: Record) => React.JSX.Element | null;
+    renderLog: (r: Record) => React.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;
-    };
+    editRender: () => React.JSX.Element;
+    filterConfig: () => never[];
 }
 export default BasicRate;

package/dist/esm/components/Rate/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; }
@@ -15,20 +13,16 @@ import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var BasicRate = /*#__PURE__*/_createClass(function BasicRate(options) {
-  var _this = this,
-    _this$componentConfig;
+  var _this = this;
   _classCallCheck(this, BasicRate);
   _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, "rateMap", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "children", void 0);
   _defineProperty(this, "render", function (value) {
     return /*#__PURE__*/React.createElement("div", null, value === null || value === void 0 ? void 0 : value.map(function (item) {
       return /*#__PURE__*/React.createElement("div", {
@@ -87,6 +81,13 @@ var BasicRate = /*#__PURE__*/_createClass(function BasicRate(options) {
     }
     return null;
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_rate")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_rate")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _ref;
     var textArr = ((_ref = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_rate")]) || []) === null || _ref === void 0 ? void 0 : _ref.reduce(function (prv, next) {
@@ -98,11 +99,12 @@ var BasicRate = /*#__PURE__*/_createClass(function BasicRate(options) {
     return textArr === null || textArr === void 0 ? void 0 : textArr.join(';');
   });
   _defineProperty(this, "editRender", function () {
+    var _this$componentConfig, _this$componentConfig2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
       rules: _this.rules,
-      required: false,
+      required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
       component: /*#__PURE__*/React.createElement(ApaasRate, _extends({}, _this.componentConfig, {
         allowClear: false,
         style: {
@@ -114,31 +116,16 @@ var BasicRate = /*#__PURE__*/_createClass(function BasicRate(options) {
       }))
     });
   });
-  _defineProperty(this, "getColumns", function () {
-    return _objectSpread(_objectSpread({}, _this), {}, {
-      dataIndex: _this.id,
-      title: _this.name,
-      renderExport: _this.renderExport
-    });
-    ;
+  _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.showContains = false;
-  this.dataType = 'array';
   this.componentConfig = options.componentConfig;
-  this.rules = (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
-    validator: function validator(_, value) {
-      if (value && !value.length) {
-        return Promise.reject(new Error("\u8BF7\u9009\u62E9".concat(_this.name)));
-      }
-      return Promise.resolve();
-    }
-  }] : [];
+  this.isCombinationComponent = false;
+  this.children = [];
+  this.rules = [];
   this.rateMap = {
     0: '',
     0.5: '非常差',

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-import { ComponentInterface, PickOption, DataType, Record } from '../../type';
+import { ComponentInterface, PickOption, Record } from '../../type';
+import React from 'react';
 import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
 declare type Value = {
     address?: (string | number)[];
@@ -10,26 +10,23 @@ declare class BasicInput implements ComponentInterface {
     id: string;
     type: string;
     rules: any[];
-    canFilter: boolean;
-    canGroup: boolean;
-    canHidden: boolean;
-    dataType: DataType;
-    showContains: boolean;
     componentConfig: ComponentInterface["componentConfig"];
     effects: ComponentInterface["effects"];
+    isCombinationComponent: boolean;
+    children: ComponentInterface[];
     addressDateInstance: AddressData;
     constructor(options: PickOption);
-    render: (value: Value, record: any) => JSX.Element;
+    render: (value: Value) => React.JSX.Element;
     transTextToNumber: (value?: string) => string | number | undefined;
-    renderPc: (value: any, record: Record) => JSX.Element;
-    renderExport: (value: any, record: any) => string;
-    renderClient: (record: any) => JSX.Element | null;
-    editRender: (value: any) => JSX.Element;
-    getColumns: () => this & {
-        dataIndex: string;
-        title: string;
-        componentType: (value: any) => JSX.Element;
-        renderExport: (value: any, record: any) => string;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => {
+        address: any[];
+        detail: any;
     };
+    renderExport: (value: any, record: any) => string;
+    renderClient: (record: any) => React.JSX.Element | null;
+    editRender: () => React.JSX.Element;
+    filterConfig: () => never[];
 }
 export default BasicInput;