From d4584fdad8f6df90ccc60e2f977c7dce5b0cf23c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 4 Jan 2024 17:07:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=B3Y?=
 =?UTF-8?q?=E8=BD=B4=20=E5=8F=AA=E6=9C=89=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartMixin.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index ef546147f..48ef1af3b 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -100,15 +100,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轴数据类型

From abee3a4bc12ec50e79613c6e526befe0add0ca27 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 8 Jan 2024 18:05:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20(NEZ-3369)=20=E4=BF=AE=E6=94=B9babel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/.babelrc          | 7 -------
 nezha-fronted/package-lock.json | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

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/package-lock.json b/nezha-fronted/package-lock.json
index 7e16b4037..bfbde26d4 100644
--- a/nezha-fronted/package-lock.json
+++ b/nezha-fronted/package-lock.json
@@ -17732,7 +17732,7 @@
     },
     "node-sass": {
       "version": "4.14.1",
-      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
       "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
@@ -24364,7 +24364,7 @@
     },
     "webpack-bundle-analyzer": {
       "version": "2.13.1",
-      "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
       "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
       "dev": true,
       "requires": {