Skip to content

Commit 800c830

Browse files
ziyujiahaodataeaseShu
ziyujiahao
authored and
dataeaseShu
committed
fix(仪表板、数据大屏): 仪表板、数据大屏更多的组件支持改名，且标题栏和图层栏名称保持一致 dataease#14110 
1 parent 1a0420b commit 800c830

File tree

8 files changed

+45
-13
lines changed

8 files changed

+45
-13
lines changed

‎core/core-frontend/src/components/data-visualization/RealTimeGroup.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import ComposeShow from '@/components/data-visualization/canvas/ComposeShow.vue'
7777
import { composeStoreWithOut } from '@/store/modules/data-visualization/compose'
7878
import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg'
7979
import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue'
80+
import { syncViewTitle } from '@/utils/canvasUtils'
8081
const dropdownMore = ref(null)
8182
const lockStore = lockStoreWithOut()
8283
@@ -140,6 +141,7 @@ const closeEditComponentName = () => {
140141
return
141142
}
142143
curEditComponent.name = inputName.value
144+
syncViewTitle(curEditComponent)
143145
inputName.value = ''
144146
curEditComponent = null
145147
}

‎core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ import dvShow from '@/assets/svg/dv-show.svg'
6161
import dvUnlock from '@/assets/svg/dv-unlock.svg'
6262
import dvLock from '@/assets/svg/dv-lock.svg'
6363
import dvMore from '@/assets/svg/dv-more.svg'
64-
import dvExpandDown from '@/assets/svg/dv-expand-down.svg'
65-
import dvExpandRight from '@/assets/svg/dv-expand-right.svg'
6664
import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
6765
import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
6866
import { layerStoreWithOut } from '@/store/modules/data-visualization/layer'
@@ -76,7 +74,7 @@ import ContextMenuAsideDetails from '@/components/data-visualization/canvas/Cont
7674
import ComposeShow from '@/components/data-visualization/canvas/ComposeShow.vue'
7775
import { composeStoreWithOut } from '@/store/modules/data-visualization/compose'
7876
import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg'
79-
import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue'
77+
import { syncViewTitle } from '@/utils/canvasUtils'
8078
const dropdownMore = ref(null)
8179
const lockStore = lockStoreWithOut()
8280
@@ -140,6 +138,7 @@ const closeEditComponentName = () => {
140138
return
141139
}
142140
curEditComponent.name = inputName.value
141+
syncViewTitle(curEditComponent)
143142
inputName.value = ''
144143
curEditComponent = null
145144
}

‎core/core-frontend/src/components/data-visualization/RealTimeListTree.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ import { contextmenuStoreWithOut } from '@/store/modules/data-visualization/cont
8181
import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue'
8282
import { useI18n } from '@/hooks/web/useI18n'
8383
import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg'
84-
import { checkJoinGroup } from '@/utils/canvasUtils'
84+
import { checkJoinGroup, syncViewTitle } from '@/utils/canvasUtils'
8585
import { useEmitt } from '@/hooks/web/useEmitt'
8686
const dropdownMore = ref(null)
8787
const lockStore = lockStoreWithOut()
@@ -220,6 +220,7 @@ const closeEditComponentName = () => {
220220
return
221221
}
222222
curEditComponent.name = inputName.value
223+
syncViewTitle(curEditComponent)
223224
inputName.value = ''
224225
curEditComponent = null
225226
}

‎core/core-frontend/src/components/data-visualization/RealTimeTab.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import draggable from 'vuedraggable'
1212
import { composeStoreWithOut } from '@/store/modules/data-visualization/compose'
1313
import RealTimeGroup from '@/components/data-visualization/RealTimeGroup.vue'
1414
import eventBus from '@/utils/eventBus'
15+
import { syncViewTitle } from '@/utils/canvasUtils'
1516
1617
const dvMainStore = dvMainStoreWithOut()
1718
const snapshotStore = snapshotStoreWithOut()
@@ -69,6 +70,7 @@ const closeEditComponentName = () => {
6970
return
7071
}
7172
curEditComponent.title = inputName.value
73+
syncViewTitle(curEditComponent)
7274
inputName.value = ''
7375
curEditComponent = null
7476
}

‎core/core-frontend/src/components/visualization/DvSidebar.vue

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const props = defineProps({
6161
title: String
6262
})
6363
64-
const { width, asidePosition, sideName, themeInfo, view, themes } = toRefs(props)
64+
const { width, asidePosition, sideName, themeInfo, view, themes, element } = toRefs(props)
6565
const collapseChange = () => {
6666
canvasCollapse.value[sideName.value] = !canvasCollapse.value[sideName.value]
6767
}
@@ -81,7 +81,10 @@ const closeEditComponentName = () => {
8181
if (!inputComponentName.value.name || !inputComponentName.value.name.trim()) {
8282
return
8383
}
84-
if (inputComponentName.value.name.trim() === view.value.title) {
84+
if (
85+
inputComponentName.value.name.trim() === view.value?.title ||
86+
inputComponentName.value.name.trim() === element.value.name
87+
) {
8588
return
8689
}
8790
if (
@@ -92,19 +95,26 @@ const closeEditComponentName = () => {
9295
editComponentName()
9396
return
9497
}
95-
view.value.title = inputComponentName.value.name
98+
element.value.label = inputComponentName.value.name
99+
element.value.name = inputComponentName.value.name
100+
if (isViewTitle.value) {
101+
view.value.title = inputComponentName.value.name
102+
}
96103
inputComponentName.value.name = ''
97104
}
98105
99106
const editComponentName = () => {
107+
componentNameEdit.value = true
100108
if (isViewTitle.value) {
101-
componentNameEdit.value = true
102109
inputComponentName.value.name = view.value.title
103110
inputComponentName.value.id = view.value.id
104-
nextTick(() => {
105-
componentNameInputAttr.value.focus()
106-
})
111+
} else {
112+
inputComponentName.value.name = element.value.name
113+
inputComponentName.value.id = element.value.id
107114
}
115+
nextTick(() => {
116+
componentNameInputAttr.value.focus()
117+
})
108118
}
109119
110120
const onComponentNameChange = () => {

‎core/core-frontend/src/custom-component/component-list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ const list = [
282282
},
283283
{
284284
component: 'VQuery',
285-
name: t('visualization.query'),
286-
label: t('visualization.query'),
285+
name: t('visualization.query_component'),
286+
label: t('visualization.query_component'),
287287
propValue: '',
288288
icon: 'icon_search',
289289
innerType: 'VQuery',

‎core/core-frontend/src/utils/canvasUtils.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -983,3 +983,13 @@ export function mobileViewStyleSwitch(component) {
983983
viewInfo.name = component.name
984984
}
985985
}
986+
987+
export function syncViewTitle(element) {
988+
if (
989+
element &&
990+
['UserView', 'VQuery'].includes(element.component) &&
991+
canvasViewInfo.value[element.id]
992+
) {
993+
canvasViewInfo.value[element.id].title = element.name
994+
}
995+
}

‎core/core-frontend/src/views/chart/components/editor/index.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ const closeEditComponentName = () => {
151151
return
152152
}
153153
view.value.title = inputComponentName.value.name
154+
if (curComponent.value) {
155+
curComponent.value.label = inputComponentName.value.name
156+
curComponent.value.name = inputComponentName.value.name
157+
}
154158
inputComponentName.value.name = ''
155159
inputComponentName.value.id = ''
156160
}
@@ -1134,6 +1138,10 @@ const onChangeMiscStyleForm = val => {
11341138
11351139
const onTextChange = val => {
11361140
view.value.customStyle.text = val
1141+
if (curComponent.value) {
1142+
curComponent.value.name = val
1143+
curComponent.value.title = value
1144+
}
11371145
if (mobileInPc.value) {
11381146
//移动端设计
11391147
useEmitt().emitter.emit('onMobileStatusChange', {

0 commit comments

Comments
 (0)