dolphindb 3.1.21 → 3.1.22

package/browser.d.ts

@@ -171,7 +171,7 @@ export interface InspectOptions {
     colors?: boolean;
     /** `null` decimal places 小数位数 */
     decimals?: number;
-    /** `false` 决定 null 值如何返回. nullstr ? 'null' : '' */
+    /** `在 format 中默认为 false，在 toString 中默认为 true` 决定 null 值如何返回. nullstr ? 'null' : '' */
     nullstr?: boolean;
     /** `在 format 中默认为 false，在 toString 中默认为 true` 决定 string, symbol, char 类型是否加引号 */
     quote?: boolean;
@@ -184,7 +184,7 @@ export interface InspectOptions {
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;
 /** 格式化向量、集合中的第 index 项为字符串，空值返回 'null' 字符串  formatted vector, the index-th item in the collection is a string, a null value returns a 'null' string */
 export declare function formati(obj: DdbVectorObj, index: number, options?: InspectOptions): string;
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | string[] | DdbExtObjValue | DdbTensorValue | Uint8Array<ArrayBufferLike> | DdbDecimal128VectorValue | BigInt128Array | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | IotVectorItemValue | DdbArrayVectorValue | DdbDurationVectorValue | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | DdbMatrixValue | DdbChartValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | number[] | string[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | DdbExtObjValue | DdbTensorValue | Uint8Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | IotVectorItemValue | DdbArrayVectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
 /** 构造 void 类型，默认为 `DdbVoidType.undefined` */

package/browser.js

@@ -1567,10 +1567,9 @@ export class DdbObj {
     }
 }
 const grey_nullstr = grey('null');
-const nullstr = 'null';
 function get_nullstr(options) {
     return options.nullstr ?
-        options.colors ? grey_nullstr : nullstr
+        options.colors ? grey_nullstr : 'null'
         :
             '';
 }
@@ -1598,7 +1597,10 @@ function format_time(type, value, options) {
 }
 function format_number(type, value, options) {
     if (value === null || value === number_nulls.get(type))
-        return options.colors ? grey_nullstr : nullstr;
+        return options.nullstr ?
+            options.colors ? grey_nullstr : 'null'
+            :
+                '';
     const str = get_number_formatter(type === DdbType.int || type === DdbType.long || type === DdbType.short, options.decimals, options.grouping).format(value);
     return options.colors ? green(str) : str;
 }
@@ -1607,12 +1609,12 @@ export function format(type, value, le, options = {}) {
     switch (type) {
         case DdbType.void: {
             return options.nullstr ?
-                ''
+                value === DdbVoidType.default ?
+                    options.colors ? grey('default') : 'default'
+                    :
+                        options.colors ? grey_nullstr : 'null'
                 :
-                    value === DdbVoidType.default ?
-                        options.colors ? grey('default') : 'default'
-                        :
-                            options.colors ? grey_nullstr : nullstr;
+                    '';
         }
         case DdbType.bool:
             if (value === null || value === nulls.int8)