去掉 removeChildren

backend/src/main/java/io/metersphere/parse/xml/reader/jmx/JmeterDocumentParser.java

@@ -123,7 +123,6 @@ public class JmeterDocumentParser implements DocumentParser {
         for (int i = 0; i < childNodes.getLength(); i++) {
             Node item = childNodes.item(i);
             if (item instanceof Element && nodeNameEquals(item, "collectionProp")) {
-                removeChildren(item);
                 Document document = item.getOwnerDocument();
                 Object params = context.getProperty("statusCode");
                 if (params instanceof List) {
@@ -152,6 +151,15 @@ public class JmeterDocumentParser implements DocumentParser {
             Node item = childNodes.item(i);
             if (nodeNameEquals(item, RESPONSE_ASSERTION)) {
                 // 如果已经存在，不再添加
+                removeChildren(item);
+                Element collectionProp = document.createElement(COLLECTION_PROP);
+                collectionProp.setAttribute("name", "Asserion.test_strings");
+                //
+                item.appendChild(collectionProp);
+                item.appendChild(createStringProp(document, "Assertion.custom_message", ""));
+                item.appendChild(createStringProp(document, "Assertion.test_field", "Assertion.response_code"));
+                item.appendChild(createBoolProp(document, "Assertion.assume_success", false));
+                item.appendChild(createIntProp(document, "Assertion.test_type", 40));
                 return;
             }
         }
@@ -181,7 +189,7 @@ public class JmeterDocumentParser implements DocumentParser {
         responseAssertion.appendChild(createStringProp(document, "Assertion.custom_message", ""));
         responseAssertion.appendChild(createStringProp(document, "Assertion.test_field", "Assertion.response_code"));
         responseAssertion.appendChild(createBoolProp(document, "Assertion.assume_success", false));
-        responseAssertion.appendChild(createIntProp(document, "Assertion.test_type", 33));
+        responseAssertion.appendChild(createIntProp(document, "Assertion.test_type", 40));
         hashTree.appendChild(responseAssertion);
         hashTree.appendChild(document.createElement(HASH_TREE_ELEMENT));
     }
@@ -352,7 +360,7 @@ public class JmeterDocumentParser implements DocumentParser {
         for (int i = 0; i < childNodes.getLength(); i++) {
             Node item = childNodes.item(i);
             if (item instanceof Element && nodeNameEquals(item, "collectionProp")) {
-                removeChildren(item);
+                //
                 Document document = item.getOwnerDocument();
                 Object params = context.getProperty("params");
                 if (params instanceof List) {
@@ -377,31 +385,33 @@ public class JmeterDocumentParser implements DocumentParser {
 
     private void processDnsCacheManager(Element ele) {
 
+        Object domains = context.getProperty("domains");
+        if (!(domains instanceof List)) {
+            return;
+        }
+        if (((List) domains).size() == 0) {
+            return;
+        }
         NodeList childNodes = ele.getChildNodes();
         for (int i = 0, size = childNodes.getLength(); i < size; i++) {
             Node item = childNodes.item(i);
             if (item instanceof Element && nodeNameEquals(item, "collectionProp")
                     && org.apache.commons.lang3.StringUtils.equals(((Element) item).getAttribute("name"), "DNSCacheManager.hosts")) {
 
-                removeChildren(item);
                 Document document = item.getOwnerDocument();
-                Object domains = context.getProperty("domains");
-                if (domains instanceof List) {
-                    for (Object d : (List) domains) {
-                        JSONObject jsonObject = JSON.parseObject(d.toString());
-                        if (!jsonObject.getBooleanValue("enable")) {
-                            continue;
-                        }
-                        Element elementProp = document.createElement("elementProp");
-                        elementProp.setAttribute("name", jsonObject.getString("domain"));
-                        elementProp.setAttribute("elementType", "StaticHost");
-                        elementProp.appendChild(createStringProp(document, "StaticHost.Name", jsonObject.getString("domain")));
-                        elementProp.appendChild(createStringProp(document, "StaticHost.Address", jsonObject.getString("ip")));
-                        item.appendChild(elementProp);
+                for (Object d : (List) domains) {
+                    JSONObject jsonObject = JSON.parseObject(d.toString());
+                    if (!jsonObject.getBooleanValue("enable")) {
+                        continue;
                     }
+                    Element elementProp = document.createElement("elementProp");
+                    elementProp.setAttribute("name", jsonObject.getString("domain"));
+                    elementProp.setAttribute("elementType", "StaticHost");
+                    elementProp.appendChild(createStringProp(document, "StaticHost.Name", jsonObject.getString("domain")));
+                    elementProp.appendChild(createStringProp(document, "StaticHost.Address", jsonObject.getString("ip")));
+                    item.appendChild(elementProp);
                 }
             }
-
             if (item instanceof Element && nodeNameEquals(item, "boolProp")
                     && org.apache.commons.lang3.StringUtils.equals(((Element) item).getAttribute("name"), "DNSCacheManager.isCustomResolver")) {
                 item.getFirstChild().setNodeValue("true");

frontend/src/business/components/performance/test/PerformanceTestPlan.vue

@@ -22,11 +22,6 @@
             width="150"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="description"
-            :label="$t('commons.description')"
-            show-overflow-tooltip>
-          </el-table-column>
           <el-table-column
             prop="projectName"
             :label="$t('load_test.project_name')"
@@ -47,6 +42,29 @@
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="status"
+            :label="$t('commons.status')">
+            <template v-slot:default="{row}">
+              <el-tag size="mini" type="primary" v-if="row.status === 'Starting'">
+                {{ row.status }}
+              </el-tag>
+              <el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
+                {{ row.status }}
+              </el-tag>
+              <el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
+                <template v-slot:content>
+                  <div>{{row.description}}</div>
+                </template>
+                <el-tag size="mini" type="danger">
+                  {{ row.status }}
+                </el-tag>
+              </el-tooltip>
+              <el-tag size="mini" type="info" v-else>
+                {{ row.status }}
+              </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column
             width="150"
             :label="$t('commons.operating')">