From b35c9c92d5fdd6fbe651c0c2a48189a57d88a85d Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 21 Sep 2022 18:58:32 +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(#18151)?=
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>
---
 .../api/automation/report/ApiReportViewHeader.vue      | 10 +++++-----
 .../api/automation/scenario/EditApiScenario.vue        |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
index 5ef0a59ae6..1472068c14 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
@@ -66,11 +66,11 @@
 <script>
 
 import {generateShareInfoWithExpired} from "@/network/share";
-import {getCurrentProjectID} from "@/common/js/utils";
 import MsTag from "@/business/components/common/components/MsTag";
+import {getCurrentProjectID, getCurrentWorkspaceId, getUUID} from "@/common/js/utils";
+
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const UiDownloadScreenshot = requireComponent.keys().length > 0 ? requireComponent("./ui/automation/report/UiDownloadScreenshot.vue") : {};
-import {getCurrentProjectID, getCurrentWorkspaceId, getUUID} from "@/common/js/utils";
 
 export default {
   name: "MsApiReportViewHeader",
@@ -161,7 +161,7 @@ export default {
       pram.shareType = 'API_REPORT';
       let thisHost = window.location.host;
       let shareUrl = thisHost + "/shareApiReport";
-      if(this.isUi){
+      if (this.isUi) {
         pram.shareType = 'UI_REPORT';
         shareUrl = thisHost + "/shareUiReport";
       }
@@ -170,8 +170,8 @@ export default {
       });
     },
     getProjectApplication() {
-      let path  = "/API_SHARE_REPORT_TIME";
-      if(this.isUi){
+      let path = "/API_SHARE_REPORT_TIME";
+      if (this.isUi) {
         path = "/UI_SHARE_REPORT_TIME";
       }
       this.$get('/project_application/get/' + getCurrentProjectID() + path, res => {
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 117a195d09..173f85fc58 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);
         }