@tmagic/utils 1.3.13 → 1.3.14

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.13",
+  "version": "1.3.14",
   "name": "@tmagic/utils",
   "type": "module",
   "main": "dist/tmagic-utils.umd.cjs",
@@ -25,7 +25,7 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/schema": "1.3.13",
+    "@tmagic/schema": "1.3.14",
     "dayjs": "^1.11.4",
     "lodash-es": "^4.17.21"
   },

package/src/index.ts

@@ -283,32 +283,36 @@ export const compiledNode = (
   return node;
 };
 
-export const compiledCond = (op: string, fieldValue: any, value: any, range: number[] = []): boolean => {
+export const compiledCond = (op: string, fieldValue: any, inputValue: any, range: number[] = []): boolean => {
+  if (typeof fieldValue === 'string' && typeof inputValue === 'undefined') {
+    inputValue = '';
+  }
+
   switch (op) {
     case 'is':
-      return fieldValue === value;
+      return fieldValue === inputValue;
     case 'not':
-      return fieldValue !== value;
+      return fieldValue !== inputValue;
     case '=':
-      return fieldValue === value;
+      return fieldValue === inputValue;
     case '!=':
-      return fieldValue !== value;
+      return fieldValue !== inputValue;
     case '>':
-      return fieldValue > value;
+      return fieldValue > inputValue;
     case '>=':
-      return fieldValue >= value;
+      return fieldValue >= inputValue;
     case '<':
-      return fieldValue < value;
+      return fieldValue < inputValue;
     case '<=':
-      return fieldValue <= value;
+      return fieldValue <= inputValue;
     case 'between':
       return range.length > 1 && fieldValue >= range[0] && fieldValue <= range[1];
     case 'not_between':
       return range.length < 2 || fieldValue < range[0] || fieldValue > range[1];
     case 'include':
-      return fieldValue?.includes?.(value);
+      return fieldValue?.includes?.(inputValue);
     case 'not_include':
-      return typeof fieldValue === 'undefined' || !fieldValue.includes?.(value);
+      return typeof fieldValue === 'undefined' || !fieldValue.includes?.(inputValue);
     default:
       break;
   }

package/types/index.d.ts

@@ -40,7 +40,7 @@ export declare const getDepNodeIds: (dataSourceDeps?: DataSourceDeps) => string[
  */
 export declare const replaceChildNode: (newNode: MNode, data?: MNode[], parentId?: Id) => void;
 export declare const compiledNode: (compile: (value: any) => any, node: MNode, dataSourceDeps?: DataSourceDeps, sourceId?: Id) => MNode;
-export declare const compiledCond: (op: string, fieldValue: any, value: any, range?: number[]) => boolean;
+export declare const compiledCond: (op: string, fieldValue: any, inputValue: any, range?: number[]) => boolean;
 export declare const getDefaultValueFromFields: (fields: DataSchema[]) => Record<string, any>;
 export declare const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = "ds-field::";
 export declare const getKeys: <T extends object>(obj: T) => (keyof T)[];