From 798772d5b29241582644b0fe9a426d0a2bbed89f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 25 Nov 2024 22:47:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/MybatisPlusGenerator.java | 2 +- .../dashboard-style/OverallSetting.vue | 8 +- .../data-visualization/CanvasAttr.vue | 36 +- .../data-visualization/ComponentToolBar.vue | 5 +- .../data-visualization/DvToolbar.vue | 43 +- .../data-visualization/RealTimeListTree.vue | 6 +- .../canvas/ContextMenuDetails.vue | 102 +-- .../visualization/CanvasBaseSetting.vue | 15 +- .../visualization/CanvasCacheDialog.vue | 10 +- .../components/visualization/LinkJumpSet.vue | 53 +- .../components/visualization/LinkageSet.vue | 42 +- .../visualization/LinkageSetOption.vue | 20 +- .../visualization/OuterParamsSet.vue | 90 ++- .../visualization/OuterParamsSetDS.vue | 662 ------------------ .../common/ComponentPosition.vue | 9 +- .../component-background/CanvasBackground.vue | 10 +- .../canvas-filter-btn/Component.vue | 4 +- .../common/CarouselSetting.vue | 12 +- .../custom-component/common/CommonAttr.vue | 17 +- .../common/CommonBorderSetting.vue | 24 +- .../custom-component/common/CommonEvent.vue | 14 +- .../common/CommonStyleSet.vue | 27 +- .../common/ComponentConfig.ts | 92 ++- .../component-group/MediaGroup.vue | 11 +- .../component-group/MoreComGroup.vue | 7 +- .../component-group/QueryGroup.vue | 5 +- .../component-group/TextGroup.vue | 7 +- .../src/custom-component/component-list.ts | 84 +-- .../custom-component/de-tabs/Component.vue | 10 +- .../de-tabs/CustomTabsSort.vue | 4 +- .../de-time-clock/CustomAttr.vue | 2 +- .../de-time-clock/TimeClockFormat.vue | 7 +- .../src/custom-component/de-video/Attr.vue | 5 +- .../picture-group/PictureGroupUploadAttr.vue | 18 +- .../src/custom-component/picture/Attr.vue | 25 +- .../custom-component/picture/Component.vue | 12 +- .../custom-component/pop-area/Component.vue | 5 +- core/core-frontend/src/locales/en.ts | 102 +++ core/core-frontend/src/locales/tw.ts | 100 +++ core/core-frontend/src/locales/zh-CN.ts | 451 +++++++++--- .../editor/common/ChartTemplateInfo.vue | 6 +- .../editor/dataset-select/DatasetSelect.vue | 4 +- .../editor/editor-senior/Senior.vue | 22 +- .../editor/editor-style/ChartStyle.vue | 19 +- .../views/chart/components/editor/index.vue | 4 +- .../chart/components/editor/util/chart.ts | 4 +- .../src/views/common/DeAppApply.vue | 37 +- .../src/views/common/DeResourceCreateOpt.vue | 4 +- .../src/views/common/DeResourceGroupOpt.vue | 48 +- .../src/views/common/DeResourceTree.vue | 64 +- .../src/views/common/MultiplexingCanvas.vue | 24 +- .../views/dashboard/DashboardPreviewShow.vue | 10 +- .../dashboard/MobileBackgroundSelector.vue | 6 +- .../src/views/dashboard/MobileConfigPanel.vue | 21 +- .../src/views/dashboard/index.vue | 10 +- .../MultiplexPreviewShow.vue | 13 +- .../data-visualization/PreviewCanvas.vue | 2 +- .../PreviewCanvasMobile.vue | 6 +- .../views/data-visualization/PreviewHead.vue | 16 +- .../views/data-visualization/PreviewShow.vue | 8 +- .../src/views/data-visualization/index.vue | 12 +- 61 files changed, 1265 insertions(+), 1233 deletions(-) delete mode 100644 core/core-frontend/src/components/visualization/OuterParamsSetDS.vue diff --git a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java index ab90be4089..e648e87858 100644 --- a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java +++ b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java @@ -25,7 +25,7 @@ public class MybatisPlusGenerator { /** * 这是要生成代码的表名称 */ - private static final String TABLE_NAME = "visualization_link_jump_target_view_info"; + private static final String TABLE_NAME = "data_visualization_info"; /** * 下面两个配置基本上不用动 diff --git a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue index 23c49227dc..458ba5ca0b 100644 --- a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue +++ b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue @@ -27,7 +27,7 @@ v-if="dvInfo.type === 'dashboard'" class="form-item" :class="'form-item-' + themes" - label="仪表板字体选择" + :label="t('visualization.font_family_select')" > - 显示放大、导出等悬浮按钮 + {{ t('visualization.button_tips') }} @@ -221,7 +221,7 @@ size="small" v-model="canvasStyleData.dashboard.showGrid" @change="themeChange" - >显示辅助网格{{ t('visualization.display_auxiliary_grid') }} diff --git a/core/core-frontend/src/components/data-visualization/CanvasAttr.vue b/core/core-frontend/src/components/data-visualization/CanvasAttr.vue index a664d55c08..6e802a12cb 100644 --- a/core/core-frontend/src/components/data-visualization/CanvasAttr.vue +++ b/core/core-frontend/src/components/data-visualization/CanvasAttr.vue @@ -14,18 +14,19 @@ import CanvasBackground from '@/components/visualization/component-background/Ca import SeniorStyleSetting from '@/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue' import Icon from '../icon-custom/src/Icon.vue' import CanvasBaseSetting from '@/components/visualization/CanvasBaseSetting.vue' +import { useI18n } from '@/hooks/web/useI18n' const dvMainStore = dvMainStoreWithOut() const snapshotStore = snapshotStoreWithOut() const { canvasStyleData, canvasViewInfo } = storeToRefs(dvMainStore) let canvasAttrInit = false const canvasAttrActiveNames = ref(['size', 'baseSetting', 'background', 'color']) - +const { t } = useI18n() const screenAdaptorList = [ - { label: '宽度优先', value: 'widthFirst' }, - { label: '高度优先', value: 'heightFirst' }, - { label: '铺满全屏', value: 'full' }, - { label: '不缩放', value: 'keep' } + { label: t('visualization.screen_adaptor_width_first'), value: 'widthFirst' }, + { label: t('visualization.screen_adaptor_height_first'), value: 'heightFirst' }, + { label: t('visualization.screen_adaptor_full'), value: 'full' }, + { label: t('visualization.screen_adaptor_keep'), value: 'keep' } ] const init = () => { nextTick(() => { @@ -89,7 +90,7 @@ onMounted(() => {
- + @@ -408,10 +423,10 @@ const fullScreenPreview = () => { class="preview-button" type="primary" > - 编辑 + {{ t('visualization.edit') }} - 预览 + {{ t('visualization.preview') }} { style="float: right; margin-right: 12px" type="primary" > - 保存 + {{ t('visualization.save') }}
diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index edf0673689..d1f6c0e466 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -79,6 +79,7 @@ import { composeStoreWithOut } from '@/store/modules/data-visualization/compose' import RealTimeGroup from '@/components/data-visualization/RealTimeGroup.vue' import { contextmenuStoreWithOut } from '@/store/modules/data-visualization/contextmenu' import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue' +import { useI18n } from '@/hooks/web/useI18n' const dropdownMore = ref(null) const lockStore = lockStoreWithOut() @@ -87,6 +88,7 @@ const snapshotStore = snapshotStoreWithOut() const layerStore = layerStoreWithOut() const composeStore = composeStoreWithOut() const contextmenuStore = contextmenuStoreWithOut() +const { t } = useI18n() const { areaData, isCtrlOrCmdDown, isShiftDown, laterIndex } = storeToRefs(composeStore) @@ -398,7 +400,7 @@ const canvasChange = () => {
- 弹窗区域({{ popComponentData.length }}) + {{ t('visualization.pop_area') }}({{ popComponentData.length }})
@@ -475,7 +477,7 @@ const canvasChange = () => { @click="areaClick('base')" :class="{ activated: baseAreaActive }" > - 大屏区域({{ baseComponentData.length }}) + {{ t('visualization.screen_area') }}({{ baseComponentData.length }})
diff --git a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue index 104db7660b..c5266d4035 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue @@ -12,6 +12,7 @@ import eventBus from '@/utils/eventBus' import { componentArraySort, getCurInfo } from '@/store/modules/data-visualization/common' import { useEmitt } from '@/hooks/web/useEmitt' import { XpackComponent } from '@/components/plugin' +import { useI18n } from '@/hooks/web/useI18n' const dvMainStore = dvMainStoreWithOut() const copyStore = copyStoreWithOut() const lockStore = lockStoreWithOut() @@ -31,7 +32,7 @@ const props = defineProps({ }) const { activePosition } = toRefs(props) - +const { t } = useI18n() const popComponentDataLength = computed( () => componentData.value.filter(ele => ele.category === 'hidden').length ) @@ -238,7 +239,9 @@ const editQueryCriteria = () => {
  • - 取消组合 + {{ t('visualization.cancel_group') }}
  • -
  • 粘贴
  • +
  • + {{ t('visualization.paste') }} +
diff --git a/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue b/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue index 79bff7f493..5854484f87 100644 --- a/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue +++ b/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue @@ -4,7 +4,7 @@
- 显示弹窗区查询按钮 + {{ t('visualization.show_pop_button') }} @@ -49,10 +49,10 @@ @change="onThemeChange" >
- 显示放大、导出等悬浮按钮 + {{ t('visualization.show_zoom_button') }} @@ -68,7 +68,7 @@ size="small" v-model="canvasStyleData.dashboard.showGrid" @change="onThemeChange" - >显示辅助网格{{ t('visualization.display_auxiliary_grid') }} @@ -85,8 +85,9 @@ import Icon from '../icon-custom/src/Icon.vue' import { useAppearanceStoreWithOut } from '@/store/modules/appearance' import { CHART_FONT_FAMILY } from '@/views/chart/components/editor/util/chart' import { adaptTitleFontFamilyAll } from '@/utils/canvasStyle' +import { useI18n } from '@/hooks/web/useI18n' const snapshotStore = snapshotStoreWithOut() - +const { t } = useI18n() const dvMainStore = dvMainStoreWithOut() const { canvasStyleData } = storeToRefs(dvMainStore) const appearanceStore = useAppearanceStoreWithOut() diff --git a/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue b/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue index afa943b166..ef2faa023e 100644 --- a/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue +++ b/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue @@ -21,8 +21,10 @@ @@ -50,8 +52,8 @@ const dialogInit = initInfo => { const canvasTypeName = initInfo.canvasType === 'dataV' ? t('work_branch.big_data_screen') : t('work_branch.dashboard') dialogInfo.resourceId = initInfo.resourceId - dialogInfo.title = '存在未保存的' + canvasTypeName - dialogInfo.tips = canvasTypeName + '存在未保存的修改,立即恢复?' + dialogInfo.title = t('visualization.no_save_tips', [canvasTypeName]) + dialogInfo.tips = canvasTypeName + t('visualization.no_save_tips2') dialogShow.value = true } diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index 85e262c6ed..f9eaee9198 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -12,7 +12,7 @@
- 已选图表: + {{ t('visualization.selected_view') }}: {{ state.curJumpViewInfo.title }} - 所用数据集: + {{ t('visualization.used_dataset') }}: - 选择字段 + {{ t('visualization.to_select_view') }} - 仅看已选 + {{ t('visualization.show_selected_only') }} @@ -126,12 +126,12 @@ v-if="state.linkJumpInfo?.jumpType === 'newPop'" > - - - + {{ t('visualization.window_size_large') }} + {{ t('visualization.window_size_middle') }} + {{ t('visualization.window_size_small') }} @@ -161,7 +161,9 @@
- +
- - + + + +