center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #12358 from ulleo/dev-v2

Browse Source 
refactor(图表): 双轴图编辑页面样式调整
This commit is contained in:
ulleo 2024-09-20 22:09:20 +08:00 committed by GitHub
commit 0b99e803af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/data-visualization/RealTimeGroup.vue
View File

@ -26,6 +26,7 @@ import bubbleMapOrigin from '@/assets/svg/bubble-map-origin.svg'
import chartMixGroupOrigin from '@/assets/svg/chart-mix-group-origin.svg'
import chartMixOrigin from '@/assets/svg/chart-mix-origin.svg'
import chartMixStackOrigin from '@/assets/svg/chart-mix-stack-origin.svg'
import chartMixDualLineOrigin from '@/assets/svg/chart-mix-dual-line-origin.svg'
import flowMapOrigin from '@/assets/svg/flow-map-origin.svg'
import funnelOrigin from '@/assets/svg/funnel-origin.svg'
import gaugeOrigin from '@/assets/svg/gauge-origin.svg'
@ -202,6 +203,7 @@ const iconMap = {
'chart-mix-group-origin': chartMixGroupOrigin,
'chart-mix-origin': chartMixOrigin,
'chart-mix-stack-origin': chartMixStackOrigin,
'chart-mix-dual-line': chartMixDualLineOrigin,
'flow-map-origin': flowMapOrigin,
'funnel-origin': funnelOrigin,
'gauge-origin': gaugeOrigin,

2
core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
View File

@ -26,6 +26,7 @@ import bubbleMapOrigin from '@/assets/svg/bubble-map-origin.svg'
import chartMixGroupOrigin from '@/assets/svg/chart-mix-group-origin.svg'
import chartMixOrigin from '@/assets/svg/chart-mix-origin.svg'
import chartMixStackOrigin from '@/assets/svg/chart-mix-stack-origin.svg'
import chartMixDualLineOrigin from '@/assets/svg/chart-mix-dual-line-origin.svg'
import flowMapOrigin from '@/assets/svg/flow-map-origin.svg'
import funnelOrigin from '@/assets/svg/funnel-origin.svg'
import gaugeOrigin from '@/assets/svg/gauge-origin.svg'
@ -293,6 +294,7 @@ const iconMap = {
'chart-mix-group-origin': chartMixGroupOrigin,
'chart-mix-origin': chartMixOrigin,
'chart-mix-stack-origin': chartMixStackOrigin,
'chart-mix-dual-line-origin': chartMixDualLineOrigin,
'flow-map-origin': flowMapOrigin,
'funnel-origin': funnelOrigin,
'gauge-origin': gaugeOrigin,

44
core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="batch-opt-main view-panel-row">
<div class="batch-opt-main view-panel-row tab-header">
<chart-style
v-if="mixProperties && batchOptComponentInfo && batchOptComponentType === 'UserView'"
class="chart-style-main"
@ -294,4 +294,46 @@ const onStyleAttrChange = params => {
}
}
}
.tab-header {
--ed-tabs-header-height: 34px;
--custom-tab-color: #646a73;
:deep(.ed-tabs__nav-wrap::after) {
background-color: unset;
}
&.dark {
--custom-tab-color: #a6a6a6;
}
height: 100%;
:deep(.ed-tabs__header) {
border-top: solid 1px @side-outline-border-color;
}
:deep(.ed-tabs__item) {
font-weight: 400;
font-size: 12px;
padding: 0 8px !important;
margin-right: 12px;
color: var(--custom-tab-color);
}
:deep(.is-active) {
font-weight: 500;
color: var(--ed-color-primary, #3370ff);
}
:deep(.ed-tabs__nav-scroll) {
padding-left: 0 !important;
}
:deep(.ed-tabs__header) {
margin: 0 !important;
}
:deep(.ed-tabs__content) {
height: calc(100% - 35px);
overflow-y: auto;
overflow-x: hidden;
}
}
</style>