diff --git a/nezha-fronted/.babelrc b/nezha-fronted/.babelrc index eea9cea88..46e52bdfe 100644 --- a/nezha-fronted/.babelrc +++ b/nezha-fronted/.babelrc @@ -27,13 +27,6 @@ "useESModules": false } ], - [ - "component", - { - "libraryName": "element-ui", - "styleLibraryName": "theme-chalk" - } - ], "@babel/plugin-proposal-optional-chaining" ], "env": { diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index d35a22f92..c7c71de47 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -101,15 +101,17 @@ export default { // 设置右y轴 if (chartInfo.param.enable.rightYAxis) { - chartInfo.param.rightYAxis && chartInfo.param.rightYAxis.elementNames.forEach(item => { - if ((data.elements.name == item) && !s.yAxisIndex) { + if (chartInfo.param.rightYAxis) { + const findItem = chartInfo.param.rightYAxis.elementNames.find(item => data.elements.name == item) + console.log(findItem) + if (findItem) { s.yAxisIndex = 1 data.yAxisIndex = 1 } else { s.yAxisIndex = 0 data.yAxisIndex = 0 } - }) + } } // 右y轴数据类型