From 017490cbb34874e7950a7285ee4e8acdaa1b9af0 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Mon, 4 Mar 2024 17:08:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E7=BB=9F=E4=B8=80=E5=AE=9A=E4=B9=89=E4=B8=BA=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/chart/constant/ChartConstants.java | 2 +- .../dataease/chart/manage/ChartDataManage.java | 6 +++--- .../dataease/chart/manage/ChartViewManege.java | 2 +- .../dao/auto/entity/CoreDatasetTableField.java | 4 ++-- .../dataset/manage/DatasetDataManage.java | 2 +- .../dao/auto/entity/VisualizationLinkJump.java | 4 ++-- .../dao/auto/entity/VisualizationLinkage.java | 6 +++--- .../auto/entity/VisualizationLinkageField.java | 6 +++--- .../VisualizationTemplateExtendDataManage.java | 2 +- .../server/DataVisualizationServer.java | 16 ++++++++-------- .../main/resources/db/desktop/V2.0__core_ddl.sql | 10 +++++----- .../db/desktop/V2.2__update_table_desc_ddl.sql | 12 ++++++------ .../resources/db/migration/V2.0__core_ddl.sql | 10 +++++----- .../db/migration/V2.2__update_table_desc_ddl.sql | 12 ++++++------ .../main/resources/i18n/core_zh_CN.properties | 2 +- core/core-frontend/src/api/chart.ts | 6 +++--- .../data-visualization/canvas/CanvasCore.vue | 2 +- .../src/components/visualization/LinkJumpSet.vue | 6 +++--- .../src/components/visualization/LinkageSet.vue | 4 ++-- .../src/components/visualization/SettingMenu.vue | 4 ++-- .../src/components/visualization/linkJump.vue | 2 +- .../src/models/chart/chart-attr.d.ts | 4 ++-- .../src/models/chart/chart-style.d.ts | 4 ++-- core/core-frontend/src/models/chart/chart.d.ts | 4 ++-- core/core-frontend/src/models/chart/editor.d.ts | 2 +- .../store/modules/data-visualization/dvMain.ts | 2 +- .../store/modules/data-visualization/snapshot.ts | 4 ++-- .../editor/common/ChartTemplateInfo.vue | 2 +- .../editor-style/components/TooltipSelector.vue | 4 ++-- .../src/views/chart/components/editor/index.vue | 4 ++-- .../views/chart/components/editor/util/chart.ts | 2 +- .../components/js/panel/charts/liquid/liquid.ts | 2 +- .../js/panel/charts/others/indicator.ts | 2 +- .../js/panel/charts/others/rich-text.ts | 2 +- .../src/views/chart/components/js/panel/index.ts | 2 +- .../components/js/panel/types/impl/g2plot.ts | 14 +++++++------- .../chart/components/js/panel/types/index.ts | 10 +++++----- .../views/components/ChartComponentG2Plot.vue | 4 ++-- .../views/components/ChartComponentS2.vue | 2 +- .../src/views/chart/components/views/index.vue | 6 +++--- .../src/views/workbranch/JumpLinkageBack.vue | 2 +- .../java/io/dataease/api/chart/ChartDataApi.java | 4 ++-- .../java/io/dataease/api/chart/ChartViewApi.java | 10 +++++----- .../dataease/api/chart/dto/ChartViewBaseDTO.java | 4 ++-- .../api/chart/dto/ChartViewFieldBaseDTO.java | 2 +- .../io/dataease/api/dataset/DatasetTableApi.java | 4 ++-- .../api/dataset/union/model/SQLMeta.java | 2 +- .../visualization/VisualizationLinkJumpApi.java | 2 +- .../dto/VisualizationLinkJumpDTO.java | 2 +- .../dto/VisualizationLinkageDTO.java | 6 +++--- .../visualization/vo/DataVisualizationVO.java | 4 ++-- .../vo/VisualizationLinkJumpVO.java | 2 +- .../vo/VisualizationLinkageFieldVO.java | 4 ++-- .../visualization/vo/VisualizationLinkageVO.java | 4 ++-- .../vo/VisualizationViewTableVO.java | 2 +- .../io/dataease/constant/CommonConstants.java | 8 ++++---- .../main/java/io/dataease/doc/SwaggerConfig.java | 2 +- .../dto/dataset/DatasetTableFieldDTO.java | 2 +- 58 files changed, 131 insertions(+), 131 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/constant/ChartConstants.java b/core/core-backend/src/main/java/io/dataease/chart/constant/ChartConstants.java index 18b0c4117c..16ff1fe8df 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/constant/ChartConstants.java +++ b/core/core-backend/src/main/java/io/dataease/chart/constant/ChartConstants.java @@ -11,7 +11,7 @@ public class ChartConstants { public static final String MONTH_YOY = "month_yoy"; public static final String[] M_Y = {YEAR_MOM, MONTH_MOM, YEAR_YOY, DAY_MOM, MONTH_YOY}; - //视图数据查询模式 + //图表数据查询模式 public static final class VIEW_RESULT_MODE { // 所有 diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 28dd66595c..48e98818ef 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -82,7 +82,7 @@ public class ChartDataManage { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_chart_delete")); } - //如果是excel导出 则最多导出20万条； 如果是从仪表板获取视图数据，则仪表板的查询模式，查询结果的数量，覆盖视图对应的属性 + //如果是excel导出 则最多导出20万条； 如果是从仪表板获取图表数据，则仪表板的查询模式，查询结果的数量，覆盖图表对应的属性 if (view.getIsExcelExport()) { view.setResultMode(ChartConstants.VIEW_RESULT_MODE.CUSTOM); view.setResultCount(200000); @@ -482,7 +482,7 @@ public class ChartDataManage { List detailFieldList = new ArrayList<>(); String detailFieldSql = null; List detailData = new ArrayList<>(); - //如果不是插件视图 走原生逻辑 + //如果不是插件图表 走原生逻辑 if (table.getMode() == 0) {// 直连 if (ObjectUtils.isEmpty(dsMap)) { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_datasource_delete")); @@ -1268,7 +1268,7 @@ public class ChartDataManage { List data = new ArrayList<>(); String querySql = null; - //如果不是插件视图 走原生逻辑 + //如果不是插件图表 走原生逻辑 if (table.getMode() == 0) {// 直连 if (ObjectUtils.isEmpty(dsMap)) { DEException.throwException(Translator.get("i18n_datasource_delete")); diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index c6db2fc49a..a1e7e80ab8 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -128,7 +128,7 @@ public class ChartViewManege { datasetTableFieldDTOS.add(createCountField(id)); List list = transFieldDTO(datasetTableFieldDTOS); - // 获取视图计算字段 + // 获取图表计算字段 wrapper.clear(); wrapper.eq("chart_id", chartId); List chartFields = coreDatasetTableFieldMapper.selectList(wrapper).stream().map(ele -> { diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java index 795422c782..38f51af146 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** *

- * + * *

* * @author fit2cloud @@ -37,7 +37,7 @@ public class CoreDatasetTableField implements Serializable { private Long datasetGroupId; /** - * 视图ID + * 图表ID */ private Long chartId; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index a3266f8db0..dbb5fa36d4 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -377,7 +377,7 @@ public class DatasetDataManage { DEException.throwException(Translator.get("i18n_no_field")); } List allFields = new ArrayList<>(); - // 根据视图计算字段，获取数据集 + // 根据图表计算字段，获取数据集 Long datasetGroupId; if (field.getDatasetGroupId() == null && field.getChartId() != null) { ChartViewDTO chart = chartViewManege.getChart(field.getChartId()); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJump.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJump.java index d028ab3a41..fcb342c786 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJump.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJump.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** *

- * + * *

* * @author fit2cloud @@ -24,7 +24,7 @@ public class VisualizationLinkJump implements Serializable { private Long sourceDvId; /** - * 源视图ID + * 源图表ID */ private Long sourceViewId; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkage.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkage.java index d0f0667218..26378f1524 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkage.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** *

- * + * *

* * @author fit2cloud @@ -21,12 +21,12 @@ public class VisualizationLinkage implements Serializable { private Long dvId; /** - * 源视图id + * 源图表id */ private Long sourceViewId; /** - * 联动视图id + * 联动图表id */ private Long targetViewId; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkageField.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkageField.java index 4bee8a3a10..56c6454fe8 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkageField.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkageField.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** *

- * + * *

* * @author fit2cloud @@ -24,12 +24,12 @@ public class VisualizationLinkageField implements Serializable { private Long linkageId; /** - * 源视图字段 + * 源图表字段 */ private Long sourceField; /** - * 目标视图字段 + * 目标图表字段 */ private Long targetField; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java index e6923d2260..93bab1cf86 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java @@ -33,7 +33,7 @@ public class VisualizationTemplateExtendDataManage { ChartViewDTO chartViewTemplate = JsonUtil.parseObject(extendDataList.get(0).getViewDetails(),ChartViewDTO.class); view.setData(chartViewTemplate.getData()); } else { - DEException.throwException("模板缓存数据中未获取指定视图数据：" + viewId); + DEException.throwException("模板缓存数据中未获取指定图表数据：" + viewId); } return view; } diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 7397c82bea..d969a742fa 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -107,7 +107,7 @@ public class DataVisualizationServer implements DataVisualizationApi { public DataVisualizationVO findById(Long dvId, String busiFlag) { DataVisualizationVO result = extDataVisualizationMapper.findDvInfo(dvId, busiFlag); if (result != null) { - //获取视图信息 + //获取图表信息 List chartViewDTOS = chartViewManege.listBySceneId(dvId); if (!CollectionUtils.isEmpty(chartViewDTOS)) { Map viewInfo = chartViewDTOS.stream().collect(Collectors.toMap(ChartViewDTO::getId, chartView -> chartView)); @@ -143,7 +143,7 @@ public class DataVisualizationServer implements DataVisualizationApi { } Long newDvId = coreVisualizationManage.innerSave(visualizationInfo); request.setId(newDvId); - //保存视图信 + //保存图表信息 chartDataManage.saveChartViewFromVisualization(request.getComponentData(), newDvId, request.getCanvasViewInfo()); return newDvId.toString(); } @@ -176,13 +176,13 @@ public class DataVisualizationServer implements DataVisualizationApi { } coreVisualizationManage.innerEdit(visualizationInfo); - //保存视图信 + //保存图表信息 chartDataManage.saveChartViewFromVisualization(request.getComponentData(), dvId, request.getCanvasViewInfo()); } /** * @Description: 更新基础信息； - * 为什么单独接口：1.基础信息更新频繁数据且数据载量较小；2.防止出现更新过多信息的情况，造成视图的误删等操作 + * 为什么单独接口：1.基础信息更新频繁数据且数据载量较小；2.防止出现更新过多信息的情况，造成图表的误删等操作 */ @DeLog(id = "#p0.id", ot = LogOT.MODIFY, stExp = "#p0.type") @Override @@ -227,7 +227,7 @@ public class DataVisualizationServer implements DataVisualizationApi { /** * @Description: 复制仪表板 - * 复制步骤 1.复制基础可视化数据；2.复制视图数据；3.附加数据（包括联动信息，跳转信息，外部参数信息等仪表板附加信息） + * 复制步骤 1.复制基础可视化数据；2.复制图表数据；3.附加数据（包括联动信息，跳转信息，外部参数信息等仪表板附加信息） */ @Transactional @Override @@ -241,7 +241,7 @@ public class DataVisualizationServer implements DataVisualizationApi { newDv.setId(newDvId); newDv.setPid(request.getPid()); newDv.setCreateTime(System.currentTimeMillis()); - // 复制视图 chart_view + // 复制图表 chart_view extDataVisualizationMapper.viewCopyWithDv(sourceDvId, newDvId, copyId); List viewList = extDataVisualizationMapper.findViewInfoByCopyId(copyId); if (!CollectionUtils.isEmpty(viewList)) { @@ -252,10 +252,10 @@ public class DataVisualizationServer implements DataVisualizationApi { } newDv.setComponentData(componentData); } - // 复制视图联动信息 + // 复制图表联动信息 extDataVisualizationMapper.copyLinkage(copyId); extDataVisualizationMapper.copyLinkageField(copyId); - // 复制视图跳转信息 + // 复制图表跳转信息 extDataVisualizationMapper.copyLinkJump(copyId); extDataVisualizationMapper.copyLinkJumpInfo(copyId); extDataVisualizationMapper.copyLinkJumpTargetInfo(copyId); diff --git a/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql index 0f6c23dd7e..b1c72a94d1 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql @@ -4098,7 +4098,7 @@ CREATE TABLE `visualization_link_jump` ( `id` bigint NOT NULL, `source_dv_id` bigint DEFAULT NULL COMMENT '源仪表板ID', - `source_view_id` bigint DEFAULT NULL COMMENT '源视图ID', + `source_view_id` bigint DEFAULT NULL COMMENT '源图表ID', `link_jump_info` varchar(4000) DEFAULT NULL COMMENT '跳转信息', `checked` tinyint(1) DEFAULT NULL COMMENT '是否启用', `copy_from` bigint DEFAULT NULL, @@ -4152,8 +4152,8 @@ CREATE TABLE `visualization_linkage` ( `id` bigint NOT NULL, `dv_id` bigint DEFAULT NULL, - `source_view_id` bigint DEFAULT NULL COMMENT '源视图id', - `target_view_id` bigint DEFAULT NULL COMMENT '联动视图id', + `source_view_id` bigint DEFAULT NULL COMMENT '源图表id', + `target_view_id` bigint DEFAULT NULL COMMENT '联动图表id', `update_time` bigint DEFAULT NULL COMMENT '更新时间', `update_people` varchar(255) DEFAULT NULL COMMENT '更新人', `linkage_active` tinyint(1) DEFAULT '0' COMMENT '是否启用关联', @@ -4172,8 +4172,8 @@ CREATE TABLE `visualization_linkage_field` ( `id` bigint NOT NULL, `linkage_id` bigint DEFAULT NULL COMMENT '联动ID', - `source_field` bigint DEFAULT NULL COMMENT '源视图字段', - `target_field` bigint DEFAULT NULL COMMENT '目标视图字段', + `source_field` bigint DEFAULT NULL COMMENT '源图表字段', + `target_field` bigint DEFAULT NULL COMMENT '目标图表字段', `update_time` bigint DEFAULT NULL COMMENT '更新时间', `copy_from` bigint DEFAULT NULL, `copy_id` bigint DEFAULT NULL, diff --git a/core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql index 86ec02bbac..7d22e5fce8 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.2__update_table_desc_ddl.sql @@ -25,7 +25,7 @@ COMMENT ON TABLE `area` COMMENT ON TABLE `core_area_custom` IS '自定义地图区域信息表'; COMMENT ON TABLE `core_chart_view` - IS '组件视图表'; + IS '组件图表表'; COMMENT ON TABLE `core_dataset_group` IS '数据集分组表'; COMMENT ON TABLE `core_dataset_table` @@ -68,7 +68,7 @@ COMMENT ON TABLE `visualization_link_jump` COMMENT ON TABLE `visualization_link_jump_info` IS '跳转配置表'; COMMENT ON TABLE `visualization_link_jump_target_view_info` - IS '跳转目标仪表板视图字段配置表'; + IS '跳转目标仪表板图表字段配置表'; COMMENT ON TABLE `visualization_linkage` IS '联动记录表'; COMMENT ON TABLE `visualization_linkage_field` @@ -76,7 +76,7 @@ COMMENT ON TABLE `visualization_linkage_field` COMMENT ON TABLE `visualization_subject` IS '主题表'; COMMENT ON TABLE `visualization_template_extend_data` - IS '模板视图明细信息表'; + IS '模板图表明细信息表'; ALTER TABLE `core_dataset_group` MODIFY COLUMN `qrtz_instance` varchar(1024) NULL DEFAULT NULL COMMENT 'Quartz 实例 ID'; @@ -160,7 +160,7 @@ ALTER TABLE `visualization_link_jump_target_view_info` ALTER TABLE `visualization_link_jump_target_view_info` MODIFY COLUMN `link_jump_info_id` bigint(0) NULL DEFAULT NULL COMMENT 'visualization_link_jump_info 表的 ID'; ALTER TABLE `visualization_link_jump_target_view_info` - MODIFY COLUMN `target_view_id` bigint(0) NULL DEFAULT NULL COMMENT '目标视图ID'; + MODIFY COLUMN `target_view_id` bigint(0) NULL DEFAULT NULL COMMENT '目标图表ID'; ALTER TABLE `visualization_link_jump_target_view_info` MODIFY COLUMN `target_field_id` bigint(0) NULL DEFAULT NULL COMMENT '目标字段ID'; ALTER TABLE `visualization_link_jump_target_view_info` @@ -199,9 +199,9 @@ ALTER TABLE `visualization_template_extend_data` ALTER TABLE `visualization_template_extend_data` MODIFY COLUMN `dv_id` bigint(0) NULL DEFAULT NULL COMMENT '模板ID'; ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `view_id` bigint(0) NULL DEFAULT NULL COMMENT '视图ID'; + MODIFY COLUMN `view_id` bigint(0) NULL DEFAULT NULL COMMENT '图表ID'; ALTER TABLE `visualization_template_extend_data` - MODIFY COLUMN `view_details` longtext NULL COMMENT '视图详情'; + MODIFY COLUMN `view_details` longtext NULL COMMENT '图表详情'; ALTER TABLE `visualization_template_extend_data` MODIFY COLUMN `copy_from` varchar(255) NULL DEFAULT NULL COMMENT '复制来源'; ALTER TABLE `visualization_template_extend_data` diff --git a/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql index a8f665b915..402bd95878 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql @@ -4057,7 +4057,7 @@ CREATE TABLE `visualization_link_jump` ( `id` bigint NOT NULL, `source_dv_id` bigint DEFAULT NULL COMMENT '源仪表板ID', - `source_view_id` bigint DEFAULT NULL COMMENT '源视图ID', + `source_view_id` bigint DEFAULT NULL COMMENT '源图表ID', `link_jump_info` varchar(4000) DEFAULT NULL COMMENT '跳转信息', `checked` tinyint(1) DEFAULT NULL COMMENT '是否启用', `copy_from` bigint DEFAULT NULL, @@ -4109,8 +4109,8 @@ CREATE TABLE `visualization_linkage` ( `id` bigint NOT NULL, `dv_id` bigint DEFAULT NULL, - `source_view_id` bigint DEFAULT NULL COMMENT '源视图id', - `target_view_id` bigint DEFAULT NULL COMMENT '联动视图id', + `source_view_id` bigint DEFAULT NULL COMMENT '源图表id', + `target_view_id` bigint DEFAULT NULL COMMENT '联动图表id', `update_time` bigint DEFAULT NULL COMMENT '更新时间', `update_people` varchar(255) DEFAULT NULL COMMENT '更新人', `linkage_active` tinyint(1) DEFAULT '0' COMMENT '是否启用关联', @@ -4129,8 +4129,8 @@ CREATE TABLE `visualization_linkage_field` ( `id` bigint NOT NULL, `linkage_id` bigint DEFAULT NULL COMMENT '联动ID', - `source_field` bigint DEFAULT NULL COMMENT '源视图字段', - `target_field` bigint DEFAULT NULL COMMENT '目标视图字段', + `source_field` bigint DEFAULT NULL COMMENT '源图表字段', + `target_field` bigint DEFAULT NULL COMMENT '目标图表字段', `update_time` bigint DEFAULT NULL COMMENT '更新时间', `copy_from` bigint DEFAULT NULL, `copy_id` bigint DEFAULT NULL, diff --git a/core/core-backend/src/main/resources/db/migration/V2.2__update_table_desc_ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.2__update_table_desc_ddl.sql index 36ec14d204..d4c267d3e8 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.2__update_table_desc_ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.2__update_table_desc_ddl.sql @@ -25,7 +25,7 @@ ALTER TABLE `area` ALTER TABLE `core_area_custom` COMMENT = '自定义地图区域信息表'; ALTER TABLE `core_chart_view` - COMMENT = '组件视图表'; + COMMENT = '组件图表表'; ALTER TABLE `core_dataset_group` COMMENT = '数据集分组表'; ALTER TABLE `core_dataset_table` @@ -70,7 +70,7 @@ ALTER TABLE `visualization_link_jump` ALTER TABLE `visualization_link_jump_info` COMMENT = '跳转配置表'; ALTER TABLE `visualization_link_jump_target_view_info` - COMMENT = '跳转目标仪表板视图字段配置表'; + COMMENT = '跳转目标仪表板图表字段配置表'; ALTER TABLE `visualization_linkage` COMMENT = '联动记录表'; ALTER TABLE `visualization_linkage_field` @@ -78,7 +78,7 @@ ALTER TABLE `visualization_linkage_field` ALTER TABLE `visualization_subject` COMMENT = '主题表'; ALTER TABLE `visualization_template_extend_data` - COMMENT = '模板视图明细信息表'; + COMMENT = '模板图表明细信息表'; ALTER TABLE `core_dataset_group` MODIFY COLUMN `qrtz_instance` varchar(1024) NULL DEFAULT NULL COMMENT 'Quartz 实例 ID' AFTER `create_time`; @@ -151,7 +151,7 @@ ALTER TABLE `visualization_link_jump_info` ALTER TABLE `visualization_link_jump_target_view_info` MODIFY COLUMN `target_id` bigint(0) NOT NULL COMMENT '主键' FIRST, MODIFY COLUMN `link_jump_info_id` bigint(0) NULL DEFAULT NULL COMMENT 'visualization_link_jump_info 表的 ID' AFTER `target_id`, - MODIFY COLUMN `target_view_id` bigint(0) NULL DEFAULT NULL COMMENT '目标视图ID' AFTER `source_field_active_id`, + MODIFY COLUMN `target_view_id` bigint(0) NULL DEFAULT NULL COMMENT '目标图表ID' AFTER `source_field_active_id`, MODIFY COLUMN `target_field_id` bigint(0) NULL DEFAULT NULL COMMENT '目标字段ID' AFTER `target_view_id`, MODIFY COLUMN `copy_from` bigint(0) NULL DEFAULT NULL COMMENT '复制来源' AFTER `target_field_id`, MODIFY COLUMN `copy_id` bigint(0) NULL DEFAULT NULL COMMENT '复制来源ID' AFTER `copy_from`; @@ -178,8 +178,8 @@ ALTER TABLE `visualization_template_category` ALTER TABLE `visualization_template_extend_data` MODIFY COLUMN `id` bigint(0) NOT NULL COMMENT '主键' FIRST, MODIFY COLUMN `dv_id` bigint(0) NULL DEFAULT NULL COMMENT '模板ID' AFTER `id`, - MODIFY COLUMN `view_id` bigint(0) NULL DEFAULT NULL COMMENT '视图ID' AFTER `dv_id`, - MODIFY COLUMN `view_details` longtext NULL COMMENT '视图详情' AFTER `view_id`, + MODIFY COLUMN `view_id` bigint(0) NULL DEFAULT NULL COMMENT '图表ID' AFTER `dv_id`, + MODIFY COLUMN `view_details` longtext NULL COMMENT '图表详情' AFTER `view_id`, MODIFY COLUMN `copy_from` varchar(255) NULL DEFAULT NULL COMMENT '复制来源' AFTER `view_details`, MODIFY COLUMN `copy_id` varchar(255) NULL DEFAULT NULL COMMENT '复制来源ID' AFTER `copy_from`; diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 29ceca0696..f3b366becc 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -43,7 +43,7 @@ i18n_no_datasource_permission=\u65E0\u6570\u636E\u6E90\u8BBF\u95EE\u6743\u9650 i18n_field_circular_ref=\u5B57\u6BB5\u5B58\u5728\u5FAA\u73AF\u5F15\u7528 -i18n_chart_delete=\u89C6\u56FE\u4E0D\u5B58\u5728 +i18n_chart_delete=\u56FE\u8868\u4E0D\u5B58\u5728 i18n_no_ds=\u6570\u636E\u96C6\u4E0D\u5B58\u5728\u6216\u6CA1\u6709\u6743\u9650 i18n_datasource_delete=\u6570\u636E\u6E90\u4E0D\u5B58\u5728 i18n_gauge_field_change=\u6240\u7528\u5B57\u6BB5\u53D1\u751F\u53D8\u66F4\uFF0C\u8BF7\u91CD\u65B0\u7F16\u8F91 diff --git a/core/core-frontend/src/api/chart.ts b/core/core-frontend/src/api/chart.ts index 4e9916e221..6fe87aafa0 100644 --- a/core/core-frontend/src/api/chart.ts +++ b/core/core-frontend/src/api/chart.ts @@ -32,7 +32,7 @@ export const getFieldByDQ = async (id, chartId): Promise => { }) } -// 通过视图对象获取数据 +// 通过图表对象获取数据 export const getData = async (data): Promise => { delete data.data return request.post({ url: '/chartData/getData', data }).then(res => { @@ -54,14 +54,14 @@ export const innerExportDetails = async (data): Promise => { }) } -// 通过视图id获取数据 +// 通过图表id获取数据 export const getChart = async (id): Promise => { return request.post({ url: `/chart/getChart/${id}`, data: {} }).then(res => { return res?.data }) } -// 单个视图保存测试 +// 单个图表保存测试 export const saveChart = async (data): Promise => { delete data.data return request.post({ url: '/chart/save', data }).then(res => { diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index 4efea3e428..ef70bb6328 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -1442,7 +1442,7 @@ defineExpose({ @linkJumpSetOpen="linkJumpSetOpen(item)" @linkageSetOpen="linkageSetOpen(item)" > - + { state.curDatasetInfo = res || {} }) - // 获取当前视图的字段信息 + // 获取当前图表的字段信息 listFieldByDatasetGroup(chartDetails.tableId).then(rsp => { state.linkJumpCurViewFieldArray = [] const sourceCurViewFieldArray = rsp.data @@ -540,7 +540,7 @@ const init = viewItem => { }) }) - // 获取当前视图的关联信息 + // 获取当前图表的关联信息 queryWithViewId(dvInfo.value.id, state.viewId).then(rsp => { state.linkJump = rsp.data state.linkJumpInfoArray = [] @@ -639,7 +639,7 @@ const codeMirrorContentSet = content => { }) } -// 获取当前视图字段 关联仪表板的视图信息列表 +// 获取当前图表字段 关联仪表板的图表信息列表 const getPanelViewList = dvId => { viewTableDetailList(dvId).then(rsp => { state.viewIdFieldArrayMap = {} diff --git a/core/core-frontend/src/components/visualization/LinkageSet.vue b/core/core-frontend/src/components/visualization/LinkageSet.vue index e95f21dd30..38ef3e2788 100644 --- a/core/core-frontend/src/components/visualization/LinkageSet.vue +++ b/core/core-frontend/src/components/visualization/LinkageSet.vue @@ -233,7 +233,7 @@ const linkageSetting = curViewId => { const targetViewIds = [] findAllViewsId(componentData.value, targetViewIds) - // 获取当前仪表板当前视图联动信息 + // 获取当前仪表板当前图表联动信息 const requestInfo = { dvId: dvInfo.value.id, sourceViewId: curViewId, @@ -241,7 +241,7 @@ const linkageSetting = curViewId => { linkageInfo: null } getViewLinkageGatherArray(requestInfo).then(rsp => { - // 获取当前仪表板的视图(去掉当前视图) + // 获取当前仪表板的图表(去掉当前图表) curLinkageTargetViewsInfo.value = rsp.data || [] curLinkageTargetViewsInfo.value.forEach(item => { if (item.targetViewId === curViewId) { diff --git a/core/core-frontend/src/components/visualization/SettingMenu.vue b/core/core-frontend/src/components/visualization/SettingMenu.vue index 39b0afe1cc..330d3dd372 100644 --- a/core/core-frontend/src/components/visualization/SettingMenu.vue +++ b/core/core-frontend/src/components/visualization/SettingMenu.vue @@ -90,7 +90,7 @@ - + { .filter(item => item.type === 'view' && item.propValue && item.propValue.viewId) .map(item => item.propValue.viewId) - // 获取当前仪表板当前视图联动信息 + // 获取当前仪表板当前图表联动信息 const requestInfo = { panelId: dvInfo.value.id, sourceViewId: curComponent.value.propValue.viewId, diff --git a/core/core-frontend/src/components/visualization/linkJump.vue b/core/core-frontend/src/components/visualization/linkJump.vue index e4eaead690..b00f25428f 100644 --- a/core/core-frontend/src/components/visualization/linkJump.vue +++ b/core/core-frontend/src/components/visualization/linkJump.vue @@ -248,7 +248,7 @@ defineExpose({ - 添加联动视图字段 + 添加联动图表字段 diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index d56be127b8..2302037e69 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -1,5 +1,5 @@ /** - * 视图设置 + * 图表设置 */ declare interface ChartAttr { /** @@ -336,7 +336,7 @@ declare interface CalcTotalCfg { } /** - * 视图杂项设置 + * 图表杂项设置 */ declare interface ChartMiscAttr { /** diff --git a/core/core-frontend/src/models/chart/chart-style.d.ts b/core/core-frontend/src/models/chart/chart-style.d.ts index d07758fbcd..8e0913f97c 100644 --- a/core/core-frontend/src/models/chart/chart-style.d.ts +++ b/core/core-frontend/src/models/chart/chart-style.d.ts @@ -1,5 +1,5 @@ /** - * 视图样式设置 + * 图表样式设置 */ declare interface ChartStyle { /** @@ -158,7 +158,7 @@ declare interface ChartLegendStyle { } /** - * 视图轴设置 + * 图表轴设置 */ declare interface ChartAxisStyle { /** diff --git a/core/core-frontend/src/models/chart/chart.d.ts b/core/core-frontend/src/models/chart/chart.d.ts index 3a6933f52d..4654cdeebb 100644 --- a/core/core-frontend/src/models/chart/chart.d.ts +++ b/core/core-frontend/src/models/chart/chart.d.ts @@ -1,5 +1,5 @@ /** - * 视图对象 + * 图表对象 */ declare interface Chart { id: string @@ -131,7 +131,7 @@ declare interface ChartViewField { */ id: string /** - * 视图自定义字段名称 + * 图表自定义字段名称 */ chartShowName: string /** diff --git a/core/core-frontend/src/models/chart/editor.d.ts b/core/core-frontend/src/models/chart/editor.d.ts index 084828ee0c..1b5eddbb7f 100644 --- a/core/core-frontend/src/models/chart/editor.d.ts +++ b/core/core-frontend/src/models/chart/editor.d.ts @@ -73,7 +73,7 @@ declare type AxisSpec = { tooltip?: string } /** - * 视图编辑表单 + * 图表编辑表单 */ declare interface ChartEditorForm { /** diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index a32247e92d..9294ddfeac 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -461,7 +461,7 @@ export const dvMainStore = defineStore('dataVisualization', { const id = componentInfo.id const componentType = componentInfo.component this.curBatchOptComponents.push(id) - // 视图批量操作 + // 图表批量操作 if (componentType === 'UserView') { // get view base info const viewBaseInfo = this.canvasViewInfo[id] diff --git a/core/core-frontend/src/store/modules/data-visualization/snapshot.ts b/core/core-frontend/src/store/modules/data-visualization/snapshot.ts index 39eaac6374..23222c4ac7 100644 --- a/core/core-frontend/src/store/modules/data-visualization/snapshot.ts +++ b/core/core-frontend/src/store/modules/data-visualization/snapshot.ts @@ -34,8 +34,8 @@ export const snapshotStore = defineStore('snapshot', { cacheStyleChangeTimes: 0, // 仪表板未缓存的组件样式修改次数 snapshotCacheTimes: 0, // 当前未计入镜像中的修改变动次数, 此为定时缓存，缓存间隔时间5秒一次 针对类型样式这种变动不大的修改 cacheViewIdInfo: { - snapshotCacheViewCalc: [], // 当前未计入镜像需要视图计算的视图ID, all代表全部 - snapshotCacheViewRender: [] // 当前未计入镜像需要视图渲染的视图ID,all代表全部 + snapshotCacheViewCalc: [], // 当前未计入镜像需要图表计算的图表ID, all代表全部 + snapshotCacheViewRender: [] // 当前未计入镜像需要图表渲染的图表ID,all代表全部 }, snapshotData: [], // 编辑器快照数据 snapshotIndex: -1 // 快照索引 diff --git a/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue b/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue index 4e0b6cbc91..20180198e1 100644 --- a/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue +++ b/core/core-frontend/src/views/chart/components/editor/common/ChartTemplateInfo.vue @@ -5,7 +5,7 @@
- 当前为模板视图，请更换数据集... + 当前为模板图表，请更换数据集...
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue index 3b7232ab48..014b7e45e9 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue @@ -51,7 +51,7 @@ const initSeriesTooltip = () => { pre[next.seriesId] = next return pre }, {}) - // 新增视图 + // 新增图表 if (!quotaAxis.value?.length) { if (!formatter.length) { quotaData.value?.forEach(i => formatter.push({ ...i, seriesId: i.id, show: false })) @@ -198,7 +198,7 @@ const init = () => { if (customAttr.tooltip) { state.tooltipForm = defaultsDeep(customAttr.tooltip, cloneDeep(DEFAULT_TOOLTIP)) formatterSelector.value?.blur() - // 新增视图 + // 新增图表 const formatter = state.tooltipForm.seriesTooltipFormatter if (!formatter.length) { quotaData.value?.forEach(i => formatter.push({ ...i, seriesId: i.id, show: false })) diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 01deb2d11d..24bb5a1f5c 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -602,7 +602,7 @@ const onAreaChange = val => { const onTypeChange = (render, type) => { view.value.render = render view.value.type = type - // 处理配置项默认值，不同视图的同一配置项默认值不同 + // 处理配置项默认值，不同图表的同一配置项默认值不同 const chartViewInstance = chartViewManager.getChartView(view.value.render, view.value.type) if (chartViewInstance) { view.value = chartViewInstance.setupDefaultOptions(view.value) as unknown as ChartObj @@ -2197,7 +2197,7 @@ const onRefreshChange = val => { - + { protected configLabel(chart: Chart, options: LiquidOptions): LiquidOptions { const customAttr = parseJson(chart.customAttr) const originVal = options.percent - // 数值过大视图会异常，大于 1 无意义 + // 数值过大图表会异常，大于 1 无意义 if (originVal > 1) { options = { ...options, diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts index 2daf2bc62d..0264aa4720 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts @@ -3,7 +3,7 @@ import { useI18n } from '@/hooks/web/useI18n' const { t } = useI18n() /** - * 指标卡视图 + * 指标卡图表 */ export class IndicatorChartView extends AbstractChartView { properties: EditorProperty[] = [ diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts index d95f54333d..60bf5e236c 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/rich-text.ts @@ -3,7 +3,7 @@ import { useI18n } from '@/hooks/web/useI18n' const { t } = useI18n() /** - * 富文本视图 + * 富文本图表 */ export class RichTextChartView extends AbstractChartView { properties: EditorProperty[] = ['background-overall-component'] diff --git a/core/core-frontend/src/views/chart/components/js/panel/index.ts b/core/core-frontend/src/views/chart/components/js/panel/index.ts index eb8e29f9cd..90b8c4de87 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/index.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/index.ts @@ -18,7 +18,7 @@ class ChartViewManager { } const chartViewManager = new ChartViewManager() -// 批量自动注册视图，只要是 AbstractChartView 的子类都初始化然后存起来 +// 批量自动注册图表，只要是 AbstractChartView 的子类都初始化然后存起来 const charts = import.meta.glob(['./charts/**/*.ts', '!**/common.ts'], { eager: true }) for (const chart in charts) { const chartModule = charts[chart] diff --git a/core/core-frontend/src/views/chart/components/js/panel/types/impl/g2plot.ts b/core/core-frontend/src/views/chart/components/js/panel/types/impl/g2plot.ts index f5cd20f83c..8df2fff532 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/types/impl/g2plot.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/types/impl/g2plot.ts @@ -28,7 +28,7 @@ export interface G2PlotDrawOptions extends AntVDrawOptions { } /** - * G2Plot 的视图抽象类 + * G2Plot 的图表抽象类 */ export abstract class G2PlotChartView< O extends PickOptions, @@ -37,9 +37,9 @@ export abstract class G2PlotChartView< protected static engine = getEngine('canvas') /** - * 根据参数构建视图对象然后返回 - * @param drawOptions 视图配置参数 - * @return 生成的视图对象，类型为 Plot 的子类 + * 根据参数构建图表对象然后返回 + * @param drawOptions 图表配置参数 + * @return 生成的图表对象，类型为 Plot 的子类 */ public abstract drawChart(drawOptions: G2PlotDrawOptions

): P @@ -97,9 +97,9 @@ export abstract class G2PlotChartView< } /** - * 流式配置公共参数，处理常用的配置，后续如果有其他通用配置也可以放进来，需要单独配置的属性在各个视图自行实现。 - * @param chart 数据库视图对象。 - * @param options 各个视图的参数，泛化的 Options，可以自行扩展，比如加个扩展 X 轴或者扩展 Y 轴字段。 + * 流式配置公共参数，处理常用的配置，后续如果有其他通用配置也可以放进来，需要单独配置的属性在各个图表自行实现。 + * @param chart 数据库图表对象。 + * @param options 各个图表的参数，泛化的 Options，可以自行扩展，比如加个扩展 X 轴或者扩展 Y 轴字段。 */ protected abstract setupOptions(chart: Chart, options: O): O protected constructor(name: string, defaultData: any[]) { diff --git a/core/core-frontend/src/views/chart/components/js/panel/types/index.ts b/core/core-frontend/src/views/chart/components/js/panel/types/index.ts index 559f61c693..f0af8b07ea 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/types/index.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/types/index.ts @@ -27,8 +27,8 @@ export abstract class AbstractChartView { abstract axis: AxisType[] abstract axisConfig: AxisConfig /** - * 在新建和切换视图的时候处理默认值 - * @param chart 数据库视图对象 + * 在新建和切换图表的时候处理默认值 + * @param chart 数据库图表对象 */ setupDefaultOptions(chart: ChartObj): ChartObj { return chart @@ -51,7 +51,7 @@ export abstract class AbstractChartView { export interface AntVDrawOptions { /** - * 生成的视图对象 + * 生成的图表对象 */ chartObj: O /** @@ -59,7 +59,7 @@ export interface AntVDrawOptions { */ container: string /** - * 数据库中的视图配置对象 + * 数据库中的图表配置对象 */ chart: Chart /** @@ -97,7 +97,7 @@ export abstract class AntVAbstractChartView extends AbstractChartView { } /** - * Echarts 视图的抽象类 + * Echarts 图表的抽象类 */ export abstract class EchartsChartView extends AbstractChartView { protected constructor(name: string, defaultData: any[]) { diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue index 4608aac9b2..7c6eec3d50 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue @@ -114,7 +114,7 @@ const renderChart = async view => { } curView = view // view 为引用对象 需要存库 view.data 直接赋值会导致保存不必要的数据 - // 与默认视图对象合并，方便增加配置项 + // 与默认图表对象合并，方便增加配置项 const chart = deepCopy({ ...defaultsDeep(view, cloneDeep(BASE_VIEW_CONFIG)), data: chartData.value @@ -182,7 +182,7 @@ const action = param => { // 只有一个事件直接调用 trackClick(trackMenu.value[0]) } else { - // 视图关联多个事件 + // 图表关联多个事件 state.trackBarStyle.left = param.x - 50 + 'px' state.trackBarStyle.top = param.y + 10 + 'px' viewTrack.value.trackButtonClick() diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue index 9049f3114c..b4b6ea8ed6 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue @@ -230,7 +230,7 @@ const action = param => { // 只有一个事件直接调用 trackClick(trackMenu.value[0]) } else { - // 视图关联多个事件 + // 图表关联多个事件 state.trackBarStyle.left = param.x - 50 + 'px' state.trackBarStyle.top = param.y + 10 + 'px' viewTrack.value.trackButtonClick() diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index e4bc4cc159..22d9c11591 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -212,7 +212,7 @@ watch([() => searchCount.value], () => { queryData() } }) -// 仪表板的查询结果设置变化 视图数据需要刷新 +// 仪表板的查询结果设置变化 图表数据需要刷新 watch([() => resultCount.value], () => { queryData() }) @@ -420,7 +420,7 @@ onBeforeMount(() => { }) } }) -// 部分场景不需要更新视图，例如放大页面 +// 部分场景不需要更新图表，例如放大页面 const listenerEnable = computed(() => { return !showPosition.value.includes('viewDialog') }) @@ -635,7 +635,7 @@ const iconSize = computed(() => { - +

{ - 添加联动视图字段 + 添加联动图表字段
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java index b9c9c7e8d4..7052bf0a08 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java @@ -16,10 +16,10 @@ import java.util.List; /** * @Author Junjun */ -@Tag(name = "视图管理:数据") +@Tag(name = "图表管理:数据") @ApiSupport(order = 989) public interface ChartDataApi { - @Operation(summary = "获取视图数据") + @Operation(summary = "获取图表数据") @PostMapping("getData") ChartViewDTO getData(@RequestBody ChartViewDTO chartViewDTO) throws Exception; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java index 44e902dcc6..acac3efc83 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java @@ -16,18 +16,18 @@ import java.util.Map; /** * @Author Junjun */ -@Tag(name = "视图管理:查看") +@Tag(name = "图表管理:查看") @ApiSupport(order = 988) public interface ChartViewApi { - @Operation(summary = "查询视图详情并同时计算数据", hidden = true) + @Operation(summary = "查询图表详情并同时计算数据", hidden = true) @PostMapping("getChart/{id}") ChartViewDTO getData(@PathVariable Long id) throws Exception; - @Operation(summary = "获取视图字段") + @Operation(summary = "获取图表字段") @PostMapping("listByDQ/{id}/{chartId}") Map> listByDQ(@PathVariable Long id, @PathVariable Long chartId); - @Operation(summary = "保存视图") + @Operation(summary = "保存图表") @PostMapping("save") ChartViewDTO save(@RequestBody ChartViewDTO dto) throws Exception; @@ -35,7 +35,7 @@ public interface ChartViewApi { @GetMapping("/checkSameDataSet/{viewIdSource}/{viewIdTarget}") String checkSameDataSet(@PathVariable String viewIdSource, @PathVariable String viewIdTarget); - @Operation(summary = "查询视图详情") + @Operation(summary = "查询图表详情") @PostMapping("getDetail/{id}") ChartViewDTO getDetail(@PathVariable Long id); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java index f8690ef3be..5e9178eb88 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java @@ -158,7 +158,7 @@ public class ChartViewBaseDTO implements Serializable { private String stylePriority; /** - * 图表类型 public 公共 历史可复用的视图，private 私有 专属某个仪表板 + * 图表类型 public 公共 历史可复用的图表，private 私有 专属某个仪表板 */ private String chartType; @@ -173,7 +173,7 @@ public class ChartViewBaseDTO implements Serializable { private String dataFrom; /** - * 视图字段集合 + * 图表字段集合 */ private List viewFields; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldBaseDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldBaseDTO.java index 140af5b38d..8ec59644c4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldBaseDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldBaseDTO.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; /** - * 视图字段base类，与数据集字段表基本一致 + * 图表字段base类，与数据集字段表基本一致 */ @Data public class ChartViewFieldBaseDTO extends DatasetTableFieldDTO implements Serializable { diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java index 5e1ce47ed6..990db8b20a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java @@ -22,7 +22,7 @@ import java.util.Map; public interface DatasetTableApi { /** - * 该接口用于视图计算字段单独保存 + * 该接口用于图表计算字段单独保存 * * @param datasetTableFieldDTO * @return @@ -60,7 +60,7 @@ public interface DatasetTableApi { @PostMapping("getFunction") List getFunction(); - @Operation(summary = "删除视图计算字段", hidden = true) + @Operation(summary = "删除图表计算字段", hidden = true) @PostMapping("deleteByChartId/{id}") void deleteByChartId(@PathVariable Long id); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLMeta.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLMeta.java index 163eededd9..0d8e493fe9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLMeta.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLMeta.java @@ -25,7 +25,7 @@ public class SQLMeta { private List yOrders; /** - * 视图过滤字段 + * 图表过滤字段 */ private String customWheres; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java index 8410e7eac1..35a6d0dbad 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java @@ -29,7 +29,7 @@ public interface VisualizationLinkJumpApi { List getTableFieldWithViewId(@PathVariable Long viewId); @GetMapping("/queryWithViewId/{dvId}/{viewId}") - @Operation(summary = "根据视图ID查询跳转信息") + @Operation(summary = "根据图表ID查询跳转信息") VisualizationLinkJumpDTO queryWithViewId(@PathVariable Long dvId, @PathVariable Long viewId); @GetMapping("/queryVisualizationJumpInfo/{dvId}") diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpDTO.java index df69eb1f25..a1ec64a271 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpDTO.java @@ -14,7 +14,7 @@ import java.util.Map; */ @Data public class VisualizationLinkJumpDTO extends VisualizationLinkJumpVO { - //仪表板可以跳转视图信息 sourceViewId# + //仪表板可以跳转图表信息 sourceViewId# private String sourceInfo; private List targetInfoList; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java index bcf3ad89ce..dfe8e1c52a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java @@ -18,12 +18,12 @@ import java.util.List; public class VisualizationLinkageDTO extends VisualizationLinkageVO { /** - * 目标视图名称 + * 目标图表名称 */ private String targetViewName; /** - * 目标视图类型 + * 目标图表类型 */ private String targetViewType; /** @@ -32,7 +32,7 @@ public class VisualizationLinkageDTO extends VisualizationLinkageVO { private List linkageFields = new ArrayList<>(); /** - * 目标视图字段 + * 目标图表字段 */ private List targetViewFields = new ArrayList<>(); /** diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java index 67c596c04c..5ce00bf751 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java @@ -120,12 +120,12 @@ public class DataVisualizationVO implements Serializable { private String source; /** - * 视图基本信息 + * 图表基本信息 */ private Map canvasViewInfo = new HashMap<>(); /** - * 视图模板数据 + * 图表模板数据 */ private Map extendDataInfo = new HashMap<>(); diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpVO.java index 48e24c791d..7d992008d6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpVO.java @@ -21,7 +21,7 @@ public class VisualizationLinkJumpVO { private Long sourceDvId; /** - * 源视图ID + * 源图表ID */ @JsonSerialize(using = ToStringSerializer.class) private Long sourceViewId; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageFieldVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageFieldVO.java index 043db47ef3..6fe07c19ac 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageFieldVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageFieldVO.java @@ -20,13 +20,13 @@ public class VisualizationLinkageFieldVO implements Serializable { private Long linkageId; /** - * 源视图字段 + * 源图表字段 */ @JsonSerialize(using = ToStringSerializer.class) private Long sourceField; /** - * 目标视图字段 + * 目标图表字段 */ @JsonSerialize(using = ToStringSerializer.class) private Long targetField; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageVO.java index 823c3e80c3..b4a6dadebd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkageVO.java @@ -16,13 +16,13 @@ public class VisualizationLinkageVO implements Serializable { private Long dvId; /** - * 源视图id + * 源图表id */ @JsonSerialize(using = ToStringSerializer.class) private Long sourceViewId; /** - * 联动视图id + * 联动图表id */ @JsonSerialize(using = ToStringSerializer.class) private Long targetViewId; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java index fa678dab82..eddb388960 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java @@ -38,7 +38,7 @@ public class VisualizationViewTableVO { private String type; /** - * 视图渲染方式 + * 图表渲染方式 */ private String render; diff --git a/sdk/common/src/main/java/io/dataease/constant/CommonConstants.java b/sdk/common/src/main/java/io/dataease/constant/CommonConstants.java index 419a92ef37..f281d757a9 100644 --- a/sdk/common/src/main/java/io/dataease/constant/CommonConstants.java +++ b/sdk/common/src/main/java/io/dataease/constant/CommonConstants.java @@ -37,7 +37,7 @@ public class CommonConstants { } - //视图数据查询来源 + //图表数据查询来源 public static final class VIEW_QUERY_FROM { // 仪表板 @@ -48,7 +48,7 @@ public class CommonConstants { } - //视图数据查询模式 + //图表数据查询模式 public static final class VIEW_RESULT_MODE { // 所有 @@ -58,7 +58,7 @@ public class CommonConstants { public static final String CUSTOM = "custom"; } - //视图数据查询来源 + //图表数据查询来源 public static final class VIEW_EDIT_FROM { // 仪表板 @@ -69,7 +69,7 @@ public class CommonConstants { } - //视图数据读取来源 + //图表数据读取来源 public static final class VIEW_DATA_FROM { // 模板数据 diff --git a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java b/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java index 09f55c0926..3ec4390be3 100644 --- a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java +++ b/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java @@ -55,7 +55,7 @@ public class SwaggerConfig { @Bean public GroupedOpenApi chartApi() { - return GroupedOpenApi.builder().group("2-view").displayName("视图管理").packagesToScan("io.dataease.chart").build(); + return GroupedOpenApi.builder().group("2-view").displayName("图表管理").packagesToScan("io.dataease.chart").build(); } @Bean diff --git a/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java b/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java index 6418d63026..a9597b9c7e 100644 --- a/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java +++ b/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java @@ -36,7 +36,7 @@ public class DatasetTableFieldDTO implements Serializable { private Long datasetGroupId; /** - * 视图ID + * 图表ID */ @JsonSerialize(using = ToStringSerializer.class) private Long chartId;