From 800c830ba269a7ba767bab6a3778219afda73a19 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 13 Jan 2025 15:59:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E6=9D=BF=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E7=9A=84=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E6=94=B9?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E4=B8=94=E6=A0=87=E9=A2=98=E6=A0=8F=E5=92=8C?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=A0=8F=E5=90=8D=E7=A7=B0=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4=20#14110?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/RealTimeGroup.vue | 2 ++ .../data-visualization/RealTimeGroupInner.vue | 5 ++-- .../data-visualization/RealTimeListTree.vue | 3 ++- .../data-visualization/RealTimeTab.vue | 2 ++ .../components/visualization/DvSidebar.vue | 24 +++++++++++++------ .../src/custom-component/component-list.ts | 4 ++-- core/core-frontend/src/utils/canvasUtils.ts | 10 ++++++++ .../views/chart/components/editor/index.vue | 8 +++++++ 8 files changed, 45 insertions(+), 13 deletions(-) diff --git a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue index 46f0be4bdc..92fe358186 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue @@ -77,6 +77,7 @@ import ComposeShow from '@/components/data-visualization/canvas/ComposeShow.vue' import { composeStoreWithOut } from '@/store/modules/data-visualization/compose' import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg' import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue' +import { syncViewTitle } from '@/utils/canvasUtils' const dropdownMore = ref(null) const lockStore = lockStoreWithOut() @@ -140,6 +141,7 @@ const closeEditComponentName = () => { return } curEditComponent.name = inputName.value + syncViewTitle(curEditComponent) inputName.value = '' curEditComponent = null } diff --git a/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue b/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue index a81fac3fb4..5d7c64dd91 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue @@ -61,8 +61,6 @@ import dvShow from '@/assets/svg/dv-show.svg' import dvUnlock from '@/assets/svg/dv-unlock.svg' import dvLock from '@/assets/svg/dv-lock.svg' import dvMore from '@/assets/svg/dv-more.svg' -import dvExpandDown from '@/assets/svg/dv-expand-down.svg' -import dvExpandRight from '@/assets/svg/dv-expand-right.svg' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot' import { layerStoreWithOut } from '@/store/modules/data-visualization/layer' @@ -76,7 +74,7 @@ import ContextMenuAsideDetails from '@/components/data-visualization/canvas/Cont import ComposeShow from '@/components/data-visualization/canvas/ComposeShow.vue' import { composeStoreWithOut } from '@/store/modules/data-visualization/compose' import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg' -import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue' +import { syncViewTitle } from '@/utils/canvasUtils' const dropdownMore = ref(null) const lockStore = lockStoreWithOut() @@ -140,6 +138,7 @@ const closeEditComponentName = () => { return } curEditComponent.name = inputName.value + syncViewTitle(curEditComponent) inputName.value = '' curEditComponent = null } diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index 44f8fd9378..56ead35e30 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -81,7 +81,7 @@ import { contextmenuStoreWithOut } from '@/store/modules/data-visualization/cont import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue' import { useI18n } from '@/hooks/web/useI18n' import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg' -import { checkJoinGroup } from '@/utils/canvasUtils' +import { checkJoinGroup, syncViewTitle } from '@/utils/canvasUtils' import { useEmitt } from '@/hooks/web/useEmitt' const dropdownMore = ref(null) const lockStore = lockStoreWithOut() @@ -220,6 +220,7 @@ const closeEditComponentName = () => { return } curEditComponent.name = inputName.value + syncViewTitle(curEditComponent) inputName.value = '' curEditComponent = null } diff --git a/core/core-frontend/src/components/data-visualization/RealTimeTab.vue b/core/core-frontend/src/components/data-visualization/RealTimeTab.vue index 9dd6227432..9bb8505159 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeTab.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeTab.vue @@ -12,6 +12,7 @@ import draggable from 'vuedraggable' import { composeStoreWithOut } from '@/store/modules/data-visualization/compose' import RealTimeGroup from '@/components/data-visualization/RealTimeGroup.vue' import eventBus from '@/utils/eventBus' +import { syncViewTitle } from '@/utils/canvasUtils' const dvMainStore = dvMainStoreWithOut() const snapshotStore = snapshotStoreWithOut() @@ -69,6 +70,7 @@ const closeEditComponentName = () => { return } curEditComponent.title = inputName.value + syncViewTitle(curEditComponent) inputName.value = '' curEditComponent = null } diff --git a/core/core-frontend/src/components/visualization/DvSidebar.vue b/core/core-frontend/src/components/visualization/DvSidebar.vue index 76cc4b6471..3fb7b283b3 100644 --- a/core/core-frontend/src/components/visualization/DvSidebar.vue +++ b/core/core-frontend/src/components/visualization/DvSidebar.vue @@ -61,7 +61,7 @@ const props = defineProps({ title: String }) -const { width, asidePosition, sideName, themeInfo, view, themes } = toRefs(props) +const { width, asidePosition, sideName, themeInfo, view, themes, element } = toRefs(props) const collapseChange = () => { canvasCollapse.value[sideName.value] = !canvasCollapse.value[sideName.value] } @@ -81,7 +81,10 @@ const closeEditComponentName = () => { if (!inputComponentName.value.name || !inputComponentName.value.name.trim()) { return } - if (inputComponentName.value.name.trim() === view.value.title) { + if ( + inputComponentName.value.name.trim() === view.value?.title || + inputComponentName.value.name.trim() === element.value.name + ) { return } if ( @@ -92,19 +95,26 @@ const closeEditComponentName = () => { editComponentName() return } - view.value.title = inputComponentName.value.name + element.value.label = inputComponentName.value.name + element.value.name = inputComponentName.value.name + if (isViewTitle.value) { + view.value.title = inputComponentName.value.name + } inputComponentName.value.name = '' } const editComponentName = () => { + componentNameEdit.value = true if (isViewTitle.value) { - componentNameEdit.value = true inputComponentName.value.name = view.value.title inputComponentName.value.id = view.value.id - nextTick(() => { - componentNameInputAttr.value.focus() - }) + } else { + inputComponentName.value.name = element.value.name + inputComponentName.value.id = element.value.id } + nextTick(() => { + componentNameInputAttr.value.focus() + }) } const onComponentNameChange = () => { diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts index e1c0c9cb24..f02430b6f2 100644 --- a/core/core-frontend/src/custom-component/component-list.ts +++ b/core/core-frontend/src/custom-component/component-list.ts @@ -282,8 +282,8 @@ const list = [ }, { component: 'VQuery', - name: t('visualization.query'), - label: t('visualization.query'), + name: t('visualization.query_component'), + label: t('visualization.query_component'), propValue: '', icon: 'icon_search', innerType: 'VQuery', diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 3f52bff740..9d860adccd 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -983,3 +983,13 @@ export function mobileViewStyleSwitch(component) { viewInfo.name = component.name } } + +export function syncViewTitle(element) { + if ( + element && + ['UserView', 'VQuery'].includes(element.component) && + canvasViewInfo.value[element.id] + ) { + canvasViewInfo.value[element.id].title = element.name + } +} 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 805abc73b5..6eee8e395b 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -151,6 +151,10 @@ const closeEditComponentName = () => { return } view.value.title = inputComponentName.value.name + if (curComponent.value) { + curComponent.value.label = inputComponentName.value.name + curComponent.value.name = inputComponentName.value.name + } inputComponentName.value.name = '' inputComponentName.value.id = '' } @@ -1134,6 +1138,10 @@ const onChangeMiscStyleForm = val => { const onTextChange = val => { view.value.customStyle.text = val + if (curComponent.value) { + curComponent.value.name = val + curComponent.value.title = value + } if (mobileInPc.value) { //移动端设计 useEmitt().emitter.emit('onMobileStatusChange', {