github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor(数据大屏、仪表板): 桌面版隐藏仪表板显示放大、导出等悬浮按钮配置项

Browse Source
This commit is contained in:
wangjiahao 2025-01-06 17:31:22 +08:00 committed by 王嘉豪
parent 32490e5df9
commit 1fc3268ef6
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue
View File

@ -196,7 +196,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-show="dvInfo.type === 'dashboard'" v-show="dvInfo.type === 'dashboard' && !isDesktopFlag"
style="margin-top: 16px; margin-bottom: 8px" style="margin-top: 16px; margin-bottom: 8px"
:class="'form-item-' + themes" :class="'form-item-' + themes"
> >
@ -273,8 +273,9 @@ import {
import { ElFormItem, ElIcon, ElSpace } from 'element-plus-secondary' import { ElFormItem, ElIcon, ElSpace } from 'element-plus-secondary'
import Icon from '@/components/icon-custom/src/Icon.vue' import Icon from '@/components/icon-custom/src/Icon.vue'
import { useAppearanceStoreWithOut } from '@/store/modules/appearance' import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
import { isDesktop } from '@/utils/ModelUtil'
const appearanceStore = useAppearanceStoreWithOut() const appearanceStore = useAppearanceStoreWithOut()
const isDesktopFlag = isDesktop()
const snapshotStore = snapshotStoreWithOut() const snapshotStore = snapshotStoreWithOut()
const props = defineProps({ const props = defineProps({
themes: { themes: {

5
core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
View File

@ -20,12 +20,14 @@ import DatasetParamsComponent from '@/components/visualization/DatasetParamsComp
import DeFullscreen from '@/components/visualization/common/DeFullscreen.vue' import DeFullscreen from '@/components/visualization/common/DeFullscreen.vue'
import EmptyBackground from '../../empty-background/src/EmptyBackground.vue' import EmptyBackground from '../../empty-background/src/EmptyBackground.vue'
import LinkOptBar from '@/components/data-visualization/canvas/LinkOptBar.vue' import LinkOptBar from '@/components/data-visualization/canvas/LinkOptBar.vue'
import { isDesktop } from '@/utils/ModelUtil'
const dvMainStore = dvMainStoreWithOut() const dvMainStore = dvMainStoreWithOut()
const { pcMatrixCount, curComponent, mobileInPc, canvasState, inMobile } = storeToRefs(dvMainStore) const { pcMatrixCount, curComponent, mobileInPc, canvasState, inMobile } = storeToRefs(dvMainStore)
const openHandler = ref(null) const openHandler = ref(null)
const customDatasetParamsRef = ref(null) const customDatasetParamsRef = ref(null)
const emits = defineEmits(['onResetLayout']) const emits = defineEmits(['onResetLayout'])
const fullScreeRef = ref(null) const fullScreeRef = ref(null)
const isDesktopFlag = isDesktop()
const props = defineProps({ const props = defineProps({
canvasStyleData: { canvasStyleData: {
type: Object, type: Object,
@ -426,7 +428,8 @@ const linkOptBarShow = computed(() => {
canvasStyleData.value.suspensionButtonAvailable && canvasStyleData.value.suspensionButtonAvailable &&
!inMobile.value && !inMobile.value &&
!mobileInPc.value && !mobileInPc.value &&
showPopBar.value showPopBar.value &&
!isDesktopFlag
) )
}) })

10
core/core-frontend/src/components/visualization/CanvasBaseSetting.vue
View File

@ -41,7 +41,11 @@
</el-checkbox> </el-checkbox>
</el-form-item> </el-form-item>
<el-form-item class="form-item no-margin-bottom" :class="'form-item-' + themes"> <el-form-item
v-if="!isDesktopFlag"
class="form-item no-margin-bottom"
:class="'form-item-' + themes"
>
<el-checkbox <el-checkbox
size="small" size="small"
:effect="themes" :effect="themes"
@ -86,11 +90,15 @@ import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
import { CHART_FONT_FAMILY_ORIGIN } from '@/views/chart/components/editor/util/chart' import { CHART_FONT_FAMILY_ORIGIN } from '@/views/chart/components/editor/util/chart'
import { adaptTitleFontFamilyAll } from '@/utils/canvasStyle' import { adaptTitleFontFamilyAll } from '@/utils/canvasStyle'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { isDesktop } from '@/utils/ModelUtil'
const snapshotStore = snapshotStoreWithOut() const snapshotStore = snapshotStoreWithOut()
const { t } = useI18n() const { t } = useI18n()
const dvMainStore = dvMainStoreWithOut() const dvMainStore = dvMainStoreWithOut()
const { canvasStyleData } = storeToRefs(dvMainStore) const { canvasStyleData } = storeToRefs(dvMainStore)
const appearanceStore = useAppearanceStoreWithOut() const appearanceStore = useAppearanceStoreWithOut()
const isDesktopFlag = isDesktop()
const fontFamily = CHART_FONT_FAMILY_ORIGIN.concat( const fontFamily = CHART_FONT_FAMILY_ORIGIN.concat(
appearanceStore.fontList.map(ele => ({ appearanceStore.fontList.map(ele => ({
name: ele.name, name: ele.name,