From e03b6c2d3f8c320460625238d3deadb27f538998 Mon Sep 17 00:00:00 2001
From: renxiaoyin <renxiaoyin@longfor.com>
Date: Thu, 9 Feb 2023 14:19:13 +0800
Subject: [PATCH] fix null ref of performance issue

---
 package.json                  |  2 +-
 src/components/FaasReplay.vue | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 378ce28..8985425 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "maintain_tool",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/components/FaasReplay.vue b/src/components/FaasReplay.vue
index d4fde46..001520d 100644
--- a/src/components/FaasReplay.vue
+++ b/src/components/FaasReplay.vue
@@ -1,7 +1,7 @@
 <template>
-  <div>
+  <!-- <div>
     <button v-if="true" @click="testBreakPoint">TestBreakPoint</button>
-  </div>
+  </div> -->
 
 
   <el-row>
@@ -156,6 +156,7 @@ export default {
         workflows: this.workflows,
         mobilePhone: this.mobilePhone,
       };
+      console.log(this.env)
       var ipcReceiverName = "query-" + this.env;
 
       var encodedRequest = JSON.stringify(request);
@@ -163,9 +164,10 @@ export default {
       window.ipcRenderer.receive("get-result", (param) => {
         console.log("ipc receive");
         console.log(param);
-        this.processMsgs = JSON.parse(param.rs);
-        var normalizedMsgs = this.reformMsgs(this.processMsgs);
-        this.normalizedMsgs.forEach(item => {
+        var rawProcessMsgs = JSON.parse(param.rs);
+        this.processMsgs = this.reformMsgs(rawProcessMsgs);
+        console.log(this.processMsgs);
+        this.processMsgs.forEach(item => {
 
           if (Array.isArray(item.data)) {
             // extract data title
@@ -220,6 +222,7 @@ export default {
     },
     reformMsgs(msgs) {
       var normalizedMsgs = [];
+      console.log("begin reform")
       msgs.forEach(msg => {
         if (Array.isArray(msg.data) || typeof (msg.data) == "string" || typeof (msg.data) == "number" || typeof (msg.data) == "bigint" || typeof (msg.data) == "boolean") {
           normalizedMsgs.push(msg);
@@ -227,21 +230,25 @@ export default {
         else {
           if (this.isMixed(msg.data)) {
             if (msg.message == '业绩与模板相匹配') {
+              console.log(1);
               var template = msg.data.template;
               var newMsg = {
                 message: `业绩与模板相匹配:basicTemplateId=${template.basicId},templateCode=${template.paymentCode} subTemplateId=${template.subTemplateId}` ,
-                data:[msg.data.performance],
+                data:msg.data.performance,
                 component:msg.component
               }
+              console.log(2);
               normalizedMsgs.push(newMsg);
             }
             else if (msg.message == '业绩与模板不匹配') {
               var subTemplates = msg.data.template.subTemplates;
+              console.log(3);
               var templateMsg = {
                 message:`业绩与模板不匹配: basicTemplateId=${msg.data.template.basicId}`,
                 data:subTemplates,
                 component:msg.component
               };
+              console.log(4);
               normalizedMsgs.push(templateMsg);
               var perfMsg = {
                 message:`未匹配业绩`,
@@ -258,10 +265,14 @@ export default {
           }
         }
       });
+      console.log("end reform")
+      return normalizedMsgs;
 
 
     },
     isMixed(data) {
+      console.log('ismixed')
+      if (data == null || data ==undefined) return false;
       if (data.performance != null && data.performance != undefined && data.template != null && data.template != undefined)
         return true;
       return false;