fast-crud-ui3 1.5.16-tsc-beta1 → 1.5.17

package/lib/model/filterComponentConfig.d.ts

@@ -1,31 +1,29 @@
+import { default as Opt } from './opt.js';
 export default FilterComponentConfig;
 /**
  * 筛选组件配置
  */
+export type OptValue = (typeof Opt)[keyof typeof Opt];
+/**
+ * 筛选组件配置
+ * @typedef {typeof Opt[keyof typeof Opt]} OptValue
+ */
 declare class FilterComponentConfig {
     /**
      * 构造函数
-     * @param component 组件
-     * @param col 字段名
-     * @param opt 操作符
-     * @param val 值
-     * @param label 中文名
-     * @param props 组件对应的props
-     * @param condMapFn 条件获取过滤函数
+     * @param component {string} 组件名
+     * @param col {string} 字段名
+     * @param opt {OptValue} 操作符
+     * @param val {any} 值
+     * @param label {string} 中文名
+     * @param props {Object} 组件对应的props
+     * @param condMapFn {Function} 条件获取过滤函数
+     * @param type {string} quick|easy|dynamic
      */
-    constructor({ component, col, opt, val, label, props, condMapFn, type }: {
-        component: any;
-        col: any;
-        opt?: "like";
-        val: any;
-        label: any;
-        props: any;
-        condMapFn?: (cond: any) => any[];
-        type: any;
-    });
+    constructor({ component, col, opt, val, label, props, condMapFn, type }: string);
     component: any;
     col: any;
-    opt: "like";
+    opt: any;
     val: any;
     label: any;
     props: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-crud-ui3",
-  "version": "1.5.16-tsc-beta1",
+  "version": "1.5.17",
   "type": "module",
   "main": "lib/fast-crud-ui3.cjs.js",
   "module": "lib/fast-crud-ui3.es.js",

package/packages/model/filterComponentConfig.js

@@ -1,10 +1,12 @@
-import {isUndefined} from "../util/util.js"
+import _ from 'lodash-es'
+import {isString, isUndefined} from "../util/util.js"
 import {escapeValToLabel} from "../util/escape.js"
 import Cond from './cond.js'
 import Opt from './opt.js'
 
 /**
  * 筛选组件配置
+ * @typedef {typeof Opt[keyof typeof Opt]} OptValue
  */
 class FilterComponentConfig {
     component; // 渲染组件
@@ -22,13 +24,14 @@ class FilterComponentConfig {
 
     /**
      * 构造函数
-     * @param component 组件
-     * @param col 字段名
-     * @param opt 操作符
-     * @param val 值
-     * @param label 中文名
-     * @param props 组件对应的props
-     * @param condMapFn 条件获取过滤函数
+     * @param component {string} 组件名
+     * @param col {string} 字段名
+     * @param opt {OptValue} 操作符
+     * @param val {any} 值
+     * @param label {string} 中文名
+     * @param props {Object} 组件对应的props
+     * @param condMapFn {Function} 条件获取过滤函数
+     * @param type {string} quick|easy|dynamic
      */
     constructor({
                     component,
@@ -50,11 +53,11 @@ class FilterComponentConfig {
         if (!isUndefined(condMapFn)) {
             this.condMapFn = condMapFn;
         }
-
-        this.defaultVal = val;
+        const finalVal = isString(val) ? _.trim(val) : val
+        this.defaultVal = finalVal;
         this.disabled = false;
         this.type = type;
-        this.val = val;
+        this.val = finalVal;
     }
 
     /**
@@ -89,6 +92,9 @@ class FilterComponentConfig {
         if (this.opt === Opt.NULL || this.opt === Opt.NNULL || this.opt === Opt.EMPTY || this.opt === Opt.NEMPTY) {
             return [new Cond(this.col, this.opt, null)]
         }
+        if (isString(this.val)) {
+            this.val = _.trim(this.val)
+        }
         return this.condMapFn(new Cond(this.col, this.opt, this.val));
     }
 

package/packages/util/util.js

@@ -1,4 +1,4 @@
-import {cloneDeep, isEmpty as _isEmpty} from 'lodash-es'
+import _ from 'lodash-es'
 import moment from "moment/moment"
 import {ElMessage} from "element-plus";
 
@@ -329,7 +329,7 @@ export function isEmpty(value) {
         case '[object String]':
             return value.trim() === '';
         case "[object Object]":
-            return _isEmpty(value);
+            return _.isEmpty(value);
         case "[object Array]":
             return value.length === 0;
         case "[object Undefined]":
@@ -373,7 +373,7 @@ export function deepClone(obj) {
     if (isObject(obj)) {
         // return Object.assign({}, obj)
         try {
-            return cloneDeep(obj);
+            return _.cloneDeep(obj);
         } catch (err) {
             console.error(err)
             return {...obj}
@@ -382,7 +382,7 @@ export function deepClone(obj) {
     if (isArray(obj)) {
         // return Object.assign([], obj)
         try {
-            return cloneDeep(obj);
+            return _.cloneDeep(obj);
         } catch (err) {
             console.error(err);
             return [...obj];
@@ -520,9 +520,9 @@ export function easyOptParse(cond, optMapping = {}) {
         const regex = new RegExp(reg);
         const {opt, valExtract} = obj
         if (regex.test(cond.val)) {
-            cond.opt = opt;
-            cond.val = valExtract(cond);
-            break;
+            cond.opt = opt
+            cond.val = valExtract(cond)
+            break
         }
     }
     return cond;
@@ -676,7 +676,7 @@ export const getBeginOfDate = function (date) {
     if (isEmpty(date)) {
         d = new Date()
     } else {
-        d = cloneDeep(date)
+        d = _.cloneDeep(date)
     }
     d.setHours(0, 0, 0, 0)
     return d
@@ -692,7 +692,7 @@ export const getBeginOfWeek = function (date) {
     if (isEmpty(date)) {
         d = new Date()
     } else {
-        d = cloneDeep(date)
+        d = _.cloneDeep(date)
     }
     const day = d.getDay();
     const diff = d.getDate() - day + (day === 0 ? -6 : 1)
@@ -710,7 +710,7 @@ export const getBeginOfMonth = function (date) {
     if (isEmpty(date)) {
         d = new Date()
     } else {
-        d = cloneDeep(date)
+        d = _.cloneDeep(date)
     }
     d.setDate(1);  // 设置为当月的 1 号
     d.setHours(0, 0, 0, 0);