From 8ff6efe0a43d9215dfbb86ab06083cfc6be830ff Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 11 Oct 2022 19:21:29 +0800
Subject: [PATCH] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?table=E8=A1=8C=E9=9A=90=E8=97=8F=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017834 --user=赵勇 【接口测试】场景变量-搜索未返回结果 https://www.tapd.cn/55049933/s/1258972
---
 .../src/business/automation/report/ApiReportStatus.vue    | 3 +++
 .../src/business/definition/model/ApiTestModel.js         | 8 ++++----
 .../sdk-parent/frontend/src/components/table/MsTable.vue  | 5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api-test/frontend/src/business/automation/report/ApiReportStatus.vue b/api-test/frontend/src/business/automation/report/ApiReportStatus.vue
index bf2b20f9a0..937c7dc584 100644
--- a/api-test/frontend/src/business/automation/report/ApiReportStatus.vue
+++ b/api-test/frontend/src/business/automation/report/ApiReportStatus.vue
@@ -13,6 +13,9 @@
             v-else-if="getStatus(status) === 'fake_error'">
       FakeError
     </el-tag>
+    <span v-else-if="status === '-'" size="mini" type="info">
+      -
+    </span>
     <el-tag v-else size="mini" type="info">
       {{ showStatus(status) }}
     </el-tag>
diff --git a/api-test/frontend/src/business/definition/model/ApiTestModel.js b/api-test/frontend/src/business/definition/model/ApiTestModel.js
index a2698994c8..268306272a 100644
--- a/api-test/frontend/src/business/definition/model/ApiTestModel.js
+++ b/api-test/frontend/src/business/definition/model/ApiTestModel.js
@@ -138,7 +138,7 @@ export class BaseConfig {
     options = this.initOptions(options)
     if (types) {
       for (let name in types) {
-        if (Object.prototype.hasOwnProperty.call(types, name) && Object.prototype.hasOwnProperty.call(options, name)) {
+        if (options[name] !== null && Object.prototype.hasOwnProperty.call(types, name) && Object.prototype.hasOwnProperty.call(options, name)) {
           options[name].forEach(o => {
             this[name].push(new types[name](o));
           })
@@ -1269,7 +1269,7 @@ class JMXDubboRequest {
   copy(target, source) {
     for (let key in source) {
       if (Object.prototype.hasOwnProperty.call(source, key)) {
-        if (source[key]  && !target[key]) {
+        if (source[key] && !target[key]) {
           target[key] = source[key];
         }
       }
@@ -1289,7 +1289,7 @@ class JMXTCPRequest {
   copy(target, source) {
     for (let key in source) {
       if (Object.prototype.hasOwnProperty.call(source, key)) {
-        if (source[key]  && !target[key]) {
+        if (source[key] && !target[key]) {
           target[key] = source[key];
         }
       }
@@ -1420,7 +1420,7 @@ class JMXGenerator {
         let domain = environment.config.httpConfig.domain;
         let validHosts = [];
         hosts.forEach(item => {
-          if (item.domain  && domain ) {
+          if (item.domain && domain) {
             let d = item.domain.trim().replace("http://", "").replace("https://", "");
             if (d === domain.trim()) {
               item.domain = d; // 域名去掉协议
diff --git a/framework/sdk-parent/frontend/src/components/table/MsTable.vue b/framework/sdk-parent/frontend/src/components/table/MsTable.vue
index 6846cee4e9..d4d764dedc 100644
--- a/framework/sdk-parent/frontend/src/components/table/MsTable.vue
+++ b/framework/sdk-parent/frontend/src/components/table/MsTable.vue
@@ -12,6 +12,7 @@
       :height="screenHeight"
       :row-key="rowKey"
       :row-class-name="tableRowClassName"
+      :row-style='rowStyle'
       :cell-class-name="addPaddingColClass"
       :highlight-current-row="highlightCurrentRow"
       @sort-change="sort"
@@ -511,6 +512,9 @@ export default {
         return 'padding-col';
       }
     },
+    rowStyle({row}) {
+      return row.hidden ? {"display": "none"} : {};
+    },
     tableRowClassName(row) {
       if (row.row.hidden) {
         return 'ms-variable-hidden-row';
@@ -571,5 +575,4 @@ export default {
 .row-click {
   cursor: pointer;
 }
-
 </style>