From 58764e483880fd00aee0d27994909ae6f13663b2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Sat, 15 Oct 2022 12:46:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E9=80=89=E6=8B=A9=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017911 --user=陈建星 【测试跟踪】测试计划列表 - 执行测试计划-运行配置窗口，运行环境下拉框没有显示环境 https://www.tapd.cn/55049933/s/1262397
---
 framework/sdk-parent/frontend/src/model/ScenarioModel.js | 5 +++--
 test-track/frontend/src/business/plan/env/EnvSelect.vue  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/model/ScenarioModel.js b/framework/sdk-parent/frontend/src/model/ScenarioModel.js
index 769c7dab9e..42e5d882ca 100644
--- a/framework/sdk-parent/frontend/src/model/ScenarioModel.js
+++ b/framework/sdk-parent/frontend/src/model/ScenarioModel.js
@@ -113,12 +113,13 @@ export const EXTRACT_TYPE = {
   XPATH: "XPath"
 }
 
+
 export class BaseConfig {
 
   set(options, notUndefined) {
     options = this.initOptions(options)
     for (let name in options) {
-      if (options.hasOwnProperty(name)) {
+      if (Object.prototype.hasOwnProperty.call(options, name)) {
         if (!(this[name] instanceof Array)) {
           if (notUndefined === true) {
             this[name] = options[name] === undefined ? this[name] : options[name];
@@ -134,7 +135,7 @@ export class BaseConfig {
     options = this.initOptions(options)
     if (types) {
       for (let name in types) {
-        if (types.hasOwnProperty(name) && options.hasOwnProperty(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));
           })
diff --git a/test-track/frontend/src/business/plan/env/EnvSelect.vue b/test-track/frontend/src/business/plan/env/EnvSelect.vue
index 7e1e7737cc..df4e9a7766 100644
--- a/test-track/frontend/src/business/plan/env/EnvSelect.vue
+++ b/test-track/frontend/src/business/plan/env/EnvSelect.vue
@@ -193,7 +193,7 @@ export default {
 
 .env-confirm {
   margin-left: 20px;
-  width: 360px;
+  width: 90%;
   margin-top: 10px;
 }