From e98109923bbf6ecc05d9853a8a2706caf5fad317 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 11 Apr 2024 12:43:51 +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=83=E7=AE=A1=E7=90=86=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=8E=AF=E5=A2=83=E6=9C=AA=E6=8F=90=E7=A4=BA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98&=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-tags-input/index.vue   |  2 +-
 .../modules/setting/useProjectEnvStore.ts     |  6 ++-
 .../components/allParams/index.vue            |  2 +-
 .../components/envParams/DatabaseTab.vue      | 28 ++++++------
 .../components/envParams/HttpTab.vue          | 22 ++++++----
 .../environmental/index.vue                   | 43 +++++++++++++++++--
 .../projectAndPermission/basicInfos/index.vue | 10 +++--
 7 files changed, 80 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/pure/ms-tags-input/index.vue b/frontend/src/components/pure/ms-tags-input/index.vue
index 6b71e94426..dc07eb0ca2 100644
--- a/frontend/src/components/pure/ms-tags-input/index.vue
+++ b/frontend/src/components/pure/ms-tags-input/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-tooltip :content="allTagText" :disabled="innerModelValue.length === 0" :mouse-enter-delay="300">
+  <a-tooltip :content="allTagText" :disabled="(innerModelValue || []).length === 0" :mouse-enter-delay="300">
     <div :class="`flex w-full items-center ${props.class}`">
       <a-input-tag
         v-model:model-value="innerModelValue"
diff --git a/frontend/src/store/modules/setting/useProjectEnvStore.ts b/frontend/src/store/modules/setting/useProjectEnvStore.ts
index 5942cfc0b9..716dc053b2 100644
--- a/frontend/src/store/modules/setting/useProjectEnvStore.ts
+++ b/frontend/src/store/modules/setting/useProjectEnvStore.ts
@@ -72,7 +72,7 @@ const useProjectEnvStore = defineStore(
       projectId: '',
       name: '',
       description: '',
-      config: envParamsDefaultConfig,
+      config: cloneDeep(envParamsDefaultConfig),
     });
     const allParamDetailInfo = ref<GlobalParams>(); // 全局参数详情
     const httpNoWarning = ref(true);
@@ -115,7 +115,9 @@ const useProjectEnvStore = defineStore(
         } else if (id !== ALL_PARAM && id) {
           const tmpObj = await getDetailEnv(id);
           currentEnvDetailInfo.value = { ...tmpObj };
-          backupEnvDetailInfo.value = cloneDeep(tmpObj);
+          nextTick(() => {
+            backupEnvDetailInfo.value = cloneDeep(currentEnvDetailInfo.value);
+          });
         }
       } catch (e) {
         // eslint-disable-next-line no-console
diff --git a/frontend/src/views/project-management/environmental/components/allParams/index.vue b/frontend/src/views/project-management/environmental/components/allParams/index.vue
index 48dd033e6f..07b47b8798 100644
--- a/frontend/src/views/project-management/environmental/components/allParams/index.vue
+++ b/frontend/src/views/project-management/environmental/components/allParams/index.vue
@@ -67,7 +67,7 @@
 
   const defaultParamItem = {
     key: '',
-    paramType: '',
+    paramType: 'CONSTANT',
     value: '',
     description: '',
     tags: [],
diff --git a/frontend/src/views/project-management/environmental/components/envParams/DatabaseTab.vue b/frontend/src/views/project-management/environmental/components/envParams/DatabaseTab.vue
index c82416b4be..d7a8179a83 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/DatabaseTab.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/DatabaseTab.vue
@@ -1,16 +1,20 @@
 <template>
-  <div class="flex items-center justify-between">
-    <a-button v-permission="['PROJECT_ENVIRONMENT:READ+UPDATE']" type="outline" @click="handleAdd">{{
-      t('project.environmental.database.addDatabase')
-    }}</a-button>
-    <a-input-search
-      v-model="keyword"
-      class="w-[240px]"
-      allow-clear
-      :placeholder="t('project.menu.nameSearch')"
-      @press-enter="fetchData"
-      @search="fetchData"
-    ></a-input-search>
+  <div class="grid grid-cols-4">
+    <div class="col-start-1">
+      <a-button v-permission="['PROJECT_ENVIRONMENT:READ+UPDATE']" type="outline" @click="handleAdd">{{
+        t('project.environmental.database.addDatabase')
+      }}</a-button>
+    </div>
+    <div class="col-end-5 text-right">
+      <a-input-search
+        v-model="keyword"
+        class="w-[240px]"
+        allow-clear
+        :placeholder="t('project.menu.nameSearch')"
+        @press-enter="fetchData"
+        @search="fetchData"
+      ></a-input-search>
+    </div>
   </div>
   <MsBaseTable class="mt-[16px]" v-bind="propsRes" v-on="propsEvent">
     <template #driverId="{ record }">
diff --git a/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue b/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue
index 45d3d8adeb..b195ffdc83 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue
@@ -5,15 +5,18 @@
       t('project.environmental.httpNoWarning')
     }}</span>
   </div>
-  <div class="flex items-center justify-between">
-    <a-button
-      v-if="!store.currentEnvDetailInfo.mock"
-      v-permission="['PROJECT_ENVIRONMENT:READ+UPDATE']"
-      type="outline"
-      @click="handleAddHttp"
-      >{{ t('project.environmental.addHttp') }}</a-button
-    >
-    <div class="flex flex-row gap-[8px]">
+  <div class="grid grid-cols-4">
+    <div class="col-start-1">
+      <a-button
+        v-if="!store.currentEnvDetailInfo.mock"
+        v-permission="['PROJECT_ENVIRONMENT:READ+UPDATE']"
+        type="outline"
+        @click="handleAddHttp"
+        >{{ t('project.environmental.addHttp') }}</a-button
+      >
+    </div>
+
+    <div class="col-end-5 flex flex-row gap-[8px]">
       <a-input-number
         v-model:model-value="form.requestTimeout"
         :min="0"
@@ -141,6 +144,7 @@
       title: 'project.environmental.http.desc',
       dataIndex: 'description',
       showDrag: true,
+      showTooltip: true,
     },
     {
       title: 'project.environmental.http.enableScope',
diff --git a/frontend/src/views/project-management/environmental/index.vue b/frontend/src/views/project-management/environmental/index.vue
index 3d9cc53e22..ac99661922 100644
--- a/frontend/src/views/project-management/environmental/index.vue
+++ b/frontend/src/views/project-management/environmental/index.vue
@@ -248,6 +248,7 @@
 
 <script lang="ts" setup>
   import { Message } from '@arco-design/web-vue';
+  import { isEqual } from 'lodash-es';
   import { VueDraggable } from 'vue-draggable-plus';
 
   import MsButton from '@/components/pure/ms-button/index.vue';
@@ -274,6 +275,7 @@
     listEnv,
   } from '@/api/modules/project-management/envManagement';
   import { useI18n } from '@/hooks/useI18n';
+  import useLeaveUnSaveTip from '@/hooks/useLeaveUnSaveTip';
   import useModal from '@/hooks/useModal';
   import { useAppStore } from '@/store';
   import useProjectEnvStore, {
@@ -282,12 +284,18 @@
     NEW_ENV_PARAM,
   } from '@/store/modules/setting/useProjectEnvStore';
   import { downloadByteFile } from '@/utils';
+  import { hasAllPermission, hasAnyPermission } from '@/utils/permission';
 
   import { EnvListItem, PopVisible } from '@/models/projectManagement/environmental';
   import { EnvAuthScopeEnum, EnvAuthTypeEnum } from '@/enums/envEnum';
 
   import { SortableEvent } from 'sortablejs';
 
+  const { openModal } = useModal();
+
+  const { setState } = useLeaveUnSaveTip();
+  setState(false);
+
   const { t } = useI18n();
   const store = useProjectEnvStore();
 
@@ -530,7 +538,7 @@
   function searchData() {
     initData(keyword.value);
   }
-  const { openModal } = useModal();
+
   // 处理删除环境
   const handleDeleteEnv = async (id: string) => {
     if (store.currentId === NEW_ENV_PARAM) {
@@ -632,7 +640,29 @@
 
   const handleListItemClick = (element: EnvListItem) => {
     const { id } = element;
-    store.setCurrentId(id);
+    // 校验是否切换
+    if (store.currentId !== id) {
+      if (!hasAnyPermission(['PROJECT_ENVIRONMENT:READ+ADD', 'PROJECT_ENVIRONMENT:READ+UPDATE'])) {
+        store.setCurrentId(id);
+        return;
+      }
+      if (isEqual(store.currentEnvDetailInfo, store.backupEnvDetailInfo)) {
+        store.setCurrentId(id);
+      } else {
+        // 如果有未保存的tab则提示用户
+        openModal({
+          type: 'warning',
+          title: t('common.tip'),
+          content: t('apiTestDebug.unsavedLeave'),
+          hideCancel: false,
+          cancelText: t('common.stay'),
+          okText: t('common.leave'),
+          onBeforeOk: async () => {
+            store.setCurrentId(id);
+          },
+        });
+      }
+    }
   };
 
   const handleListItemClickGroup = (element: EnvListItem) => {
@@ -686,16 +716,21 @@
   };
 
   function resetHandler() {
-    const unSaveEnv = envList.value.filter((item) => item.id === NEW_ENV_PARAM).length < 2;
-    // 如果未保存环境存在环境为NEW_ENV_PARAM的id类型
+    const unSaveEnv = envList.value.filter((item) => item.id === NEW_ENV_PARAM).length;
+    // @desc: 未保存环境存在环境为 NEW_ENV_PARAM 类型初次新增
     if (unSaveEnv) {
       envList.value = envList.value.filter((item: any) => item.id !== NEW_ENV_PARAM);
       const excludeMock = envList.value.filter((item) => !item.mock);
+      // @desc: 如果没有MOCK环境默认为全局参数
       if (showType.value === 'PROJECT' && !excludeMock.length) {
         store.setCurrentId(ALL_PARAM);
+        // @desc: 如果没有MOCK环境默认为MOCK环境
       } else if (excludeMock.length) {
         store.setCurrentId(excludeMock[0].id);
       }
+      // @desc: 已经创建恢复最初数据
+    } else {
+      store.initEnvDetail();
     }
   }
 
diff --git a/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue b/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue
index f62c6b4c01..cc813ce0a8 100644
--- a/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue
+++ b/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue
@@ -19,10 +19,12 @@
           <span class="one-line-text mr-1 max-w-[300px] font-medium text-[var(--color-text-000)]">{{
             projectDetail?.name
           }}</span>
-          <span v-if="!projectDetail?.deleted && projectDetail?.enable" class="button enable-button mr-1">{{
-            t('project.basicInfo.enable')
-          }}</span>
-          <span v-else class="button delete-button">{{ t('project.basicInfo.deleted') }}</span>
+          <span
+            v-if="!projectDetail?.deleted && projectDetail?.enable"
+            class="button mr-1"
+            :class="[projectDetail?.enable ? 'enable-button' : 'delete-button']"
+            >{{ projectDetail?.enable ? t('project.basicInfo.enable') : t('project.basicInfo.enable') }}</span
+          >
         </div>
         <div class="one-line-text text-xs text-[--color-text-4]">{{ projectDetail?.description }}</div>
       </div>