semanticdb-core 1.1.33 → 1.1.35

package/dist/result/index.d.ts

@@ -8,5 +8,6 @@ export interface LogicformResultType {
     schemas?: Record<string, SchemaType>;
     columnProperties?: PropertyType[];
     sqls?: string[];
+    total?: number;
 }
 export declare const logicformResultToMarkdown: (ret: LogicformResultType, number_only?: boolean) => string;

package/dist/result/index.js

@@ -8,12 +8,15 @@ const json2md_1 = __importDefault(require("json2md"));
 const property_utils_1 = require("../schema/property.utils");
 const logicform_utils_1 = require("../logicform/logicform.utils");
 const logicformResultToMarkdown = (ret, number_only) => {
-    const { schemas, result, logicform, columnProperties, sqls } = ret;
+    const { schemas, result, logicform, columnProperties, total } = ret;
     if (!result || !logicform || !columnProperties || !schemas)
         return '没有数据';
     if (result.length === 0)
         return '没有数据';
     let markdownText = '';
+    if (logicform.groupby && total !== undefined && total !== null) {
+        markdownText += `总记录数: ${total}\n`;
+    }
     if (!logicform.groupby && !(0, logicform_utils_1.isSimpleQuery)(logicform)) {
         markdownText = columnProperties
             .map((p) => (number_only ? '' : (p.name + ': ')) +

package/dist/schema/property.utils.js

@@ -235,6 +235,10 @@ const getFormatter = (property) => {
     return null;
 };
 exports.getFormatter = getFormatter;
+const formatWithNumeralSafely = (value, format) => {
+    const formattedValue = (0, numeral_1.default)(value).format(format);
+    return formattedValue === 'NaN' ? `${value}` : formattedValue;
+};
 /**
  *
  * @param schema
@@ -264,19 +268,19 @@ const formatWithProperty = (schema, property, value, withUnit = false) => {
         finalValue = value;
     }
     else if (formatter) {
-        finalValue = (0, numeral_1.default)(value).format(formatter.formatter);
+        finalValue = formatWithNumeralSafely(value, formatter.formatter);
     }
     else if (property.type === 'percentage') {
-        finalValue = (0, numeral_1.default)(value).format('0.00%');
+        finalValue = formatWithNumeralSafely(value, '0.00%');
     }
     else if (property.type === 'int') {
-        finalValue = (0, numeral_1.default)(value).format('0,0');
+        finalValue = formatWithNumeralSafely(value, '0,0');
     }
     else if (property.type === 'currency') {
-        finalValue = (0, numeral_1.default)(value).format('0,0.00');
+        finalValue = formatWithNumeralSafely(value, '0,0.00');
     }
     else if (property.primal_type === 'number') {
-        finalValue = (0, numeral_1.default)(value).format('0,0.0');
+        finalValue = formatWithNumeralSafely(value, '0,0.0');
     }
     if (withUnit && property.type !== 'percentage') {
         let unit = '';

package/package.json

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