From 47a290b258ef370260616142838d19c663360ba3 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 19 Sep 2022 18:16:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=BA=94=E7=94=A8=E5=B8=82=E5=9C=BA):=20?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=B8=82=E5=9C=BA=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E7=AD=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/panel/PanelGroupService.java | 5 ----- frontend/src/lang/zh.js | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 68ce807eeb..c5b4ee8b67 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -9,20 +9,16 @@ import io.dataease.commons.constants.*; import io.dataease.commons.utils.*; import io.dataease.controller.request.authModel.VAuthModelRequest; import io.dataease.controller.request.dataset.DataSetTableRequest; - import io.dataease.controller.request.panel.*; - import io.dataease.dto.DatasourceDTO; import io.dataease.dto.PanelGroupExtendDataDTO; import io.dataease.dto.SysLogDTO; import io.dataease.dto.authModel.VAuthModelDTO; -import io.dataease.dto.chart.ChartGroupDTO; import io.dataease.dto.chart.ChartViewDTO; import io.dataease.dto.dataset.DataSetGroupDTO; import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.panel.PanelExport2App; -import io.dataease.dto.panel.PanelGroupAppInfo; import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.dto.panel.PanelTemplateFileDTO; import io.dataease.dto.panel.po.PanelViewInsertDTO; @@ -33,7 +29,6 @@ import io.dataease.listener.util.CacheUtils; import io.dataease.plugins.common.base.domain.*; import io.dataease.plugins.common.base.mapper.*; import io.dataease.plugins.common.constants.DeTypeConstants; -import io.dataease.plugins.common.dto.dataset.SqlVariableDetails; import io.dataease.service.chart.ChartGroupService; import io.dataease.service.chart.ChartViewService; import io.dataease.service.dataset.DataSetGroupService; diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 14e91bc5ae..126c0494c6 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -832,11 +832,11 @@ export default { import_succeeded: '导入成功', name_already_exists_type: '分类名称已存在', rename_succeeded: '重命名成功', - the_same_category: '同一分类下，该模版名称已存在', - delete_this_template: '确定删除该模版吗？', - also_be_deleted: '删除后，该分类中所有的模版也将被删除。', + the_same_category: '同一分类下，该模板名称已存在', + delete_this_template: '确定删除该模板吗？', + also_be_deleted: '删除后，该分类中所有的模板也将被删除。', delete_this_category: '确定删除该分类吗？', - edit_template: '编辑模版', + edit_template: '编辑模板', edit_classification: '编辑分类', classification_name: '分类名称', by_event_details: '通过事件详情搜索',