public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-21 04:08:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10242 from ulleo/dev-v2

Browse Source 
feat(图表): 新增分组柱线组合图&堆叠柱线组合图
This commit is contained in:
ulleo
2024-06-13 14:16:45 +08:00
committed by GitHub
parent 7d7831cef9 0e1fadb936
commit 9b60b15a30
15 changed files with 213 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/core-frontend/src/components/visualization/UserViewEnlarge.vue
View File

@@ -64,12 +64,12 @@
show-position="viewDialog"
/>
<chart-component-s2
v-if="optType === 'details' && sourceViewType !== 'chart-mix'"
v-if="optType === 'details' && !sourceViewType.includes('chart-mix')"
:view="viewInfo"
show-position="viewDialog"
ref="chartComponentDetails"
/>
<template v-else-if="optType === 'details' && sourceViewType === 'chart-mix'">
<template v-else-if="optType === 'details' && sourceViewType.includes('chart-mix')">
<el-tabs class="tab-header" v-model="activeName" @tab-change="handleClick">
<el-tab-pane :label="t('chart.drag_block_value_axis_left')" name="left"></el-tab-pane>
<el-tab-pane :label="t('chart.drag_block_value_axis_right')" name="right"></el-tab-pane>
@@ -214,7 +214,7 @@ const dialogInit = (canvasStyle, view, item, opt) => {
const dataDetailsOpt = () => {
nextTick(() => {
const viewDataInfo = dvMainStore.getViewDataDetails(viewInfo.value.id)
if (sourceViewType.value === 'chart-mix') {
if (sourceViewType.value.includes('chart-mix')) {
chartComponentDetails.value?.renderChartFromDialog(viewInfo.value, viewDataInfo.left)
chartComponentDetails2.value?.renderChartFromDialog(viewInfo.value, viewDataInfo.right)
} else {