From c253a8a10efe93e27365a918c7c644d1c4474ce2 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 30 May 2022 17:45:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8=E5=9C=BA=E6=99=AF=E4=B8=AD?=
 =?UTF-8?q?=E6=96=AD=E8=A8=80=E5=8F=AF=E7=BC=96=E8=BE=91=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1013564 --user=王孝刚 【接口测试】场景A中引用场景B-场景B中含场景断言-断言信息可编辑
https://www.tapd.cn/55049933/s/1168938
---
 .../assertion/ApiAssertionJsonPath.vue        |  3 ++-
 .../assertion/ScenarioAssertions.vue          | 20 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue
index 5d30a30b1f..8832732e4a 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue
@@ -6,7 +6,8 @@
                   :placeholder="$t('api_test.request.extract.json_path_expression')"/>
       </el-col>
       <el-col>
-        <el-select v-model="jsonPath.option" class="ms-col-type" size="small" style="width:40%;margin-right: 10px" @change="reload">
+        <el-select :disabled="isReadOnly" v-model="jsonPath.option" class="ms-col-type" size="small"
+                   style="width:40%;margin-right: 10px" @change="reload">
           <el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS"/>
           <el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS"/>
           <el-option :label="$t('api_test.request.assertions.equals')" value="EQUALS"/>
diff --git a/frontend/src/business/components/api/definition/components/assertion/ScenarioAssertions.vue b/frontend/src/business/components/api/definition/components/assertion/ScenarioAssertions.vue
index 311c3f6a9f..d5642685d0 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ScenarioAssertions.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ScenarioAssertions.vue
@@ -22,14 +22,14 @@
         <api-json-path-suggest-button
           :show-suggest-button="false"
           :clear-tip="$t('api_test.request.assertions.json_path_clear')"
-          :isReadOnly="isReadOnly"
+          :isReadOnly="request.disabled"
           @clear="clearJson"/>
       </span>
       </el-row>
       <div class="assertion-add" :draggable="draggable">
         <el-row :gutter="10">
           <el-col :span="4">
-            <el-select :disabled="isReadOnly" class="assertion-item" v-model="type"
+            <el-select :disabled="request.disabled" class="assertion-item" v-model="type"
                        :placeholder="$t('api_test.request.assertions.select_type')" size="small">
               <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT"/>
               <el-option :label="$t('api_test.request.assertions.regex')" :value="options.REGEX"/>
@@ -42,45 +42,45 @@
           </el-col>
           <el-col :span="20">
             <ms-api-assertion-text
-              :is-read-only="isReadOnly"
+              :is-read-only="request.disabled"
               :list="assertions.regex"
               :callback="after"
               v-if="type === options.TEXT"
             />
             <ms-api-assertion-regex
-              :is-read-only="isReadOnly"
+              :is-read-only="request.disabled"
               :list="assertions.regex"
               :callback="after"
               @callback="after"
               v-if="type === options.REGEX"
             />
             <ms-api-assertion-json-path
-              :is-read-only="isReadOnly"
+              :is-read-only="request.disabled"
               :list="assertions.jsonPath"
               :callback="after"
               v-if="type === options.JSON_PATH"
             />
             <ms-api-assertion-x-path2
-              :is-read-only="isReadOnly"
+              :is-read-only="request.disabled"
               :list="assertions.xpath2"
               :callback="after"
               v-if="type === options.XPATH2"
             />
             <ms-api-assertion-duration
               v-model="time"
-              :is-read-only="isReadOnly"
+              :is-read-only="request.disabled"
               :duration="assertions.duration"
               :callback="after"
               v-if="type === options.DURATION"
             />
             <ms-api-assertion-jsr223
-              :is-read-only="isReadOnly"
+              :is-read-only="request.disabled"
               :list="assertions.jsr223"
               :callback="after"
               v-if="type === options.JSR223"
             />
             <ms-api-assertion-document
-              :is-read-only="isReadOnly"
+              :is-read-only="request.disabled"
               v-model="time"
               :document="assertions.document"
               :callback="after"
@@ -95,7 +95,7 @@
 
 
       <ms-api-assertions-edit
-        :is-read-only="isReadOnly"
+        :is-read-only="request.disabled"
         :assertions="assertions"
         :apiId="apiId"
         :reloadData="reloadData"