dolphindb 2.0.1030 → 2.0.1032

package/index.d.ts

@@ -180,6 +180,8 @@ export interface InspectOptions extends UtilInspectOptions {
     colors?: boolean;
     /** `null` decimal places 小数位数 */
     decimals?: number;
+    /** `true` 决定格式化后的数据是否有千分位 */
+    grouping?: boolean;
 }
 /** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;

package/index.js

@@ -1268,21 +1268,27 @@ export class DdbObj {
 /** 整数一定用这个 number formatter, InspectOptions.decimals 不传也用这个 */
 let default_formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 let _decimals = 20;
+let _grouping = true;
 /** 缓存，为了优化性能，通常 options.decimals 都是不变的 */
 let _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 /** 用来处理时差  To deal with jet lag */
 let _datetime_formatter = new Intl.DateTimeFormat('zh-CN', { dateStyle: 'short', timeStyle: 'medium', timeZone: 'UTC' });
 /** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
 export function format(type, value, le, options = {}) {
-    const { decimals } = options;
     const formatter = (() => {
-        if (decimals === undefined || decimals === null)
-            return default_formatter;
-        if (decimals !== _decimals) {
+        const { grouping = true } = options;
+        const decimals = options.decimals ?? _decimals;
+        if (decimals !== _decimals || grouping !== _grouping) {
             _decimals = decimals;
-            _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: decimals, minimumFractionDigits: decimals });
+            _grouping = grouping;
+            default_formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20, useGrouping: grouping });
+            _formatter = new Intl.NumberFormat('en-US', {
+                maximumFractionDigits: decimals,
+                minimumFractionDigits: decimals,
+                useGrouping: grouping
+            });
         }
-        return _formatter;
+        return options.decimals === undefined || options.decimals === null ? default_formatter : _formatter;
     })();
     switch (type) {
         case DdbType.bool:
@@ -2696,15 +2702,15 @@ export class DDB {
             segments: [],
         };
         let schema;
-        let first_message = true;
         const { value: colnames } = await this.call('publishTable', [
             'localhost',
             new DdbInt(0),
             this.streaming.table,
             (this.streaming.action ||= `api_js_${new Date().getTime()}`),
-            // new DdbInt(-1),  // offset
-            // filter
-            // allow exists
+            ...this.streaming?.filters?.column ? [
+                new DdbVoid(),
+                this.streaming.filters.column // filter
+            ] : []
         ], {
             skip_connection_check: true,
             // 先准备好收到 websocket message 的 callback
@@ -2714,12 +2720,10 @@ export class DDB {
                     const i_topic_end = buffer.indexOf(0, 17);
                     // 首个 message 一定是 table schema, 后续消息是 column 片段组成的 any vector
                     const data = DdbObj.parse(buffer.subarray(i_topic_end + 1), this.le);
-                    if (first_message) {
+                    if (!schema) {
                         schema = data;
-                        first_message = false;
                         return;
                     }
-                    assert(schema, t('流数据订阅后一定先返回 schema'));
                     const { rows } = data.value[0];
                     win.rows += rows;
                     win.segments.push(data);