From 4cbb74855e600c84b74277e498d0b49526340b5d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 28 Jul 2021 14:39:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AE=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/form.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue index 25b1887457..8b720968d2 100644 --- a/frontend/src/views/system/user/form.vue +++ b/frontend/src/views/system/user/form.vue @@ -93,7 +93,7 @@ export default { rule: { username: [ { required: true, message: this.$t('user.input_id'), trigger: 'blur' }, - { min: 1, max: 50, message: this.$t('commons.input_limit', [1, 50]), trigger: 'blur' }, + { min: 2, max: 10, message: this.$t('commons.input_limit', [2, 10]), trigger: 'blur' }, { required: true, pattern: '^[^\u4e00-\u9fa5]+$', @@ -103,7 +103,7 @@ export default { ], nickName: [ { required: true, message: this.$t('user.input_name'), trigger: 'blur' }, - { min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur' }, + { min: 2, max: 10, message: this.$t('commons.input_limit', [2, 10]), trigger: 'blur' }, { required: true, message: this.$t('user.special_characters_are_not_supported'), From d95b995b41e7b12a3ab0b6d6461373b32b7673ba Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 28 Jul 2021 15:23:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?test:=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=96=E8=BE=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 10 ++++++++-- frontend/src/views/dataset/data/FieldEdit.vue | 7 ++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 2bccf7f778..4b0f131a3c 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -507,14 +507,20 @@ - + +
+ + {{ $t('dataset.field_manage') }} + [{{ table.name }}] + + {{ $t('chart.close') }} +
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index 0647d94a02..65d9266e0a 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -16,7 +16,7 @@ {{ $t('dataset.add_calc_field') }} - +
@@ -324,10 +325,6 @@ export default { }) }, - closeEdit() { - this.$emit('switchComponent', { name: 'ViewTable', param: this.param }) - }, - dqTrans(item, val) { if (val === 'd') { item.groupType = 'q' From 7cc006fe4ae3755afef2c47ea0eac51be70f667d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Jul 2021 16:41:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dexcel=20=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2/=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/ExtractDataService.java | 59 +++++++------------ frontend/src/views/dataset/add/AddExcel.vue | 2 +- .../src/views/dataset/data/UpdateInfo.vue | 47 +++++++-------- 3 files changed, 47 insertions(+), 61 deletions(-) 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 593f12c13a..e49ee0bfa4 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -267,6 +267,9 @@ public class ExtractDataService { }); String dorisTablColumnSql = createDorisTablColumnSql(datasetTableFields); + boolean msg = false; + JobStatus jobStatus = JobStatus.Completed; + Long execTime = null; switch (updateType) { case all_scope: // 全量更新 try { @@ -281,29 +284,22 @@ public class ExtractDataService { } else { generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()))); } - Long execTime = System.currentTimeMillis(); + execTime = System.currentTimeMillis(); extractData(datasetTable, "all_scope"); replaceTable(DorisTableUtils.dorisName(datasetTableId)); saveSucessLog(datasetTableTaskLog); - - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, true); - - deleteFile("all_scope", datasetTableId); - - updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed); - + msg = true; + jobStatus = JobStatus.Completed; } catch (Exception e) { saveErrorLog(datasetTableId, taskId, e); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error); - - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,false); - updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); - dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); - deleteFile("all_scope", datasetTableId); + msg = false; + jobStatus = JobStatus.Error; } finally { + try { deleteFile("all_scope", datasetTableId); }catch (Exception ignore){} + try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){} + try { dataSetTableTaskService.updateTaskStatus(datasetTableTask, jobStatus); }catch (Exception ignore){} + try { updateTableStatus(datasetTableId, datasetTable, jobStatus, execTime); }catch (Exception ignore){} + try { dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); }catch (Exception ignore){} } break; @@ -323,7 +319,7 @@ public class ExtractDataService { if (datasetTableTask == null ) { datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, taskId); } - Long execTime = System.currentTimeMillis(); + execTime = System.currentTimeMillis(); if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加 String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString()) .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); @@ -341,28 +337,17 @@ public class ExtractDataService { } saveSucessLog(datasetTableTaskLog); - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,true); - - deleteFile("incremental_add", datasetTableId); - deleteFile("incremental_delete", datasetTableId); - - updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed); + msg = true; + jobStatus = JobStatus.Completed; } catch (Exception e) { saveErrorLog(datasetTableId, taskId, e); - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,false); - updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error); - - deleteFile("incremental_add", datasetTableId); - deleteFile("incremental_delete", datasetTableId); + msg = false; + jobStatus = JobStatus.Error; } finally { - if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { - datasetTableTask.setStatus(TaskStatus.Stopped.name()); - dataSetTableTaskService.update(datasetTableTask); - } + try { deleteFile("incremental_add", datasetTableId); deleteFile("incremental_delete", datasetTableId); }catch (Exception ignore){} + try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){} + try { dataSetTableTaskService.updateTaskStatus(datasetTableTask, jobStatus); }catch (Exception ignore){} + try { updateTableStatus(datasetTableId, datasetTable, jobStatus, execTime); }catch (Exception ignore){} } break; } diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index c7aee57a3e..b777f543ba 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -270,7 +270,7 @@ export default { type: 'excel', mode: parseInt(this.mode), // info: '{"data":"' + this.path + '"}', - info: JSON.stringify({ data: this.path }), + info: JSON.stringify({ data: this.path, sheets: [this.sheets[0]] }), editType: this.param.editType ? this.param.editType : 0 } } diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 0b8fd0351b..1ba0a51c7f 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -1,7 +1,7 @@