Merge pull request #7865 from dataease/pr@dev-v2@style_panel

style: 仪表板编辑框样式调整
This commit is contained in:
王嘉豪 2024-01-28 17:26:28 +08:00 committed by GitHub
commit 3dcb2d1663
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 4 deletions

View File

@ -143,7 +143,7 @@ onUnmounted(() => {
</el-row> </el-row>
</template> </template>
<style lang="less"> <style scoped lang="less">
.custom-main { .custom-main {
display: flex; display: flex;
width: 100%; width: 100%;

View File

@ -167,7 +167,11 @@ const composeDivider = computed(() => {
placement="right-start" placement="right-start"
popper-class="context-menu-details" popper-class="context-menu-details"
> >
<li>对齐</li> <li>
<div>
<span>对齐</span><el-icon><ArrowRight /></el-icon>
</div>
</li>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item style="width: 118px" @click="alignment('left')" <el-dropdown-item style="width: 118px" @click="alignment('left')"
@ -254,7 +258,7 @@ const composeDivider = computed(() => {
i { i {
position: absolute; position: absolute;
left: 30px; right: 0px;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
@ -268,5 +272,6 @@ const composeDivider = computed(() => {
.custom-divider { .custom-divider {
border-color: #434343 !important; border-color: #434343 !important;
margin: 0px;
} }
</style> </style>

View File

@ -191,6 +191,13 @@ const checkLabelContent = contentProp => {
const showProperty = prop => { const showProperty = prop => {
return props.propertyInner?.includes(prop) return props.propertyInner?.includes(prop)
} }
const showEmpty = computed(() => {
return (
props.propertyInner.length === 0 ||
(batchOptStatus.value && showProperty('seriesLabelFormatter'))
)
})
const showSeriesLabelFormatter = computed(() => { const showSeriesLabelFormatter = computed(() => {
return !batchOptStatus.value && showProperty('seriesLabelFormatter') return !batchOptStatus.value && showProperty('seriesLabelFormatter')
}) })
@ -210,6 +217,7 @@ onMounted(() => {
:model="state.labelForm" :model="state.labelForm"
label-position="top" label-position="top"
> >
<el-row v-show="showEmpty" style="margin-bottom: 12px"> 无其他可设置的属性 </el-row>
<el-space> <el-space>
<el-form-item <el-form-item
class="form-item" class="form-item"

View File

@ -127,7 +127,7 @@ onMounted(() => {
<el-radio-group <el-radio-group
class="icon-radio-group" class="icon-radio-group"
v-model="state.tableCellForm.tableItemAlign" v-model="state.tableCellForm.tableItemAlign"
@change="changeTableCell('tableHeaderAlign')" @change="changeTableCell('tableItemAlign')"
> >
<el-radio label="left"> <el-radio label="left">
<el-tooltip effect="dark" placement="top"> <el-tooltip effect="dark" placement="top">