semanticdb-core 1.1.47 → 1.1.49

package/dist/logicform/explainLogicform.js

@@ -205,6 +205,28 @@ const explainComparedValue = (key, value, schemas) => {
     });
     return segments.join(' 且 ');
 };
+const explainTopLevelLogicalQuery = (operator, operatorValue, includeValue, schemas) => {
+    if (!Array.isArray(operatorValue)) {
+        return `${operator} ${stringifyExplainValue(operatorValue, schemas)}`;
+    }
+    const explainedSegments = operatorValue
+        .map((item) => {
+        if (!isPlainObject(item)) {
+            return stringifyExplainValue(item, schemas);
+        }
+        const itemValues = explainFilterLikeQuery(item, '', includeValue, schemas).values;
+        if (itemValues.length === 0) {
+            return '';
+        }
+        return itemValues.join('、');
+    })
+        .filter((segment) => segment.length > 0)
+        .map((segment) => `(${segment})`);
+    if (explainedSegments.length === 0) {
+        return `${operator} []`;
+    }
+    return explainedSegments.join(` ${LOGICAL_OPERATOR_LABELS[operator]} `);
+};
 const getEntityIdFromValue = (value) => {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         return undefined;
@@ -251,6 +273,9 @@ const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false,
     const values = Object.entries(query)
         .filter(([k]) => includeValue || k !== 'entity_id')
         .map(([k, v]) => {
+        if (k === '$and' || k === '$or') {
+            return explainTopLevelLogicalQuery(k, v, includeValue, schemas);
+        }
         const key = formatExplainKey(k);
         if (includeValue) {
             if (k === 'entity_id') {

package/dist/logicform/types/query.d.ts

@@ -21,4 +21,7 @@ export declare type QueryValueTypeWithCompareOperator = Partial<{
 }> & {
     schema?: never;
 };
-export declare type QueryType = Record<string, QueryValueType | QueryValueTypeWithCompareOperator | QueryType[] | undefined>;
+export declare type QueryType = Record<string, QueryValueType | QueryValueTypeWithCompareOperator | QueryType[] | undefined> & Partial<{
+    $and: QueryType[];
+    $or: QueryType[];
+}>;

package/dist/schema/property.utils.js

@@ -141,7 +141,7 @@ try {
 catch (e) {
     // ignore
 }
-// 国外的缩略，分为：个位数、k，m，b，四个等级
+// 国外的缩略，分为：个位数、K，M，B，四个等级
 try {
     numeral_1.default.register('format', 'engabbreviation', {
         regexps: {
@@ -160,15 +160,15 @@ try {
             }
             else if (abs < million) {
                 adjValue = value / thousand;
-                unit = 'k';
+                unit = 'K';
             }
             else if (abs < billion) {
                 adjValue = value / million;
-                unit = 'm';
+                unit = 'M';
             }
             else {
                 adjValue = value / billion;
-                unit = 'b';
+                unit = 'B';
             }
             return numeral_1.default._.numberToFormat(adjValue, format.substring(0, format.length - 1), roundingFunction) + unit;
         },
@@ -178,15 +178,15 @@ try {
             const billion = 1000000000.0; // 十亿
             let scale = 1.0;
             let numberString = string;
-            if (string.endsWith('k')) {
+            if (string.endsWith('k') || string.endsWith('K')) {
                 scale = thousand;
                 numberString = string.substring(0, string.length - 1);
             }
-            else if (string.endsWith('m')) {
+            else if (string.endsWith('m') || string.endsWith('M')) {
                 scale = million;
                 numberString = string.substring(0, string.length - 1);
             }
-            else if (string.endsWith('b')) {
+            else if (string.endsWith('b') || string.endsWith('B')) {
                 scale = billion;
                 numberString = string.substring(0, string.length - 1);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semanticdb-core",
-  "version": "1.1.47",
+  "version": "1.1.49",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [