@kmkf-fe-packages/services-components 0.7.5-alpha.1 → 0.7.5-alpha.3

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

@@ -10,11 +10,11 @@ import React from 'react';
 import { Cascader } from 'antd';
 import intersection from 'lodash/intersection';
 import GetFormItem from "../GetFormItem";
-import { findLabelBySelectValue, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
+import { findLabelBySelectValue, transMultSelectOptions, tree } from '@kmkf-fe-packages/kmkf-utils';
 import ItemView from "../../commonComponents/ItemView";
 import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../constant";
-var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
+var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
   var _this = this;
   _classCallCheck(this, BasicCascader);
   _defineProperty(this, "name", void 0);
@@ -88,6 +88,7 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     var _item$config;
+    var options = transMultSelectOptions((item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || []);
     return {
       searchDefaultConditions: SYMBOL.eq,
       type: item.type,
@@ -97,7 +98,7 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
       // 过滤组件名称
       filterComponentType: 'Cascader',
       props: {
-        options: transMultSelectOptions((item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || []),
+        options: options,
         fieldNames: {
           label: 'label',
           value: 'actived',
@@ -111,15 +112,23 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(options) {
       },
       formatFilterValue: function formatFilterValue(val) {
         if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
-          return "{\"actived\": \"".concat(val[val.length - 1], "\"}");
+          var node = tree.findNodeByValue(options, 'actived', val[val.length - 1]);
+          if (node) {
+            var label = node.label,
+              actived = node.actived;
+            return JSON.stringify({
+              label: label,
+              actived: actived
+            });
+          }
         }
       }
     };
   });
-  this.name = options.name;
-  this.id = options.id;
-  this.type = options.type;
-  this.componentConfig = options.componentConfig;
+  this.name = _options.name;
+  this.id = _options.id;
+  this.type = _options.type;
+  this.componentConfig = _options.componentConfig;
   this.rules = [];
   this.children = [];
   this.isCombinationComponent = false;

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

@@ -19,17 +19,6 @@ declare class BasicDataTime implements ComponentInterface {
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
     editRender: () => React.JSX.Element;
-    filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "between";
-        type: string;
-        id: string;
-        name: string;
-        filterComponentType: "Date";
-        props: {
-            options: any[];
-        };
-        filterFn: (value: string[]) => (i: Record) => boolean;
-        formatFilterValue: (val: Array<any>) => number[] | undefined;
-    };
+    filterConfig: (item: ColumnConfig) => any;
 }
 export default BasicDataTime;

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

@@ -81,8 +81,9 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _item$config;
-    return {
+    var _item$config, _item$config2;
+    var dateType = item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.dateType;
+    var obj = {
       searchDefaultConditions: SYMBOL.between,
       type: item.type,
       id: "".concat(item.id, "_dateTime"),
@@ -91,22 +92,26 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
       // 过滤组件名称
       filterComponentType: 'Date',
       props: {
-        options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || []
+        options: (item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.options) || []
       },
       filterFn: function filterFn(value) {
         return function (i) {
           var recordDateTime = _filterFn.filterTableListItemColumnValue(i, item.id, 'dateTime');
           return _filterFn.filterDateFn(value, recordDateTime);
         };
-      },
-      formatFilterValue: function formatFilterValue(val) {
-        if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
-          return val === null || val === void 0 ? void 0 : val.map(function (v) {
-            return moment(v).valueOf();
-          });
-        }
       }
+      // TODO: 自定义时间类型特殊，不需要转换，直接使用 YYYY-MM-DD HH:mm:ss格式查询
+      // formatFilterValue: (val: Array<any>) => {
+      //   if (val?.length > 0) {
+      //     return val?.map(v => moment(v).valueOf())
+      //   }
+      // }
     };
+
+    if (dateType !== null && dateType !== void 0 && dateType.includes('RANGE')) {
+      obj.componentDataType = 'dateArray';
+    }
+    return obj;
   });
   this.name = options.name;
   this.id = options.id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.5-alpha.1",
+  "version": "0.7.5-alpha.3",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,8 +26,8 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.7.5-alpha.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.5-alpha.0"
+    "@kmkf-fe-packages/basic-components": "^0.7.5-alpha.2",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.5-alpha.2"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "7f9016686b2b926e85d250403edb149795c26de1"
+  "gitHead": "17e96c7ac6992e753abdb89b66f7b291b1f61d9e"
 }