semanticdb-core 1.0.48 → 1.0.50

package/dist/common/dataSourceItem.d.ts

@@ -1,6 +1,6 @@
 export declare interface DataSourceItemType {
     id: string;
-    client: 'clickhouse' | 'mysql' | 'postgres' | 'starrocks' | 'oracle' | 'impala' | 'sybase' | 'databricks' | 'doris' | "sqlserver";
+    client: 'clickhouse' | 'mysql' | 'postgres' | 'starrocks' | 'oracle' | 'impala' | 'sybase' | 'databricks' | 'doris' | "sqlserver" | 'gbase';
     connection: {
         database: string;
         host: string;

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from './schema/property';
 export * from './schema/schema';
 export * from './common/representation';
 export * from './common/dataSourceItem';
+export * from './common/date';
 export * from './schema/schema.utils';
 export * from './schema/property.utils';
 export { getDrilldownDimensions } from './schema/schema.utils/getDrilldownDimensions';

package/dist/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./schema/property"), exports);
 __exportStar(require("./schema/schema"), exports);
 __exportStar(require("./common/representation"), exports);
 __exportStar(require("./common/dataSourceItem"), exports);
+__exportStar(require("./common/date"), exports);
 __exportStar(require("./schema/schema.utils"), exports);
 __exportStar(require("./schema/property.utils"), exports);
 var getDrilldownDimensions_1 = require("./schema/schema.utils/getDrilldownDimensions");

package/dist/logicform/logicform.utils.js

@@ -252,6 +252,18 @@ const getFlattenQuery = (query) => {
                 }
             }
         }
+        else if (k in flattenQuery) {
+            // 可以忽略$exists: true的
+            if (typeof v === 'object' && v && '$exists' in v && v.$exists === true) {
+                continue;
+            }
+            flattenQuery[k] = {
+                $and: [
+                    flattenQuery[k],
+                    v
+                ]
+            };
+        }
         else {
             flattenQuery[k] = v;
         }

package/dist/result/index.js

@@ -14,7 +14,8 @@ const logicformResultToMarkdown = (ret, number_only) => {
     if (!logicform.groupby) {
         markdownText = columnProperties
             .map((p) => (number_only ? '' : (p.name + ': ')) +
-            (0, property_utils_1.formatWithProperty)(p.ref ? schemas[p.ref] : schemas[logicform.schema], p, result[0][p.name], true))
+            (0, property_utils_1.formatWithProperty)(p.ref ? schemas[p.ref] : schemas[logicform.schema], Object.assign(Object.assign({}, p), { unit: undefined // p因为外面传过来的unit，可能是（万、亿），所以这里不添加
+             }), result[0][p.name], true))
             .join(',');
     }
     else {
@@ -25,7 +26,8 @@ const logicformResultToMarkdown = (ret, number_only) => {
                         table: {
                             headers: columnProperties.map((p) => p.name),
                             rows: result.map((row) => columnProperties.reduce((acc, p) => {
-                                acc[p.name] = (0, property_utils_1.formatWithProperty)(p.ref ? schemas[p.ref] : schemas[logicform.schema], p, row[p.name], true);
+                                acc[p.name] = (0, property_utils_1.formatWithProperty)(p.ref ? schemas[p.ref] : schemas[logicform.schema], Object.assign(Object.assign({}, p), { unit: undefined // p因为外面传过来的unit，可能是（万、亿），所以这里不添加
+                                 }), row[p.name], true);
                                 return acc;
                             }, {})),
                         },

package/package.json

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