From b88bd04cec245c4ac7bc7c93edd04e7753e497db Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 11 Mar 2024 11:15:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/business/ms-assertion/index.vue    |  3 ++-
 .../components/envParams/popUp/AddHttpDrawer.vue  |  6 +++---
 .../project-management/environmental/index.vue    | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/business/ms-assertion/index.vue b/frontend/src/components/business/ms-assertion/index.vue
index af595bf28e..94e0284883 100644
--- a/frontend/src/components/business/ms-assertion/index.vue
+++ b/frontend/src/components/business/ms-assertion/index.vue
@@ -142,8 +142,9 @@
   const focusKey = ref<string>('');
   // 所有的断言列表参数
   const assertions = defineModel<any[]>('params', { default: [] });
+  const activeIds = ref('');
   // Item点击的key
-  const activeKey = ref<string>(assertions.value[0].id);
+  const activeKey = ref<string>('');
   // 展示的value
   const valueKey = computed(() => {
     return activeKey.value && assertions.value.find((item) => item.id === activeKey.value)?.assertionType;
diff --git a/frontend/src/views/project-management/environmental/components/envParams/popUp/AddHttpDrawer.vue b/frontend/src/views/project-management/environmental/components/envParams/popUp/AddHttpDrawer.vue
index bf35f10546..364a21abe6 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/popUp/AddHttpDrawer.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/popUp/AddHttpDrawer.vue
@@ -259,7 +259,7 @@
     if (index > -1 && !props.isCopy) {
       const httpItem = {
         ...form.value,
-        hostname: `${protocol}:${url}`,
+        hostname: `${protocol}://${url}`,
         pathMatchRule: {
           path,
           condition,
@@ -273,7 +273,7 @@
       const insertItem = {
         ...form.value,
         id: getGenerateId(),
-        hostname: `${protocol}:${url}`,
+        hostname: `${protocol}://${url}`,
         order: store.currentEnvDetailInfo.config.httpConfig.length + 1,
         moduleMatchRule: { modules },
       };
@@ -325,7 +325,7 @@
           moduleId: currentItem.moduleMatchRule.modules.map((item) => item.moduleId) || [],
           path,
           condition,
-          url: urlPath && urlPath?.length > 1 ? `//${urlPath[1]}` : '',
+          url: urlPath && urlPath?.length > 1 ? `${urlPath[1]}` : '',
         };
       }
     } else {
diff --git a/frontend/src/views/project-management/environmental/index.vue b/frontend/src/views/project-management/environmental/index.vue
index 4c9a0da4cd..d3b3f83b85 100644
--- a/frontend/src/views/project-management/environmental/index.vue
+++ b/frontend/src/views/project-management/environmental/index.vue
@@ -202,6 +202,7 @@
 </template>
 
 <script lang="ts" setup>
+  import { Message } from '@arco-design/web-vue';
   import { VueDraggable } from 'vue-draggable-plus';
 
   import MsButton from '@/components/pure/ms-button/index.vue';
@@ -464,12 +465,16 @@
       if (store.currentId === NEW_ENV_PARAM) {
         // 删除id为newEnvParam的环境
         envList.value = envList.value.filter((item) => item.id !== id);
-      } else {
-        await deleteEnv(id);
+        store.setCurrentId(envList.value[0].id);
       }
-      if (store.currentId === id) {
-        store.setCurrentId('');
+      if (id === NEW_ENV_PARAM) {
+        envList.value = envList.value.filter((item) => item.id !== id);
+        store.setCurrentId(envList.value[0].id);
+        return;
       }
+      await deleteEnv(id);
+      Message.success(t('common.deleteSuccess'));
+      store.setCurrentId(envList.value[0].id);
       searchData();
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -575,7 +580,7 @@
     padding: 7px 8px;
     height: 38px;
     box-sizing: border-box;
-    border-radius: var(--border-radius-base);
+    border-radius: 4px;
     cursor: pointer;
     .node-extra {
       opacity: 0;