From 98f8a8e82a0f5d6d1b2fc553e3062a1b4a3908ff Mon Sep 17 00:00:00 2001 From: YuShifan <894402575bt@gmail.com> Date: Wed, 18 Dec 2024 16:24:17 +0800 Subject: [PATCH 1/3] fix(utils): iotdb type conversion to lowercase --- packages/utils/lib/useBatchSettings.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/utils/lib/useBatchSettings.ts b/packages/utils/lib/useBatchSettings.ts index b0ca856..836668c 100644 --- a/packages/utils/lib/useBatchSettings.ts +++ b/packages/utils/lib/useBatchSettings.ts @@ -15,7 +15,7 @@ export const useBatchSettings = (locale: 'zh' | 'en' = 'en') => { messages: { en: { iotdbTemplateRemark: - 'Measurement, Value, and Data Type are required fields. The Data Type can have the optional values BOOLEAN, INT32, INT64, FLOAT, DOUBLE, TEXT.', + 'Measurement, Value, and Data Type are required fields. The Data Type can have the optional values boolean, int32, int64, float, double, text.', invalidIsCharFlag: 'Invalid Char Value field: {isChar}', uploadMaxRowsError: 'The number of rows in the CSV file exceeds the limit. Up to {max} rows of data are supported except for the header', @@ -26,7 +26,7 @@ export const useBatchSettings = (locale: 'zh' | 'en' = 'en') => { }, zh: { iotdbTemplateRemark: - '字段、值、数据类型是必填选项,数据类型可选的值为 BOOLEAN、INT32、INT64、FLOAT、DOUBLE、TEXT', + '字段、值、数据类型是必填选项,数据类型可选的值为 boolean、int32、int64、float、double、text', invalidIsCharFlag: '无效的字符标识符值:{isChar}', uploadMaxRowsError: 'CSV 文件行数超过限制,除表头外,最多支持 {max} 行数据', influxdbTemplateRemark: '在字段值后追加 i,InfluxDB 则将该数值存储为整数类型。', @@ -54,10 +54,10 @@ hum,\${payload.hum},FALSE, status,\${payload.status},FALSE, `, [BatchSettingTypes.IoTDB]: `Timestamp,Measurement,Data Type,Value,Remarks (Optional) -now,temp,FLOAT,\${payload.temp},"${t('iotdbTemplateRemark')}" -now,hum,FLOAT,\${payload.hum}, -now,status,BOOLEAN,\${payload.status}, -now,clientid,TEXT,\${clientid}, +now,temp,float,\${payload.temp},"${t('iotdbTemplateRemark')}" +now,hum,float,\${payload.hum}, +now,status,boolean,\${payload.status}, +now,clientid,text,\${clientid}, `, [BatchSettingTypes.InfluxDB]: `Field,Value,Remarks (Optional) temp,\${payload.temp}, @@ -118,7 +118,7 @@ precip,\${payload.precip}i,"${t('datalayersTemplateRemark')}" const processIoTDBData = (data: string[][]): Promise>> => { return new Promise((resolve, reject) => { try { - const validDataTypes = ['BOOLEAN', 'INT32', 'INT64', 'FLOAT', 'DOUBLE', 'TEXT'] + const validDataTypes = ['boolean', 'int32', 'int64', 'float', 'double', 'text'] const result = data .slice(1) From db15ace2ca0671a2da8b4711a09bed2a9a14e3db Mon Sep 17 00:00:00 2001 From: YuShifan <894402575bt@gmail.com> Date: Wed, 18 Dec 2024 16:41:48 +0800 Subject: [PATCH 2/3] chore(utils): update version 0.0.16 --- packages/utils/CHANGELOG.md | 6 ++++++ packages/utils/package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 7a2eca1..186b124 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,5 +1,11 @@ # @emqx/shared-ui-utils +## 0.0.16 + +### Patch Changes + +- Fixed IoTDB batch template issue + ## 0.0.15 ### Patch Changes diff --git a/packages/utils/package.json b/packages/utils/package.json index da62d94..2c97661 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@emqx/shared-ui-utils", - "version": "0.0.15", + "version": "0.0.16", "homepage": "https://emqx.io", "license": "Apache-2.0", "repository": { From 773c1922d8046b6f73b98dc45ca583b46ec470e4 Mon Sep 17 00:00:00 2001 From: YuShifan <894402575bt@gmail.com> Date: Wed, 18 Dec 2024 16:44:11 +0800 Subject: [PATCH 3/3] test(utils): fix batch settings test case --- packages/utils/lib/__test__/useBatchSettings.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/utils/lib/__test__/useBatchSettings.test.ts b/packages/utils/lib/__test__/useBatchSettings.test.ts index 8f999b0..dde7cad 100644 --- a/packages/utils/lib/__test__/useBatchSettings.test.ts +++ b/packages/utils/lib/__test__/useBatchSettings.test.ts @@ -88,20 +88,20 @@ describe('useBatchSettings', () => { it('should process IoTDB data correctly', async () => { const data = [ ['timestamp', 'measurement', 'data_type', 'value'], - ['2022-01-01', 'temperature', 'FLOAT', '25.5'], - ['2022-01-02', 'humidity', 'INT32', '60'], + ['2022-01-01', 'temperature', 'float', '25.5'], + ['2022-01-02', 'humidity', 'int32', '60'], ] const expectedOutput = [ { timestamp: '2022-01-01', measurement: 'temperature', - data_type: 'FLOAT', + data_type: 'float', value: '25.5', }, { timestamp: '2022-01-02', measurement: 'humidity', - data_type: 'INT32', + data_type: 'int32', value: '60', }, ]