diff --git a/nezha-fronted/src/components/chart/chart/chartBar.vue b/nezha-fronted/src/components/chart/chart/chartBar.vue index bedf462e4..626b4ec46 100644 --- a/nezha-fronted/src/components/chart/chart/chartBar.vue +++ b/nezha-fronted/src/components/chart/chart/chartBar.vue @@ -205,9 +205,6 @@ export default { // eslint-disable-next-line vue/no-mutating-props this.chartOption.color || (this.chartOption.color = initColor(20)) this.colorList = this.chartOption.color - try { - this.isStack = this.chartInfo.param.stack - } catch (e) {} this.chartInfo.loaded && this.initChart(this.chartOption) } } diff --git a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue index 62e1ee1f3..a9e6b9b97 100644 --- a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue +++ b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue @@ -442,9 +442,6 @@ export default { // eslint-disable-next-line vue/no-mutating-props this.chartOption.color || (this.chartOption.color = initColor(20)) this.colorList = this.chartOption.color - try { - this.isStack = this.chartInfo.param.stack - } catch (e) {} this.chartInfo.loaded && this.initChart(this.chartOption) }, beforeDestroy () { diff --git a/nezha-fronted/src/components/chart/chart/chartPie.vue b/nezha-fronted/src/components/chart/chart/chartPie.vue index 356ac6cf8..bcbe1afba 100644 --- a/nezha-fronted/src/components/chart/chart/chartPie.vue +++ b/nezha-fronted/src/components/chart/chart/chartPie.vue @@ -171,9 +171,6 @@ export default { // eslint-disable-next-line vue/no-mutating-props this.chartOption.color || (this.chartOption.color = initColor(20)) this.colorList = this.chartOption.color - try { - this.isStack = this.chartInfo.param.stack - } catch (e) {} this.chartInfo.loaded && this.initChart(this.chartOption) } } diff --git a/nezha-fronted/src/components/chart/chart/chartTreemap.vue b/nezha-fronted/src/components/chart/chart/chartTreemap.vue index 0c6ba0050..d6df8d4a8 100644 --- a/nezha-fronted/src/components/chart/chart/chartTreemap.vue +++ b/nezha-fronted/src/components/chart/chart/chartTreemap.vue @@ -176,9 +176,6 @@ export default { // eslint-disable-next-line vue/no-mutating-props this.chartOption.color || (this.chartOption.color = initColor(20)) this.colorList = this.chartOption.color - try { - this.isStack = this.chartInfo.param.stack - } catch (e) {} this.chartInfo.loaded && this.initChart(this.chartOption) } } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index d19acfba5..d14e82270 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -200,10 +200,14 @@ export default { getTopology(this.meta2dId).off('leave', this.penLeave) // 移出画笔· getTopology(this.meta2dId).off('add', this.appPen) // 添加新画笔· getTopology(this.meta2dId).off('click', this.topoClick) // click画笔· - getTopology(this.meta2dId).destroy(true) - for (const k in globalStore) { - if (!globalStore[k]) { - delete globalStore[k] + if (this.isChart) { + getTopology(this.meta2dId).destroy() + } else { + getTopology(this.meta2dId).destroy(true) + for (const k in globalStore) { + if (!globalStore[k]) { + delete globalStore[k] + } } } setTopology(this.meta2dId, null) diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue index 07e39d4e8..21e90a924 100644 --- a/nezha-fronted/src/components/page/dashboard/dashboard.vue +++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue @@ -155,7 +155,7 @@