diff --git a/core/core-frontend/src/assets/img/bg-mobile.png b/core/core-frontend/src/assets/img/bg-mobile.png index 946b99d250..70f2a5edd1 100644 Binary files a/core/core-frontend/src/assets/img/bg-mobile.png and b/core/core-frontend/src/assets/img/bg-mobile.png differ diff --git a/core/core-frontend/src/assets/svg/icon_phone_outlined.svg b/core/core-frontend/src/assets/svg/icon_phone_outlined.svg index 4e1f3c7f20..92ef5b1b34 100644 --- a/core/core-frontend/src/assets/svg/icon_phone_outlined.svg +++ b/core/core-frontend/src/assets/svg/icon_phone_outlined.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/core/core-frontend/src/assets/svg/mobile-checkbox.svg b/core/core-frontend/src/assets/svg/mobile-checkbox.svg index 7ccf53109d..2bee03e0ed 100644 --- a/core/core-frontend/src/assets/svg/mobile-checkbox.svg +++ b/core/core-frontend/src/assets/svg/mobile-checkbox.svg @@ -1,4 +1,4 @@ - - + + diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue index 712cbe22b2..ca560cbaa9 100644 --- a/core/core-frontend/src/components/dashboard/DbToolbar.vue +++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue @@ -186,10 +186,6 @@ const multiplexingCanvasOpen = () => { multiplexingRef.value.dialogInit() } -const mobileConfig = () => { - useEmitt().emitter.emit('mobileConfig') -} - eventBus.on('preview', previewInner) eventBus.on('save', saveCanvasWithCheck) eventBus.on('clearCanvas', clearCanvas) @@ -198,6 +194,10 @@ const openDataBoardSetting = () => { dvMainStore.setCurComponent({ component: null, index: null }) } +const openMobileSetting = () => { + useEmitt().emitter.emit('mobileConfig') +} + const batchDelete = () => { const componentDataTemp = deepCopy(componentData.value) componentDataTemp.forEach(component => { @@ -423,12 +423,6 @@ const isDataEaseBi = computed(() => appStore.getIsDataEaseBi) is-label @customClick="multiplexingCanvasOpen" > - @@ -449,6 +443,14 @@ const isDataEaseBi = computed(() => appStore.getIsDataEaseBi) icon-name="dv-dashboard" /> +
+ + + @@ -647,6 +649,12 @@ const isDataEaseBi = computed(() => appStore.getIsDataEaseBi) display: flex; align-items: center; justify-content: right; + + .divider { + background: #ffffff4d; + width: 1px; + height: 18px; + } } .custom-el-icon { margin-left: 15px; diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index 36c4038ceb..ea0c530475 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -932,6 +932,7 @@ onMounted(() => { z-index: 2; font-size: 16px; cursor: pointer; + color: var(--ed-color-primary); } } diff --git a/core/core-frontend/src/components/visualization/ComponentButton.vue b/core/core-frontend/src/components/visualization/ComponentButton.vue index 626b022b27..730d944f3e 100644 --- a/core/core-frontend/src/components/visualization/ComponentButton.vue +++ b/core/core-frontend/src/components/visualization/ComponentButton.vue @@ -24,7 +24,9 @@ const emits = defineEmits(['customClick']) v-on:click="emits('customClick')" > - + + + {{ title }} @@ -35,17 +37,35 @@ const emits = defineEmits(['customClick']) padding-right: 10px; } .group_inner { - padding: 5px; display: flex; cursor: pointer; - flex-direction: column; align-items: center; + justify-content: center; border-radius: 4px; + color: #ffffff99; + position: relative; + &::after { + content: ''; + border-radius: 4px; + display: none; + position: absolute; + width: calc(100% + 10px); + height: calc(100% + 10px); + top: -5px; + left: -5px; + } + &:hover { - background: rgba(255, 255, 255, 0.1); + &::after { + display: block; + background: rgba(255, 255, 255, 0.1); + } } &:active { - background: rgba(255, 255, 255, 0.2); + &::after { + display: block; + background: rgba(255, 255, 255, 0.2); + } } span { float: left; @@ -65,8 +85,6 @@ const emits = defineEmits(['customClick']) } .toolbar-icon { - float: left; - width: 20px; - height: 20px; + font-size: 20px; } diff --git a/core/core-frontend/src/components/visualization/common/DragInfo.vue b/core/core-frontend/src/components/visualization/common/DragInfo.vue index f59e87ba0e..0601e3ad8e 100644 --- a/core/core-frontend/src/components/visualization/common/DragInfo.vue +++ b/core/core-frontend/src/components/visualization/common/DragInfo.vue @@ -1,9 +1,12 @@ @@ -12,7 +15,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { storeToRefs } from 'pinia' const dvMainStore = dvMainStoreWithOut() -const { dvInfo } = storeToRefs(dvMainStore) +const { dvInfo, mobileInPc } = storeToRefs(dvMainStore) const tips = '从顶部工具栏中选择组件,添加到这里创建' + @@ -26,6 +29,15 @@ const tips = top: calc(40% - 90px); width: 250px; height: 180px; + + .mobile-in-pc-tips { + color: #646a73; + font-size: 16px; + font-weight: 400; + line-height: 28px; + text-align: center; + margin-top: 40%; + } } .tips-info { diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue index 07504d56db..f8a07505c1 100644 --- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue +++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue @@ -159,7 +159,7 @@ const save = () => { {{ dvInfo.name }}
-