From 72c300cc6cadb9e0f17d66fc0d514b073b0823f5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 17 Nov 2021 17:35:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3=E7=BB=93=E6=9E=84=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E6=95=B0=E7=BB=84=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/assertions/document/Document.java |  8 +++++++-
 .../assertion/document/DocumentBody.vue       | 19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java
index dd1205cfb7..71c9d05780 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java
@@ -89,6 +89,9 @@ public class Document {
                         list.add(newJSONPathAssertion(item, conditionMap.get(item.getId())));
                     }
                     if (CollectionUtils.isNotEmpty(item.getChildren())) {
+                        if (item.getType().equals("array") && !item.isArrayVerification()) {
+                            continue;
+                        }
                         formatting(item.getChildren(), list, item, conditionMap);
                     }
                 } else {
@@ -108,10 +111,13 @@ public class Document {
                 } else {
                     item.setJsonPath("$." + item.getName());
                 }
-                if (!StringUtils.equalsAny(item.getContentVerification(), "none", null) || item.isInclude()|| item.isArrayVerification() || item.isTypeVerification()) {
+                if (!StringUtils.equalsAny(item.getContentVerification(), "none", null) || item.isInclude() || item.isArrayVerification() || item.isTypeVerification()) {
                     list.add(newXMLAssertion(item, conditionMap.get(item.getId())));
                 }
                 if (CollectionUtils.isNotEmpty(item.getChildren())) {
+                    if (item.getType().equals("array") && !item.isArrayVerification()) {
+                        continue;
+                    }
                     xmlFormatting(item.getChildren(), list, item, conditionMap);
                 }
             }
diff --git a/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue b/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
index 45dfdf237b..14a6f9e3c5 100644
--- a/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
@@ -16,12 +16,13 @@
       @cell-mouse-enter="editRow"
       @cell-mouse-leave="editLeave"
       row-key="id"
+      border
       default-expand-all
       v-loading="loading">
 
       <el-table-column prop="name" :label="$t('api_test.definition.request.esb_table.name')" width="230">
         <template slot-scope="scope">
-          <el-input v-if="scope.row.status && scope.column.fixed && scope.row.id!=='root'" v-model="scope.row.name" style="width: 140px" size="mini"/>
+          <el-input v-if="(scope.row.status && scope.column.fixed && scope.row.id!=='root') || (scope.row.type !=='object' && !scope.row.name)" v-model="scope.row.name" style="width: 140px" size="mini" :placeholder="$t('api_test.definition.request.esb_table.name')"/>
           <span v-else>{{ scope.row.name }}</span>
         </template>
       </el-table-column>
@@ -69,7 +70,7 @@
       <el-table-column :label="$t('commons.operating')" width="200" fixed="right">
         <template v-slot:default="scope">
           <span>
-            <el-button size="mini" type="text" circle @click="addVerification(scope.row)" :disabled="scope.row.type ==='object' || checked || scope.row.id==='root'">添加校验</el-button>
+            <el-button size="mini" type="text" circle @click="addVerification(scope.row)" :disabled="scope.row.type ==='object' ||scope.row.type ==='array' || checked || scope.row.id==='root'">添加校验</el-button>
             <el-button size="mini" type="text" @click="addRow(scope.row)" :disabled="(scope.row.type !=='object' && scope.row.type !=='array')  || checked">添加子字段</el-button>
             <el-button size="mini" type="text" @click="remove(scope.row)" :disabled="checked || scope.row.id==='root'">{{ $t('commons.remove') }}</el-button>
           </span>
@@ -245,9 +246,10 @@ export default {
         'span', [
           h('el-checkbox', {
             style: 'margin-right:5px;',
+            disabled:this.checked,
             on: {
               change: this.handleCheckAllChange
-            }
+            },
           }),
           h('span', column.label)
         ]
@@ -258,6 +260,7 @@ export default {
         'span', [
           h('el-checkbox', {
             style: 'margin-right:5px;',
+            disabled:this.checked,
             on: {
               change: this.handleType
             }
@@ -271,6 +274,7 @@ export default {
         'span', [
           h('el-checkbox', {
             style: 'margin-right:5px;',
+            disabled:this.checked,
             on: {
               change: this.handleArray
             }
@@ -298,18 +302,27 @@ export default {
       }
     },
     handleCheckAllChange(val) {
+      if(this.checked){
+        return;
+      }
       this.tableData.forEach(item => {
         item.include = val;
         this.childrenChecked(item.children, 1, val);
       })
     },
     handleType(val) {
+      if(this.checked) {
+        return;
+      }
       this.tableData.forEach(item => {
         item.typeVerification = val;
         this.childrenChecked(item.children, 2, val);
       })
     },
     handleArray(val) {
+      if(this.checked){
+        return;
+      }
       this.tableData.forEach(item => {
         item.arrayVerification = val;
         this.childrenChecked(item.children, 3, val);