From b415118cd5833f5f4ed0f62e4e4c0a44954222c7 Mon Sep 17 00:00:00 2001
From: tianlinzhong <673359306@qq.com>
Date: Mon, 28 Mar 2022 12:02:37 +0800
Subject: [PATCH] Modified Meter search and meter list problems

---
 myems-web/src/components/MyEMS/Meter/MeterCarbon.js           | 3 +++
 myems-web/src/components/MyEMS/Meter/MeterCost.js             | 3 +++
 myems-web/src/components/MyEMS/Meter/MeterEnergy.js           | 3 +++
 myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js | 3 +++
 myems-web/src/components/MyEMS/Meter/MeterTrend.js            | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js
index 6112133a..512c2caa 100644
--- a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js
+++ b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js
@@ -226,6 +226,9 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
 
   const onSearchMeter = ({ target }) => {
     const keyword = target.value.toLowerCase();
+    if (keyword.length == 0){
+      return false;
+    };
     const filteredResult = meterList.filter(
       meter => meter.label.toLowerCase().includes(keyword)
     );
diff --git a/myems-web/src/components/MyEMS/Meter/MeterCost.js b/myems-web/src/components/MyEMS/Meter/MeterCost.js
index 7fd5c795..906812f0 100644
--- a/myems-web/src/components/MyEMS/Meter/MeterCost.js
+++ b/myems-web/src/components/MyEMS/Meter/MeterCost.js
@@ -226,6 +226,9 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
 
   const onSearchMeter = ({ target }) => {
     const keyword = target.value.toLowerCase();
+    if (keyword.length == 0){
+      return false;
+    };
     const filteredResult = meterList.filter(
       meter => meter.label.toLowerCase().includes(keyword)
     );
diff --git a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js
index f588885b..3e005f9d 100644
--- a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js
+++ b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js
@@ -228,6 +228,9 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
 
   const onSearchMeter = ({ target }) => {
     const keyword = target.value.toLowerCase();
+    if (keyword.length == 0){
+      return false;
+    };
     const filteredResult = meterList.filter(
       meter => meter.label.toLowerCase().includes(keyword)
     );
diff --git a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
index f57fb968..598f706d 100644
--- a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
+++ b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
@@ -223,6 +223,9 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
   
   const onSearchMeter = ({ target }) => {
     const keyword = target.value.toLowerCase();
+    if (keyword.length == 0){
+      return false;
+    };
     const filteredResult = meterList.filter(
       meter => meter.label.toLowerCase().includes(keyword)
     );
diff --git a/myems-web/src/components/MyEMS/Meter/MeterTrend.js b/myems-web/src/components/MyEMS/Meter/MeterTrend.js
index 127806b5..f7ae853d 100644
--- a/myems-web/src/components/MyEMS/Meter/MeterTrend.js
+++ b/myems-web/src/components/MyEMS/Meter/MeterTrend.js
@@ -213,6 +213,9 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
   
   const onSearchMeter = ({ target }) => {
     const keyword = target.value.toLowerCase();
+    if (keyword.length == 0){
+      return false;
+    };
     const filteredResult = meterList.filter(
       meter => meter.label.toLowerCase().includes(keyword)
     );