From fc78ac790e31910400fee9f5b6c646fd2ff6fe29 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 2 Mar 2023 15:11:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20SQL=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E5=9C=A8=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E6=97=B6=E5=B8=A6=E5=85=A5=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 5f6f2743d5..a1d94a25a3 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1526,7 +1526,7 @@ export default { sql_result: 'Result', parse_filed: 'Parse Field', field_rename: 'Rename Field', - params_work: 'Effective only when editing SQL', + params_work: 'Effective only when editing: parameter values are effective only when editing data sets; Global Effective: It takes effect in dataset view, preview, and view where dataset is used.', sql_variable_limit_1: '1、SQL variables can only be used in where conditions', sql_variable_limit_2: '2、Example：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'', select_year: 'Select Year', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 72aaff7c3d..270e4b070e 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1520,7 +1520,7 @@ export default { sql_result: '運行結果', parse_filed: '解析字段', field_rename: '字段重命名', - params_work: '僅在編輯 sql 時生效', + params_work: '僅編輯時生效：參數值僅在數据集編輯時生效； 全域生效：在數据集查看、預覽、以及用到數据集的視圖中均生效。', sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用', sql_variable_limit_2: '2、示例：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'', selesql_variable_limit_2ct_year: '選擇年', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index cc809ef196..42736405a2 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1519,7 +1519,7 @@ export default { sql_result: '运行结果', parse_filed: '解析字段', field_rename: '字段重命名', - params_work: '仅在编辑sql时生效', + params_work: '仅编辑时生效：参数值仅在数据集编辑时生效；全局生效：在数据集查看、预览、以及用到数据集的视图中均生效。', select_year: '选择年', sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用', sql_variable_limit_2: '2、示例：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'', From 78c1c5259c650783a4941a41098c0f5c84fd0551 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 2 Mar 2023 16:37:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E7=B2=BE=E7=AE=80=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E5=AF=BC=E5=85=A5csv=E9=83=A8=E5=88=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/ExtractDataService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index a128f5627e..35651738da 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -757,7 +757,13 @@ public class ExtractDataService { List> csvData = new ArrayList<>(); String line; while ((line = reader.readLine()) != null) { - csvData.add(Arrays.asList(line.split(","))); + if(line.endsWith(",")){ + List list = new ArrayList<>(Arrays.asList(line.split(","))); + list.add(""); + csvData.add(list); + }else { + csvData.add(Arrays.asList(line.split(","))); + } } ExcelSheetData csvSheetData = new ExcelSheetData(); String[] fieldArray = fields.stream().map(TableField::getFieldName).toArray(String[]::new); From b94c2e5f473b0d34ae9d810d2ad7145696a3c692 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 2 Mar 2023 17:05:46 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix(=E5=BA=94=E7=94=A8):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BA=94=E7=94=A8=E4=B8=8D=E6=94=AF=E6=8C=81=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20#4686?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/panel/PanelAppTemplateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java index bd0b44d568..8311ea5a7d 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java @@ -363,7 +363,7 @@ public class PanelAppTemplateService { //替换datasetId chartViewField.setTableId(datasetsRealMap.get(chartViewField.getTableId())); //替换chartViewId - chartViewField.setChartId(chartViewsRealMap.get(chartViewField.getId())); + chartViewField.setChartId(chartViewsRealMap.get(chartViewField.getChartId())); //替换datasetFieldId datasetFieldsRealMap.forEach((k, v) -> { chartViewField.setOriginName(chartViewField.getOriginName().replaceAll(k, v)); From c8c9af70960aaee3dc88d718712487636be4373b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 6 Mar 2023 13:49:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20SQL=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E5=9C=A8=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E6=97=B6=E5=B8=A6=E5=85=A5=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartViewService.java | 2 +- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 940aad20ac..559f63cfb6 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -1846,7 +1846,7 @@ public class ChartViewService { } } } - sql = dataSetTableService.handleVariableDefaultValue(sql, table.getSqlVariableDetails(), ds.getType()); + sql = dataSetTableService.handleVariableDefaultValue(sql, null, ds.getType()); return sql; } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index a1d94a25a3..86623f3306 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1520,7 +1520,7 @@ export default { }, dataset: { scope_edit: 'Effective only when editing', - scope_all: 'Global effective', + scope_all: 'Effect globally when the dataset is previewed', spend_time: 'Spend', sql: 'SQL', sql_result: 'Result', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 270e4b070e..83d8445394 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1514,7 +1514,7 @@ export default { }, dataset: { scope_edit: '僅編輯時生效', - scope_all: '全域生效', + scope_all: '數据集預覽時全域生效', spend_time: '耗時', sql: 'SQL 語句', sql_result: '運行結果', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 42736405a2..d4851c1e17 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1513,7 +1513,7 @@ export default { }, dataset: { scope_edit: '仅编辑时生效', - scope_all: '全局生效', + scope_all: '数据集预览时全局生效', spend_time: '耗时', sql: 'SQL 语句', sql_result: '运行结果', From b8eead37f7e426ac72c171c94f849587a07b7c7c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 6 Mar 2023 15:32:28 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8C=E6=8C=87=E5=AE=9A=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/UpdateInfo.vue | 6 ++++-- frontend/src/views/dataset/data/UpdateRecords.vue | 5 +++-- frontend/src/views/system/task/Form.vue | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 6cd42c83ed..0d13f46cd1 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -574,7 +574,7 @@ export default { startTime: '', rate: 'SIMPLE', cron: '', - endTime: '', + endTime: 0, end: '0', extraData: { simple_cron_type: 'hour', @@ -779,6 +779,7 @@ export default { this.taskForm.name = this.table.name + ' ' + this.$t('dataset.task_update') this.taskForm.startTime = new Date() + this.taskForm.endTime = new Date() this.update_task_dialog_title = this.$t('dataset.task_add_title') } else { // update @@ -908,6 +909,7 @@ export default { } this.incrementalConfig.tableId = this.table.id task.startTime = new Date(task.startTime).getTime() + console.log(task.endTime) task.endTime = new Date(task.endTime).getTime() task.tableId = this.table.id const form = JSON.parse(JSON.stringify(task)) @@ -1030,7 +1032,7 @@ export default { onRateChange() { if (this.taskForm.rate === 'SIMPLE') { this.taskForm.end = '0' - this.taskForm.endTime = '' + this.taskForm.endTime = 0 this.taskForm.cron = '' this.showCron = false } diff --git a/frontend/src/views/dataset/data/UpdateRecords.vue b/frontend/src/views/dataset/data/UpdateRecords.vue index 3e6fa82ebe..c3a0ed622d 100644 --- a/frontend/src/views/dataset/data/UpdateRecords.vue +++ b/frontend/src/views/dataset/data/UpdateRecords.vue @@ -530,7 +530,7 @@ export default { startTime: '', rate: 'SIMPLE', cron: '', - endTime: '', + endTime: 0, end: '0', extraData: { simple_cron_type: 'hour', @@ -707,6 +707,7 @@ export default { this.resetTaskForm() this.taskForm.name = this.table.name + ' ' + this.$t('dataset.task_update') this.taskForm.startTime = new Date() + this.taskForm.endTime = new Date() this.update_task_dialog_title = this.$t('dataset.task_add_title') } else { this.taskForm = JSON.parse(JSON.stringify(task)) @@ -854,7 +855,7 @@ export default { onRateChange() { if (this.taskForm.rate === 'SIMPLE') { this.taskForm.end = '0' - this.taskForm.endTime = '' + this.taskForm.endTime = 0 this.taskForm.cron = '' } if (this.taskForm.rate === 'SIMPLE_CRON') { diff --git a/frontend/src/views/system/task/Form.vue b/frontend/src/views/system/task/Form.vue index 82f3b62848..36d506bce0 100644 --- a/frontend/src/views/system/task/Form.vue +++ b/frontend/src/views/system/task/Form.vue @@ -295,7 +295,7 @@ export default { tableId: '', rate: 'SIMPLE', cron: '', - endTime: '', + endTime: 0, end: '0', extraData: { simple_cron_type: 'hour', @@ -391,6 +391,7 @@ export default { this.taskDetail = { datasetName, id, tableId } if (!id) { this.taskForm.startTime = new Date() + this.taskForm.endTime = new Date() return } this.getTaskDetail(id) @@ -418,7 +419,7 @@ export default { onRateChange() { if (this.taskForm.rate === 'SIMPLE') { this.taskForm.end = '0' - this.taskForm.endTime = '' + this.taskForm.endTime = 0 this.taskForm.cron = '' this.showCron = false } From 2df341897ca2574dee9857bc07634be835cde76f Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 6 Mar 2023 15:45:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=97=B6=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetTableService.java | 3 +++ backend/src/main/resources/i18n/messages_en_US.properties | 1 + backend/src/main/resources/i18n/messages_zh_CN.properties | 1 + backend/src/main/resources/i18n/messages_zh_TW.properties | 1 + 4 files changed, 6 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index c6c75b97ed..afa591b348 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2264,6 +2264,9 @@ public class DataSetTableService { } Set nameSet = new HashSet<>(); for (DataSetTableRequest table : datasetTable) { + if(StringUtils.isEmpty(table.getName())){ + throw new RuntimeException(Translator.get("I18n_name_cant_empty")); + } nameSet.add(table.getName()); } if (nameSet.size() != datasetTable.size()) { diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 3e0774c086..9f52ae39b0 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -272,3 +272,4 @@ I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=Default template only screenshot \u8FB9\u68468=Border 8 \u8FB9\u68469=Border 9 \u8FB9\u684610=Border 10 +I18n_name_cant_empty=Name can not be empty! \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 4016b32f2f..7634ab45ad 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -262,4 +262,5 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650 I18N_CRON_ERROR=cron\u8868\u8FBE\u5F0F\u9519\u8BEF I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8BA4\u6A21\u677F(\u52A0\u53C2\u6570\u6837\u5F0F) I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8BA4\u6A21\u677F(\u53EA\u622A\u56FE) +I18n_name_cant_empty=名称不能为空！ diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index e9041808b6..fe4718a71d 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -268,3 +268,4 @@ I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8A8D\u6A21\u677F(\u53EA\u622A\u5716) \u8FB9\u68468=\u908A\u6846 8 \u8FB9\u68469=\u908A\u6846 9 \u8FB9\u684610=\u908A\u6846 10 +I18n_name_cant_empty=名稱不能為空！ \ No newline at end of file From 7fc5106c5383f50db10d7cd8bb5406d2fe938c7d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 7 Mar 2023 11:31:29 +0800 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 8 ++++---- frontend/package.json | 2 +- frontend/pom.xml | 2 +- mobile/package.json | 2 +- mobile/pom.xml | 2 +- pom.xml | 6 +++++- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 624cc12ee6..321cd4ffcd 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ dataease-server io.dataease - 1.18.4 + ${dataease.version} 4.0.0 @@ -204,7 +204,7 @@ io.dataease dataease-plugin-interface - 1.18.4 + ${dataease.version} guava @@ -215,12 +215,12 @@ io.dataease dataease-plugin-view - 1.18.4 + ${dataease.version} io.dataease dataease-plugin-datasource - 1.18.4 + ${dataease.version} diff --git a/frontend/package.json b/frontend/package.json index d24e88ba55..9e1a52ee7c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "dataease", - "version": "1.18.4", + "version": "1.18.5", "description": "dataease front", "private": true, "scripts": { diff --git a/frontend/pom.xml b/frontend/pom.xml index 20bf7b361b..73f8cb5587 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -6,7 +6,7 @@ dataease-server io.dataease - 1.18.4 + ${dataease.version} 4.0.0 diff --git a/mobile/package.json b/mobile/package.json index 51f483e43b..7817f9bb01 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -1,6 +1,6 @@ { "name": "dataease-mobile", - "version": "1.18.4", + "version": "1.18.5", "private": true, "scripts": { "serve": "npm run dev:h5", diff --git a/mobile/pom.xml b/mobile/pom.xml index 3cfaae85d2..45b241d913 100644 --- a/mobile/pom.xml +++ b/mobile/pom.xml @@ -6,7 +6,7 @@ dataease-server io.dataease - 1.18.4 + ${dataease.version} 4.0.0 diff --git a/pom.xml b/pom.xml index c9eebe174c..690f74bc60 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.dataease dataease-server - 1.18.4 + ${dataease.version} pom @@ -15,6 +15,10 @@ + + 1.18.5 + + dataease