From 0bb4c9da530eddb9b6d67ac8bccf676a3aca9b61 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 9 Nov 2021 12:13:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=AD=97=E6=AE=B5=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 2 +- frontend/src/lang/en.js | 5 +++- frontend/src/lang/tw.js | 5 +++- frontend/src/lang/zh.js | 5 +++- frontend/src/views/dataset/data/FieldEdit.vue | 25 ++++++++++++++++++- frontend/src/views/dataset/data/ViewTable.vue | 2 +- 6 files changed, 38 insertions(+), 6 deletions(-) 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 44cda67e50..493620a248 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1080,7 +1080,7 @@ public class DataSetTableService { } // delete 数据库中多余的字段 DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); - datasetTableFieldExample.createCriteria().andTableIdEqualTo(datasetTable.getId()).andOriginNameNotIn(originNameList); + datasetTableFieldExample.createCriteria().andTableIdEqualTo(datasetTable.getId()).andExtFieldEqualTo(0).andOriginNameNotIn(originNameList); datasetTableFieldMapper.deleteByExample(datasetTableFieldExample); } } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index b2bda6876f..35919772e3 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1144,7 +1144,10 @@ export default { field_name_less_50: 'Field name can not more 50 chars.', excel_info_1: '1、Merged cells cannot exist in the file；', excel_info_2: '2、The first line of the file is the title line, which cannot be empty or date；', - excel_info_3: '3、The file size shall not exceed 500m。' + excel_info_3: '3、The file size shall not exceed 500m。', + sync_field: 'Sync Field', + confirm_sync_field: 'Confirm Sync', + confirm_sync_field_tips: 'Sync field maybe change edit field，please confirm' }, datasource: { datasource: 'Data Source', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index b09d94b92f..5382d3e984 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1145,7 +1145,10 @@ export default { field_name_less_50: '字段名不能超過50個字符', excel_info_1: '1、文件終不能存在合併單元格；', excel_info_2: '2、文件的第一行為標題行，不能為空，不能為日期；', - excel_info_3: '3、文件不超過500M。' + excel_info_3: '3、文件不超過500M。', + sync_field: '同步字段', + confirm_sync_field: '確認同步', + confirm_sync_field_tips: '同步字段可能會導致已編輯字段發生變更，請確認' }, datasource: { datasource: '數據源', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 684515a3b6..a1bf6f030b 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1148,7 +1148,10 @@ export default { field_name_less_50: '字段名不能超过50个字符', excel_info_1: '1、文件中不能存在合并单元格；', excel_info_2: '2、文件的第一行为标题行，不能为空，不能为日期型；', - excel_info_3: '3、Excel文件大小请确保在500M以内。' + excel_info_3: '3、Excel文件大小请确保在500M以内。', + sync_field: '同步字段', + confirm_sync_field: '确认同步', + confirm_sync_field_tips: '同步字段可能会导致已编辑字段发生变更，请确认' }, datasource: { datasource: '数据源', diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index 41eb9070a5..2a4b01aa29 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -15,6 +15,7 @@ {{ $t('dataset.add_calc_field') }} + {{ $t('dataset.sync_field') }} { }) + }, + + syncField() { + this.$confirm(this.$t('dataset.confirm_sync_field_tips'), this.$t('dataset.confirm_sync_field'), { + confirmButtonText: this.$t('chart.confirm'), + cancelButtonText: this.$t('chart.cancel'), + type: 'warning' + }).then(() => { + this.isSyncField = true + post('/dataset/table/syncField/' + this.param.id, null).then(response => { + setTimeout(() => { + this.isSyncField = false + this.initField() + }, 500) + }) + }).catch(() => { + }) } } } diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index c60d7c8d53..32eafed33c 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -51,7 +51,7 @@ - +