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 + + - + {{ showStatus(status) }} 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; } -