From c9a18fefeaa7d7ea89633e98b18c5df1d609a155 Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 21 Sep 2022 18:58:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E5=BC=95=E7=94=A8=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84=E5=9C=BA=E6=99=AF=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=8D=E6=89=A7=E8=A1=8C=E7=9A=84=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=20(#18149)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017074 --user=王孝刚 【接口测试】github
#18028，新建一个接口自动化场景，输入名称，然后引用一个场景，被引用场景里有自定义脚本，在未保存的情况下，选择环境，点调试，被引用场景自定义脚本不会被执行。
https://www.tapd.cn/55049933/s/1248955

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../components/api/automation/scenario/EditApiScenario.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 1fe601ca3b..c9d0d3ae1f 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -392,9 +392,9 @@ import {
   handleCtrlREvent,
   handleCtrlSEvent,
   hasLicense,
+  hasPermission,
   objToStrMap,
-  strMapToObj,
-  hasPermission
+  strMapToObj
 } from "@/common/js/utils";
 import "@/common/css/material-icons.css";
 import OutsideClick from "@/common/js/outside-click";
@@ -1393,7 +1393,7 @@ export default {
     },
     resetResourceId(hashTree) {
       hashTree.forEach(item => {
-        item.resourceId = getUUID();
+        item.resourceId = item.resourceId || getUUID();
         if (item.hashTree && item.hashTree.length > 0) {
           this.resetResourceId(item.hashTree);
         }