forked from github/dataease
Merge pull request #13130 from dataease/pr@dev-v2@refactor_screen-style
refactor(仪表板、数据大屏): 优化全屏滚动条样式,移动端提示样式等问题
This commit is contained in:
commit
3eb36e0fbb
@ -325,7 +325,6 @@ const upload = file => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const onBackgroundChange = () => {
|
const onBackgroundChange = () => {
|
||||||
snapshotStore.recordSnapshotCacheToMobile('commonBackground')
|
|
||||||
emits('onBackgroundChange', state.commonBackground)
|
emits('onBackgroundChange', state.commonBackground)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,6 +53,7 @@ const dashboardActive = computed(() => {
|
|||||||
|
|
||||||
const onBackgroundChange = val => {
|
const onBackgroundChange = val => {
|
||||||
element.value.commonBackground = val
|
element.value.commonBackground = val
|
||||||
|
snapshotStore.recordSnapshotCacheToMobile('commonBackground')
|
||||||
emits('onAttrChange', { custom: 'commonBackground' })
|
emits('onAttrChange', { custom: 'commonBackground' })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ const props = defineProps({
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
const dvMainStore = dvMainStoreWithOut()
|
const dvMainStore = dvMainStoreWithOut()
|
||||||
const { batchOptStatus } = storeToRefs(dvMainStore)
|
const { batchOptStatus, mobileInPc } = storeToRefs(dvMainStore)
|
||||||
const predefineColors = COLOR_PANEL
|
const predefineColors = COLOR_PANEL
|
||||||
const toolTip = computed(() => {
|
const toolTip = computed(() => {
|
||||||
return props.themes === 'dark' ? 'ndark' : 'dark'
|
return props.themes === 'dark' ? 'ndark' : 'dark'
|
||||||
@ -45,7 +45,12 @@ const emit = defineEmits(['onTooltipChange', 'onExtTooltipChange'])
|
|||||||
const curSeriesFormatter = ref<DeepPartial<SeriesFormatter>>({})
|
const curSeriesFormatter = ref<DeepPartial<SeriesFormatter>>({})
|
||||||
const quotaData = ref<Axis[]>(inject('quotaData'))
|
const quotaData = ref<Axis[]>(inject('quotaData'))
|
||||||
const showSeriesTooltipFormatter = computed(() => {
|
const showSeriesTooltipFormatter = computed(() => {
|
||||||
return showProperty('seriesTooltipFormatter') && !batchOptStatus.value && props.chart.id
|
return (
|
||||||
|
showProperty('seriesTooltipFormatter') &&
|
||||||
|
!batchOptStatus.value &&
|
||||||
|
!mobileInPc.value &&
|
||||||
|
props.chart.id
|
||||||
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
// 切换图表类型直接重置为默认
|
// 切换图表类型直接重置为默认
|
||||||
@ -488,7 +493,7 @@ onMounted(() => {
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-space>
|
</el-space>
|
||||||
|
|
||||||
<div v-if="showProperty('showFields') && !batchOptStatus">
|
<div v-if="showProperty('showFields') && !batchOptStatus && !mobileInPc">
|
||||||
<el-form-item :label="t('chart.tooltip')" class="form-item" :class="'form-item-' + themes">
|
<el-form-item :label="t('chart.tooltip')" class="form-item" :class="'form-item-' + themes">
|
||||||
<el-select
|
<el-select
|
||||||
size="small"
|
size="small"
|
||||||
|
@ -101,5 +101,8 @@ defineExpose({
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center; /* 上下居中 */
|
justify-content: center; /* 上下居中 */
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -205,6 +205,9 @@ defineExpose({
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
.content {
|
.content {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -212,9 +215,5 @@ defineExpose({
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
::-webkit-scrollbar {
|
|
||||||
width: 0px !important;
|
|
||||||
height: 0px !important;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
Loading…
Reference in New Issue
Block a user