From 3bf668e8f1a9408df7ec0439719f5ad114fab80e Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 22 Apr 2024 15:46:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-common-script/insertCommonScript.vue   | 10 +--
 .../ms-message/MessageCenterDrawer.vue        |  2 +-
 .../components/pure/ms-table/base-table.vue   |  1 +
 .../components/pure/ms-table/batchAction.vue  | 70 ++++++++++---------
 .../components/pure/ms-tag/ms-tag-group.vue   | 17 ++++-
 .../api-test/components/condition/content.vue |  2 +-
 .../components/recycle/api/apiTable.vue       |  3 +-
 .../api-test/report/component/reportList.vue  |  8 +++
 frontend/src/views/bug-management/index.vue   |  4 ++
 .../components/caseTable.vue                  |  6 ++
 .../envParams/popUp/addDatabaseModal.vue      |  1 +
 .../taskCenter/component/apiCase.vue          | 13 +++-
 .../taskCenter/component/scheduledTask.vue    |  5 +-
 .../components/templateManagement.vue         |  4 ++
 .../template/components/templateItem.vue      |  6 +-
 .../system/log/components/logCards.vue        |  3 +
 16 files changed, 106 insertions(+), 49 deletions(-)

diff --git a/frontend/src/components/business/ms-common-script/insertCommonScript.vue b/frontend/src/components/business/ms-common-script/insertCommonScript.vue
index 53e8416501..e665f0f5ef 100644
--- a/frontend/src/components/business/ms-common-script/insertCommonScript.vue
+++ b/frontend/src/components/business/ms-common-script/insertCommonScript.vue
@@ -34,15 +34,15 @@
       <template #name="{ record }">
         <div class="flex items-center">
           <a-tooltip :content="record.name">
-            <div class="one-line-text max-w-[200px] cursor-pointer text-[rgb(var(--primary-5))]">{{ record.name }}</div>
+            <div class="one-line-text max-w-[200px] cursor-pointer text-[rgb(var(--primary-5))]">{{
+              characterLimit(record.name)
+            }}</div>
           </a-tooltip>
           <a-popover :title="record.name" position="bottom">
             <a-button type="text" class="ml-2 px-0"> {{ t('project.commonScript.preview') }}</a-button>
             <template #title>
               <div class="w-[436px] bg-[var(--color-bg-3)] px-2 pb-2">
-                <span style="word-break: break-all">
-                  {{ record.name }}
-                </span>
+                <span style="word-break: break-all"> {{ characterLimit(record.name) }} </span>
               </div>
             </template>
             <template #content>
@@ -169,6 +169,7 @@
   } from '@/api/modules/project-management/commonScript';
   import { useI18n } from '@/hooks/useI18n';
   import useAppStore from '@/store/modules/app';
+  import { characterLimit } from '@/utils';
   import { hasAnyPermission } from '@/utils/permission';
 
   import { BugOptionItem } from '@/models/bug-management';
@@ -253,6 +254,7 @@
       isTag: true,
       width: 440,
       showDrag: true,
+      tagPosition: 'tr',
     },
     {
       title: 'project.commonScript.createUser',
diff --git a/frontend/src/components/business/ms-message/MessageCenterDrawer.vue b/frontend/src/components/business/ms-message/MessageCenterDrawer.vue
index d531038982..24f86b3d44 100644
--- a/frontend/src/components/business/ms-message/MessageCenterDrawer.vue
+++ b/frontend/src/components/business/ms-message/MessageCenterDrawer.vue
@@ -62,7 +62,7 @@
             :no-more-data="noMoreData"
             raggable
             :virtual-list-props="{
-              height: 'calc(100vh - 160px)',
+              height: 'calc(100vh - 136px)',
             }"
             @reach-bottom="handleReachBottom"
           >
diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 8743f92a01..164a308db0 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -129,6 +129,7 @@
                   :tag-list="record[item.dataIndex as string]"
                   type="primary"
                   theme="outline"
+                  :tag-position="item.tagPosition"
                 />
               </template>
               <template v-else-if="item.slotName === SpecialColumnEnum.OPERATION">
diff --git a/frontend/src/components/pure/ms-table/batchAction.vue b/frontend/src/components/pure/ms-table/batchAction.vue
index 9f281e33ad..8aeb1d6403 100644
--- a/frontend/src/components/pure/ms-table/batchAction.vue
+++ b/frontend/src/components/pure/ms-table/batchAction.vue
@@ -1,28 +1,11 @@
 <template>
   <div v-if="props.actionConfig" ref="refWrapper" class="flex flex-row flex-nowrap">
-    <div class="title">{{ t('msTable.batch.selected', { count: props.selectRowCount }) }}</div>
-    <template v-for="(element, idx) in baseAction" :key="element.label">
-      <a-divider v-if="element.isDivider" class="divider mx-0 my-[6px]" />
-      <a-button
-        v-if="!element.isDivider && !element.children && hasAllPermission(element.permission as string[]) && hasAnyPermission(element.anyPermission as string[])"
-        class="ml-[12px]"
-        :class="{
-          'arco-btn-outline--danger': element.danger,
-          'ml-[8px]': idx === 0,
-        }"
-        type="outline"
-        :size="props.size"
-        @click="handleSelect(element)"
-        >{{ t(element.label as string) }}</a-button
-      >
-      <!-- baseAction多菜单选择 -->
-      <a-dropdown
-        v-if="!element.isDivider && element.children && hasAllPermission(element.permission as string[]) && hasAnyPermission(element.anyPermission as string[])"
-        position="tr"
-        :size="props.size"
-        @select="handleSelect"
-      >
+    <div class="title one-line-text">{{ t('msTable.batch.selected', { count: props.selectRowCount }) }}</div>
+    <div>
+      <template v-for="(element, idx) in baseAction" :key="element.label">
+        <a-divider v-if="element.isDivider" class="divider mx-0 my-[6px]" />
         <a-button
+          v-if="!element.isDivider && !element.children && hasAllPermission(element.permission as string[]) && hasAnyPermission(element.anyPermission as string[])"
           class="ml-[12px]"
           :class="{
             'arco-btn-outline--danger': element.danger,
@@ -30,20 +13,39 @@
           }"
           type="outline"
           :size="props.size"
-          @click="handleSelect"
+          @click="handleSelect(element)"
           >{{ t(element.label as string) }}</a-button
         >
-        <template #content>
-          <template v-for="item in element.children" :key="item.label">
-            <a-divider v-if="element.isDivider" margin="4px" />
-            <a-doption v-else :value="item" :class="{ delete: item.danger }">
-              {{ t(item.label as string) }}
-            </a-doption>
+        <!-- baseAction多菜单选择 -->
+        <a-dropdown
+          v-if="!element.isDivider && element.children && hasAllPermission(element.permission as string[]) && hasAnyPermission(element.anyPermission as string[])"
+          position="tr"
+          :size="props.size"
+          @select="handleSelect"
+        >
+          <a-button
+            class="ml-[12px]"
+            :class="{
+              'arco-btn-outline--danger': element.danger,
+              'ml-[8px]': idx === 0,
+            }"
+            type="outline"
+            :size="props.size"
+            @click="handleSelect"
+            >{{ t(element.label as string) }}</a-button
+          >
+          <template #content>
+            <template v-for="item in element.children" :key="item.label">
+              <a-divider v-if="element.isDivider" margin="4px" />
+              <a-doption v-else :value="item" :class="{ delete: item.danger }">
+                {{ t(item.label as string) }}
+              </a-doption>
+            </template>
           </template>
-        </template>
-      </a-dropdown>
-      <!-- baseAction多菜单选择 -->
-    </template>
+        </a-dropdown>
+        <!-- baseAction多菜单选择 -->
+      </template>
+    </div>
     <div v-if="moreActionLength > 0" class="drop-down relative ml-[8px] inline-block">
       <a-dropdown position="tr" @select="handleSelect">
         <a-button type="outline" :size="props.size"><MsIcon type="icon-icon_more_outlined" /></a-button>
@@ -209,7 +211,7 @@
   .title {
     display: flex;
     align-items: center;
-    width: 100px;
+    max-width: 400px;
     color: var(--color-text-2);
   }
   .delete {
diff --git a/frontend/src/components/pure/ms-tag/ms-tag-group.vue b/frontend/src/components/pure/ms-tag/ms-tag-group.vue
index 86078b473e..df21f2b340 100644
--- a/frontend/src/components/pure/ms-tag/ms-tag-group.vue
+++ b/frontend/src/components/pure/ms-tag/ms-tag-group.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-tooltip :content="tagsTooltip">
+  <a-tooltip :content="tagsTooltip" :position="props.tagPosition" :mouse-enter-delay="300">
     <div class="flex max-w-[440px] flex-row" @click="emit('click')">
       <MsTag v-for="tag of showTagList" :key="tag.id" :width="getTagWidth(tag)" :size="props.size" v-bind="attrs">
         {{ props.isStringTag ? tag : tag[props.nameKey] }}
@@ -23,11 +23,26 @@
       nameKey?: string;
       isStringTag?: boolean; // 是否是字符串数组的标签
       size?: Size;
+      tagPosition?:
+        | 'top'
+        | 'tl'
+        | 'tr'
+        | 'bottom'
+        | 'bl'
+        | 'br'
+        | 'left'
+        | 'lt'
+        | 'lb'
+        | 'right'
+        | 'rt'
+        | 'rb'
+        | undefined; // 提示位置防止窗口抖动
     }>(),
     {
       showNum: 2,
       nameKey: 'name',
       size: 'medium',
+      tagPosition: 'top',
     }
   );
   const emit = defineEmits<{
diff --git a/frontend/src/views/api-test/components/condition/content.vue b/frontend/src/views/api-test/components/condition/content.vue
index 71cbd53d1d..c108aca387 100644
--- a/frontend/src/views/api-test/components/condition/content.vue
+++ b/frontend/src/views/api-test/components/condition/content.vue
@@ -423,7 +423,7 @@
         <template #operationPre="{ record }">
           <a-popover
             v-model:popupVisible="record.moreSettingPopoverVisible"
-            position="tl"
+            position="tr"
             trigger="click"
             :title="t('common.setting')"
             :content-style="{ width: '480px' }"
diff --git a/frontend/src/views/api-test/management/components/recycle/api/apiTable.vue b/frontend/src/views/api-test/management/components/recycle/api/apiTable.vue
index c9cac5d75a..dd18933b64 100644
--- a/frontend/src/views/api-test/management/components/recycle/api/apiTable.vue
+++ b/frontend/src/views/api-test/management/components/recycle/api/apiTable.vue
@@ -485,7 +485,8 @@
       },
       onBeforeOk: async () => {
         try {
-          await batchCleanOutDefinition(await getBatchParams());
+          console.log(getBatchParams(), ' getBatchParams() getBatchParams()');
+          // await batchCleanOutDefinition(await getBatchParams());
           Message.success(t('common.deleteSuccess'));
           resetSelector();
           loadApiList(true);
diff --git a/frontend/src/views/api-test/report/component/reportList.vue b/frontend/src/views/api-test/report/component/reportList.vue
index c7e9e32580..a9c3326baf 100644
--- a/frontend/src/views/api-test/report/component/reportList.vue
+++ b/frontend/src/views/api-test/report/component/reportList.vue
@@ -588,6 +588,14 @@
     getTime();
   });
 
+  onBeforeUnmount(() => {
+    if (route.query.type === 'API_SCENARIO') {
+      showDetailDrawer.value = false;
+    } else {
+      showCaseDetailDrawer.value = false;
+    }
+  });
+
   watch(
     () => props.moduleType,
     (val) => {
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index 4dc641be72..ae51a48474 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -900,6 +900,10 @@
     }
   });
 
+  onBeforeUnmount(() => {
+    detailVisible.value = false;
+  });
+
   onUnmounted(() => {
     // 组件销毁时关闭轮询
     pause();
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
index 956386e174..98431b01ad 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@@ -1141,6 +1141,7 @@
       };
       if (isMove.value) {
         await batchMoveToModules(params);
+        groupKeyword.value = '';
         Message.success(t('caseManagement.featureCase.batchMoveSuccess'));
       } else {
         await batchCopyToModules(params);
@@ -1160,6 +1161,7 @@
   function handleMoveCaseModalCancel() {
     showBatchMoveDrawer.value = false;
     selectedModuleKeys.value = [];
+    groupKeyword.value = '';
   }
 
   function caseNodeSelect(keys: string[]) {
@@ -1686,6 +1688,10 @@
     }
   );
 
+  onBeforeUnmount(() => {
+    showDetailDrawer.value = false;
+  });
+
   defineExpose({
     emitTableParams,
     initData,
diff --git a/frontend/src/views/project-management/environmental/components/envParams/popUp/addDatabaseModal.vue b/frontend/src/views/project-management/environmental/components/envParams/popUp/addDatabaseModal.vue
index b67f91c25c..fce94b13ad 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/popUp/addDatabaseModal.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/popUp/addDatabaseModal.vue
@@ -88,6 +88,7 @@
             class="w-[152px]"
             mode="button"
             :step="100"
+            :precision="0"
             :min="0"
             :default-value="1000"
             :max="600000"
diff --git a/frontend/src/views/project-management/taskCenter/component/apiCase.vue b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
index 7e2206097b..71e4b6b310 100644
--- a/frontend/src/views/project-management/taskCenter/component/apiCase.vue
+++ b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
@@ -26,7 +26,7 @@
         <div
           v-if="!record.integrated"
           type="text"
-          class="one-line-text flex w-full"
+          class="one-line-text w-full"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
           @click="showDetail(record.resourceId)"
           >{{ record.resourceNum }}
@@ -35,8 +35,7 @@
       <template #resourceName="{ record }">
         <div
           v-if="!record.integrated"
-          type="text"
-          class="one-line-text flex max-w-[300px]"
+          class="one-line-text max-w-[300px]"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
           @click="showDetail(record.resourceId)"
           >{{ record.resourceName }}
@@ -642,6 +641,14 @@
     }
   }
 
+  onBeforeUnmount(() => {
+    if (props.moduleType === 'API_CASE') {
+      showCaseDetailDrawer.value = false;
+    } else {
+      showDetailDrawer.value = false;
+    }
+  });
+
   await tableStore.initColumn(groupColumnsMap[props.group].key, groupColumnsMap[props.group].columns, 'drawer', true);
 </script>
 
diff --git a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
index 00c8c768aa..11a90d96c7 100644
--- a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
+++ b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
@@ -29,7 +29,7 @@
         <div
           v-if="props.moduleType === TaskCenterEnum.API_SCENARIO"
           type="text"
-          class="one-line-text flex w-full"
+          class="one-line-text w-full"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
           @click="showDetail(record.resourceId)"
           >{{ record.resourceNum }}
@@ -38,8 +38,7 @@
       <template #resourceName="{ record }">
         <div
           v-if="props.moduleType === TaskCenterEnum.API_SCENARIO"
-          type="text"
-          class="one-line-text flex max-w-[300px]"
+          class="one-line-text max-w-[300px]"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
           @click="showDetail(record.resourceId)"
           >{{ record.resourceName }}
diff --git a/frontend/src/views/project-management/template/components/templateManagement.vue b/frontend/src/views/project-management/template/components/templateManagement.vue
index 4edc3992d8..39c7bdbd12 100644
--- a/frontend/src/views/project-management/template/components/templateManagement.vue
+++ b/frontend/src/views/project-management/template/components/templateManagement.vue
@@ -417,6 +417,10 @@
     }
   });
 
+  onBeforeUnmount(() => {
+    showDetailVisible.value = false;
+  });
+
   onMounted(() => {
     fetchData();
     updateColumns();
diff --git a/frontend/src/views/setting/organization/template/components/templateItem.vue b/frontend/src/views/setting/organization/template/components/templateItem.vue
index 88462e0ad6..b50f2a9bf3 100644
--- a/frontend/src/views/setting/organization/template/components/templateItem.vue
+++ b/frontend/src/views/setting/organization/template/components/templateItem.vue
@@ -18,11 +18,15 @@
             <span class="operation hover:text-[rgb(var(--primary-5))]">
               <span @click="templateManagement">{{ t('system.orgTemplate.TemplateManagementList') }}</span>
               <a-divider
-                v-if="(hasEnablePermission && isEnableProject) || props.cardItem.key === 'BUG'"
+                v-if="hasEnablePermission && isEnableProject && props.cardItem.key === 'BUG'"
                 direction="vertical"
               />
             </span>
             <span v-if="props.cardItem.key === 'BUG'" class="operation hover:text-[rgb(var(--primary-5))]">
+              <a-divider
+                v-if="!(hasEnablePermission && isEnableProject) && props.cardItem.key === 'BUG'"
+                direction="vertical"
+              />
               <span @click="workflowSetup">{{ t('system.orgTemplate.workflowSetup') }}</span>
               <a-divider
                 v-if="hasEnablePermission && props.mode === 'organization' && isEnableProject"
diff --git a/frontend/src/views/setting/system/log/components/logCards.vue b/frontend/src/views/setting/system/log/components/logCards.vue
index ead8ef7cfa..09d18dfcfd 100644
--- a/frontend/src/views/setting/system/log/components/logCards.vue
+++ b/frontend/src/views/setting/system/log/components/logCards.vue
@@ -551,6 +551,9 @@
   }
 
   function handleNameClick(record: LogItem) {
+    if (record.type === 'DELETE') {
+      return;
+    }
     const routeQuery: Record<string, any> = {
       orgId: record.organizationId,
       pId: record.projectId,