|
@@ -7,7 +7,7 @@
|
|
|
ref="form"
|
|
ref="form"
|
|
|
>
|
|
>
|
|
|
<template v-if="curEdit.type !== 'Cp' && curEdit.type !== 'pareto'">
|
|
<template v-if="curEdit.type !== 'Cp' && curEdit.type !== 'pareto'">
|
|
|
- <el-form-item label="纬度标签">
|
|
|
|
|
|
|
+ <el-form-item label="纬度标签" v-if="curEdit.type !== 'funnelPlot2'">
|
|
|
<div
|
|
<div
|
|
|
slot="label"
|
|
slot="label"
|
|
|
style="
|
|
style="
|
|
@@ -116,7 +116,8 @@
|
|
|
// curEdit.type !== 'roseChart' &&
|
|
// curEdit.type !== 'roseChart' &&
|
|
|
curEdit.type !== 'pie' &&
|
|
curEdit.type !== 'pie' &&
|
|
|
curEdit.type !== 'doughnut' &&
|
|
curEdit.type !== 'doughnut' &&
|
|
|
- curEdit.type !== 'sankeyDiagram'
|
|
|
|
|
|
|
+ curEdit.type !== 'sankeyDiagram' &&
|
|
|
|
|
+ curEdit.type !== 'funnelPlot2'
|
|
|
"
|
|
"
|
|
|
>
|
|
>
|
|
|
<i
|
|
<i
|
|
@@ -158,7 +159,8 @@
|
|
|
// curEdit.type !== 'roseChart' &&
|
|
// curEdit.type !== 'roseChart' &&
|
|
|
curEdit.type !== 'pie' &&
|
|
curEdit.type !== 'pie' &&
|
|
|
curEdit.type !== 'doughnut' &&
|
|
curEdit.type !== 'doughnut' &&
|
|
|
- curEdit.type !== 'sankeyDiagram'
|
|
|
|
|
|
|
+ curEdit.type !== 'sankeyDiagram' &&
|
|
|
|
|
+ curEdit.type !== 'funnelPlot2'
|
|
|
"
|
|
"
|
|
|
:content="
|
|
:content="
|
|
|
formLabelAlign.Ydata.length <= 1
|
|
formLabelAlign.Ydata.length <= 1
|
|
@@ -570,7 +572,8 @@
|
|
|
curEdit.type !== 'doughnut' &&
|
|
curEdit.type !== 'doughnut' &&
|
|
|
curEdit.type !== 'radar' &&
|
|
curEdit.type !== 'radar' &&
|
|
|
curEdit.type !== 'roseChart' &&
|
|
curEdit.type !== 'roseChart' &&
|
|
|
- curEdit.type !== 'sankeyDiagram'
|
|
|
|
|
|
|
+ curEdit.type !== 'sankeyDiagram' &&
|
|
|
|
|
+ curEdit.type !== 'funnelPlot2'
|
|
|
"
|
|
"
|
|
|
>
|
|
>
|
|
|
<el-input v-model="formLabelAlign.Xlable"></el-input>
|
|
<el-input v-model="formLabelAlign.Xlable"></el-input>
|
|
@@ -583,7 +586,8 @@
|
|
|
curEdit.type !== 'radar' &&
|
|
curEdit.type !== 'radar' &&
|
|
|
curEdit.type !== 'roseChart' &&
|
|
curEdit.type !== 'roseChart' &&
|
|
|
curEdit.type !== 'pareto' &&
|
|
curEdit.type !== 'pareto' &&
|
|
|
- curEdit.type !== 'sankeyDiagram'
|
|
|
|
|
|
|
+ curEdit.type !== 'sankeyDiagram' &&
|
|
|
|
|
+ curEdit.type !== 'funnelPlot2'
|
|
|
"
|
|
"
|
|
|
>
|
|
>
|
|
|
<el-input v-model="formLabelAlign.Ylable"></el-input>
|
|
<el-input v-model="formLabelAlign.Ylable"></el-input>
|
|
@@ -702,6 +706,7 @@ import {
|
|
|
handleSankeyDiagramPlotChartLogic,
|
|
handleSankeyDiagramPlotChartLogic,
|
|
|
handleHeatmapPlotChartLogic,
|
|
handleHeatmapPlotChartLogic,
|
|
|
handlHorizontalStackedBar1ChartLogic,
|
|
handlHorizontalStackedBar1ChartLogic,
|
|
|
|
|
+ handleFunnelPlot2Chart,
|
|
|
} from "./chartLogic/index";
|
|
} from "./chartLogic/index";
|
|
|
import Vue from "vue";
|
|
import Vue from "vue";
|
|
|
export default {
|
|
export default {
|
|
@@ -835,6 +840,7 @@ export default {
|
|
|
// "doughnut",
|
|
// "doughnut",
|
|
|
// "lineHighlight",
|
|
// "lineHighlight",
|
|
|
"horizontalStackedBar1",
|
|
"horizontalStackedBar1",
|
|
|
|
|
+ "funnelPlot2",
|
|
|
"roseChart",
|
|
"roseChart",
|
|
|
"stackedBar",
|
|
"stackedBar",
|
|
|
"boxPlot",
|
|
"boxPlot",
|
|
@@ -1307,7 +1313,6 @@ export default {
|
|
|
// 确保标题和坐标轴对象存在
|
|
// 确保标题和坐标轴对象存在
|
|
|
item.option.title = item.option.title || {};
|
|
item.option.title = item.option.title || {};
|
|
|
Object.assign(item.option.title, { text: this.formLabelAlign.text });
|
|
Object.assign(item.option.title, { text: this.formLabelAlign.text });
|
|
|
- console.log(this.curEdit.type, item, "this.curEdit.type");
|
|
|
|
|
if (
|
|
if (
|
|
|
this.curEdit.type === "bar" ||
|
|
this.curEdit.type === "bar" ||
|
|
|
this.curEdit.type === "line" ||
|
|
this.curEdit.type === "line" ||
|
|
@@ -1371,6 +1376,14 @@ export default {
|
|
|
isFilter,
|
|
isFilter,
|
|
|
this.curEdit.type
|
|
this.curEdit.type
|
|
|
);
|
|
);
|
|
|
|
|
+ } else if (this.curEdit.type === "funnelPlot2") {
|
|
|
|
|
+ handleFunnelPlot2Chart(
|
|
|
|
|
+ item,
|
|
|
|
|
+ this.formLabelAlign,
|
|
|
|
|
+ this.formFilterAlign,
|
|
|
|
|
+ isFilter,
|
|
|
|
|
+ this.curEdit.type
|
|
|
|
|
+ );
|
|
|
} else if (this.curEdit.type === "horizontalStackedBar1") {
|
|
} else if (this.curEdit.type === "horizontalStackedBar1") {
|
|
|
handlHorizontalStackedBar1ChartLogic(
|
|
handlHorizontalStackedBar1ChartLogic(
|
|
|
item,
|
|
item,
|