From 90dd77095cbb2e780867c2838d38448755347d2d Mon Sep 17 00:00:00 2001
From: mxd <838425805@qq.com>
Date: Mon, 30 Aug 2021 20:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96`DEBUG`=E6=97=B6`null`?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/magic-structure-array.vue          |  1 +
 .../common/magic-structure-object.vue         |  2 ++
 .../src/components/common/magic-structure.vue |  1 +
 .../src/components/layout/magic-debug.vue     | 21 -------------------
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/magic-editor/src/console/src/components/common/magic-structure-array.vue b/magic-editor/src/console/src/components/common/magic-structure-array.vue
index ef50d116..43950745 100644
--- a/magic-editor/src/console/src/components/common/magic-structure-array.vue
+++ b/magic-editor/src/console/src/components/common/magic-structure-array.vue
@@ -26,6 +26,7 @@
           <span v-else-if="typeof value === 'string'" class="string">"{{value.replace(/"/g, "\"")}}"</span>
           <span v-else-if="typeof value === 'number'" class="number">{{value}}</span>
           <span v-else-if="typeof value === 'boolean'" class="boolean">{{value}}</span>
+          <span v-else-if="value == null" class="boolean">null</span>
           <span v-else>{{value}}</span>
           <magic-structure-array v-if="value && Array.isArray(value) && expandKeys[key]" :data="value" :indent="indent + 1" :simple="false"/>
           <magic-structure-object v-else-if="value && typeof value === 'object' && expandKeys[key]" :data="value" :indent="indent + 1" :simple="false"/>
diff --git a/magic-editor/src/console/src/components/common/magic-structure-object.vue b/magic-editor/src/console/src/components/common/magic-structure-object.vue
index 28867037..acaab255 100644
--- a/magic-editor/src/console/src/components/common/magic-structure-object.vue
+++ b/magic-editor/src/console/src/components/common/magic-structure-object.vue
@@ -12,6 +12,7 @@
           <span v-else-if="typeof value === 'string'" class="string">"{{value.replace(/"/g, "\"")}}"</span>
           <span v-else-if="typeof value === 'number'" class="number">{{value}}</span>
           <span v-else-if="typeof value === 'boolean'" class="boolean">{{value}}</span>
+          <span v-else-if="value == null" class="boolean">null</span>
           <span v-else>{{value}}</span>
         </span>
       <span>}</span>
@@ -28,6 +29,7 @@
         <span v-else-if="typeof value === 'string'" class="string">"{{value.replace(/"/g, "\"")}}"</span>
         <span v-else-if="typeof value === 'number'" class="number">{{value}}</span>
         <span v-else-if="typeof value === 'boolean'" class="boolean">{{value}}</span>
+        <span v-else-if="value == null" class="boolean">null</span>
         <span v-else>{{value}}</span>
         <magic-structure-array v-if="value && Array.isArray(value) && expandKeys[key]" :data="value" :indent="indent + 1" :simple="false"/>
         <magic-structure-object v-else-if="value && typeof value === 'object' && expandKeys[key]" :data="value" :indent="indent + 1" :simple="false"/>
diff --git a/magic-editor/src/console/src/components/common/magic-structure.vue b/magic-editor/src/console/src/components/common/magic-structure.vue
index 15cfad9e..87b2d2c7 100644
--- a/magic-editor/src/console/src/components/common/magic-structure.vue
+++ b/magic-editor/src/console/src/components/common/magic-structure.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="ma-structure-container">
     <span :class="type.substring(10).toLowerCase()" v-if="displayText">{{ data }}</span>
+    <span class="boolean" v-else-if="!type">null</span>
     <magic-structure-array v-else-if="Array.isArray(jsonData)" :data="jsonData"/>
     <magic-structure-object v-else :data="jsonData"/>
   </div>
diff --git a/magic-editor/src/console/src/components/layout/magic-debug.vue b/magic-editor/src/console/src/components/layout/magic-debug.vue
index 4e7d244e..816403ab 100644
--- a/magic-editor/src/console/src/components/layout/magic-debug.vue
+++ b/magic-editor/src/console/src/components/layout/magic-debug.vue
@@ -50,27 +50,6 @@ export default {
     },
     variables() {
       return this.info && this.info.ext && this.info.ext.variables || []
-      /*return [{
-        name: "11",
-        type: "java.lang.String",
-        value: "abcd"
-      },{
-        name: "11",
-        type: "xx.xx.xx",
-        value: `[{
-          "ne" : {
-            "xx" :1
-          },
-          "name": "xx",
-          "b" : true,
-          "i" : 1,
-          "arr" : ${JSON.stringify(new Array(301).fill(1).map((it,index) => index))},
-          "arr1" : [{
-            "name": 123
-          },2,3,4,5,6,7,8,9,10],
-          "f" : 123.456
-        }]`
-      }]*/
     }
   }
 }