From a2e2994dbcc1614464629f2c796f8777320d119a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 31 Dec 2020 16:00:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                     | 2 +-
 .../src/business/components/common/json-schema/JsonEditor.vue  | 3 +--
 .../common/json-schema/schema/json-schema-editor/main.vue      | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index f27d1609d7..9f4a9bbf46 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit f27d1609d77f7d6c988d37d709466e844d350e17
+Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f
diff --git a/frontend/src/business/components/common/json-schema/JsonEditor.vue b/frontend/src/business/components/common/json-schema/JsonEditor.vue
index 35c493ab0f..f9225be0d1 100644
--- a/frontend/src/business/components/common/json-schema/JsonEditor.vue
+++ b/frontend/src/business/components/common/json-schema/JsonEditor.vue
@@ -57,8 +57,7 @@
     methods: {
       handleClick() {
         if (this.activeName === 'preview') {
-          console.log(this.schema)
-          this.preview = schemaToJson(json5.parse(JSON.stringify(this.schema)));
+          this.preview = schemaToJson(Object.values(this.schema)[0]);
         }
       },
       openOneClickOperation() {
diff --git a/frontend/src/business/components/common/json-schema/schema/json-schema-editor/main.vue b/frontend/src/business/components/common/json-schema/schema/json-schema-editor/main.vue
index 763686cad3..2d2497c6c9 100644
--- a/frontend/src/business/components/common/json-schema/schema/json-schema-editor/main.vue
+++ b/frontend/src/business/components/common/json-schema/schema/json-schema-editor/main.vue
@@ -289,6 +289,7 @@
         for (const k in this.advancedValue) {
           if (this.pickValue[k]) this.advancedValue[k] = this.pickValue[k]
         }
+        console.log(this.pickValue)
       },
       handleClose() {
         this.modalVisible = false;