From da1d0b8282dbb9e249694aa2d974c6f7f2b76def Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 29 Dec 2021 16:11:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=B8=8B=E9=92=BB=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 4 ++++ backend/src/main/resources/i18n/messages_en_US.properties | 3 ++- backend/src/main/resources/i18n/messages_zh_CN.properties | 3 ++- backend/src/main/resources/i18n/messages_zh_TW.properties | 8 ++++---- 4 files changed, 12 insertions(+), 6 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 217c8c8374..3e099349e6 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -8,6 +8,7 @@ import io.dataease.base.mapper.ext.ExtChartGroupMapper; import io.dataease.base.mapper.ext.ExtChartViewMapper; import io.dataease.commons.constants.CommonConstants; import io.dataease.commons.constants.JdbcConstants; +import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.CommonBeanFactory; @@ -303,6 +304,9 @@ public class ChartViewService { if (StringUtils.equalsIgnoreCase(dto.getId(), chartViewFieldDTO.getId())) { isDrill = true; DatasetTableField datasetTableField = dataSetTableFieldsService.get(dto.getId()); + if (ObjectUtils.isNotEmpty(datasetTableField)) { + DEException.throwException(Translator.get("i18n_drill_field_not_exist")); + } ChartViewFieldDTO d = new ChartViewFieldDTO(); BeanUtils.copyBean(d, datasetTableField); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 8a7ed5cdd5..57c4b37ecc 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -297,4 +297,5 @@ i18n_invalid_ds=Invalid Datasource 任务管理=Task Manager 数据同步=Data Sync 定时报告=Regular report -i18n_rp_exist=Row permission of the same type already exists \ No newline at end of file +i18n_rp_exist=Row permission of the same type already exists +i18n_drill_field_not_exist=Drill field changed，please delete and add again \ 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 10b984dd9d..6fc6b77c23 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -296,4 +296,5 @@ i18n_invalid_ds=无效数据源 任务管理=任务管理 数据同步=数据同步 定时报告=定时报告 -i18n_rp_exist=已有同类型的行权限存在 \ No newline at end of file +i18n_rp_exist=已有同类型的行权限存在 +i18n_drill_field_not_exist=下钻字段发生变更，请删除字段重新添加 \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 1cff76bac6..db6b6df1a0 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -160,7 +160,6 @@ license_valid_license_error=授權驗證失敗 license_valid_license_code=授權碼已經存在 import_xmind_count_error=思維導圖導入用例數量不能超過 500 條 import_xmind_not_found=未找到測試用例 - test_review_task_notice=測試評審任務通知 test_track.length_less_than=標題過長，字數必須小於 # check owner @@ -237,7 +236,7 @@ i18n_chart_count=記錄數* i18n_excel_have_merge_region=Excel存在合並單元格 i18n_cron_expression_error=Cron表達式校驗錯誤 i18n_same_folder_can_not_repeat=同一目錄下該名稱已被使用 -i18n_select_diff_folder= 请选择不同的目录 +i18n_select_diff_folder=请选择不同的目录 i18n_default_panel=默認儀表板 i18n_panel_list=儀表板 i18n_processing_data=正在處理數據，稍後刷新 @@ -253,7 +252,7 @@ i18n_sync_job_exists=已經有同步任務在運行，稍後重試 i18n_datasource_check_fail=校驗失敗，請檢查配置信息 i18n_not_find_user=未找到用戶 i18n_sql_not_empty=SQL 不能為空 -i18n_datasource_not_allow_delete_msg= 個數據集正在使用此數據源，無法刪除 +i18n_datasource_not_allow_delete_msg=個數據集正在使用此數據源，無法刪除 i18n_task_name_repeat=同一數據集下任務名稱已被使用 i18n_id_or_pwd_error=無效的ID或密碼 i18n_datasource_delete=當前用到的數據源已被刪除 @@ -299,4 +298,5 @@ i18n_invalid_ds=無效數據源 任务管理=任務管理 数据同步=數據同步 定时报告=定時報告 -i18n_rp_exist=已有同類型餓行權限存在 \ No newline at end of file +i18n_rp_exist=已有同類型餓行權限存在 +i18n_drill_field_not_exist=下鉆字段發生變更，請刪除字段重新添加 \ No newline at end of file From 37e98ea808364eb5bb2f45c3c7af7966e4a21495 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 29 Dec 2021 16:13:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=B8=8B=E9=92=BB=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartViewService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3e099349e6..9800e5a318 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -304,7 +304,7 @@ public class ChartViewService { if (StringUtils.equalsIgnoreCase(dto.getId(), chartViewFieldDTO.getId())) { isDrill = true; DatasetTableField datasetTableField = dataSetTableFieldsService.get(dto.getId()); - if (ObjectUtils.isNotEmpty(datasetTableField)) { + if (ObjectUtils.isEmpty(datasetTableField)) { DEException.throwException(Translator.get("i18n_drill_field_not_exist")); } ChartViewFieldDTO d = new ChartViewFieldDTO(); From be94b177a03d244c895e98e3efb8bb41000238ca Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 29 Dec 2021 16:41:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/custom-component/UserView.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index b1d40b3a97..e295bacb13 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -213,7 +213,9 @@ export default { jumpCount++ } }) - jumpCount && trackMenuInfo.push('jump') + if (this.scaleCoefficientType === 'pc') { + jumpCount && trackMenuInfo.push('jump') + } linkageCount && trackMenuInfo.push('linkage') this.drillFields.length && trackMenuInfo.push('drill') return trackMenuInfo From 97d78aca86f19da26007cd97b17c2ccae0bbec40 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 29 Dec 2021 18:05:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/Editor/Preview.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index ea0b1fa68a..55672ef572 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -40,7 +40,6 @@