From 5a217e889620a3ac81ff47c75873e05d723c4868 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Tue, 5 Mar 2024 16:12:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=9B=BE=E8=A1=A8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/style/index.less | 4 +- .../views/components/ChartComponentG2Plot.vue | 10 +++-- .../views/components/ChartComponentS2.vue | 10 +++-- .../views/chart/components/views/index.vue | 4 +- .../src/views/dashboard/MobileConfigPanel.vue | 45 +++++++++---------- .../src/views/share/share/ShareGrid.vue | 2 +- .../src/views/workbranch/ShortcutTable.vue | 4 -- 7 files changed, 39 insertions(+), 40 deletions(-) diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index dfd88a0461..5f4a23b210 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -364,11 +364,11 @@ em { } .color-panel { - background: var(--ed-color-primary); + background: #3370ff; } .color-dashboard { - background: var(--ed-color-primary); + background: #3370ff; } .color-screen { 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..797c6f7c4c 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 @@ -17,7 +17,7 @@ import { customAttrTrans, customStyleTrans, recursionTransObj } from '@/utils/ca import { deepCopy } from '@/utils/utils' const dvMainStore = dvMainStoreWithOut() -const { nowPanelTrackInfo, nowPanelJumpInfo } = storeToRefs(dvMainStore) +const { nowPanelTrackInfo, nowPanelJumpInfo, mobileInPc } = storeToRefs(dvMainStore) const props = defineProps({ view: { @@ -224,7 +224,7 @@ const trackClick = trackAction => { dvMainStore.addViewTrackFilter(linkageParam) break case 'jump': - if (isDataEaseBi.value) return + if (isDataEaseBi.value || mobileInPc.value) return emit('onJumpClick', jumpParam) break default: @@ -247,7 +247,11 @@ const trackMenu = computed(() => { jumpCount++ } }) - jumpCount && view.value?.jumpActive && !isDataEaseBi.value && trackMenuInfo.push('jump') + jumpCount && + view.value?.jumpActive && + !isDataEaseBi.value && + !mobileInPc.value && + trackMenuInfo.push('jump') linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage') view.value.drillFields.length && trackMenuInfo.push('drill') } 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..186f74e464 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 @@ -29,7 +29,7 @@ import { deepCopy } from '@/utils/utils' import { useEmitt } from '@/hooks/web/useEmitt' const dvMainStore = dvMainStoreWithOut() -const { nowPanelTrackInfo, nowPanelJumpInfo } = storeToRefs(dvMainStore) +const { nowPanelTrackInfo, nowPanelJumpInfo, mobileInPc } = storeToRefs(dvMainStore) const { emitter } = useEmitt() const props = defineProps({ @@ -268,7 +268,7 @@ const trackClick = trackAction => { dvMainStore.addViewTrackFilter(linkageParam) break case 'jump': - if (isDataEaseBi.value) return + if (isDataEaseBi.value || mobileInPc.value) return emit('onJumpClick', jumpParam) break default: @@ -292,7 +292,11 @@ const trackMenu = computed(() => { jumpCount++ } }) - jumpCount && view.value?.jumpActive && !isDataEaseBi.value && trackMenuInfo.push('jump') + jumpCount && + view.value?.jumpActive && + !isDataEaseBi.value && + !mobileInPc.value && + trackMenuInfo.push('jump') linkageCount && view.value?.linkageActive && trackMenuInfo.push('linkage') view.value.drillFields.length && trackMenuInfo.push('drill') return trackMenuInfo 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..d7761f286d 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -46,7 +46,7 @@ const dvMainStore = dvMainStoreWithOut() let innerRefreshTimer = null -const { nowPanelJumpInfo, publicLinkStatus, dvInfo, curComponent, canvasStyleData } = +const { nowPanelJumpInfo, publicLinkStatus, dvInfo, curComponent, canvasStyleData, mobileInPc } = storeToRefs(dvMainStore) const props = defineProps({ @@ -157,7 +157,7 @@ const hasLinkIcon = computed(() => { return trackMenu.value.indexOf('linkage') > -1 }) const hasJumpIcon = computed(() => { - return trackMenu.value.indexOf('jump') > -1 + return trackMenu.value.indexOf('jump') > -1 && !mobileInPc.value }) const hasDrillIcon = computed(() => { return trackMenu.value.indexOf('drill') > -1 diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue index f8a07505c1..60fd44e3ac 100644 --- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue +++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue @@ -2,12 +2,11 @@ import { ref, onMounted, unref, onBeforeUnmount, computed } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus-secondary' import MobileBackgroundSelector from './MobileBackgroundSelector.vue' +import ComponentWrapper from '@/components/data-visualization/canvas/ComponentWrapper.vue' import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot' import { canvasSave } from '@/utils/canvasUtils' import { useEmitt } from '@/hooks/web/useEmitt' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' -import { getStyle } from '@/utils/style' -import findComponent from '@/utils/components' import { storeToRefs } from 'pinia' const dvMainStore = dvMainStoreWithOut() const { componentData, canvasStyleData, canvasViewInfo, dvInfo } = storeToRefs(dvMainStore) @@ -15,8 +14,13 @@ const mobileLoading = ref(true) const emits = defineEmits(['pcMode']) const snapshotStore = snapshotStoreWithOut() -const getComponentStyleDefault = style => { - return getStyle(style, ['top', 'left', 'width', 'height', 'rotate']) +const getComponentStyleDefault = () => { + return { + top: 0, + left: 0, + width: '190px', + height: '190px' + } } const mobileStatusChange = (type, value) => { const iframe = document.querySelector('iframe') @@ -173,35 +177,26 @@ const save = () => {
-
-
+
@@ -288,7 +283,7 @@ const save = () => { .config-panel-content { width: 100%; - height: calc(100% - 130px); + height: calc(100% - 127px); border-bottom-left-radius: 45px; border-bottom-right-radius: 45px; overflow: hidden; diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue index 93444ef79b..d1037b2256 100644 --- a/core/core-frontend/src/views/share/share/ShareGrid.vue +++ b/core/core-frontend/src/views/share/share/ShareGrid.vue @@ -235,7 +235,7 @@ watch( margin-right: 12px; border-radius: 4px; color: #fff; - background: var(--ed-color-primary); + background: #3370ff; } .name-star { font-size: 15px; diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue index a030ce4e8b..56dab076ab 100644 --- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue +++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue @@ -416,10 +416,6 @@ const getEmptyDesc = (): string => { .name-content { display: flex; align-items: center; - - .color-panel { - background: #3370ff !important; - } .custom-icon { display: none; }