From 3316efc00346889dfb547a62c404443ad9b901e4 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Tue, 25 Jun 2024 10:20:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80):=20bugFix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/business/ms-associate-case/apiTable.vue    | 1 -
 .../src/components/business/ms-comment/comment-item.vue   | 8 +++-----
 frontend/src/components/business/ms-comment/comment.tsx   | 6 +++++-
 .../business/ms-link-file/associatedFileDrawer.vue        | 8 +-------
 .../business/ms-minders/featureCaseMinder/commentList.vue | 1 +
 .../src/views/api-test/management/components/import.vue   | 2 +-
 .../management/components/management/api/apiTable.vue     | 5 ++---
 .../management/components/management/case/caseTable.vue   | 5 ++---
 .../components/management/mock/mockMatchRuleForm.vue      | 2 +-
 .../src/views/bug-management/components/commentTab.vue    | 1 +
 .../components/tabContent/tabComment/tabCommentIndex.vue  | 1 +
 .../taskCenter/component/scheduledTask.vue                | 3 ---
 12 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/business/ms-associate-case/apiTable.vue b/frontend/src/components/business/ms-associate-case/apiTable.vue
index a672befb0f..9efd501f2e 100644
--- a/frontend/src/components/business/ms-associate-case/apiTable.vue
+++ b/frontend/src/components/business/ms-associate-case/apiTable.vue
@@ -139,7 +139,6 @@
       dataIndex: 'tags',
       isTag: true,
       isStringTag: true,
-      width: 400,
       showDrag: true,
     },
     {
diff --git a/frontend/src/components/business/ms-comment/comment-item.vue b/frontend/src/components/business/ms-comment/comment-item.vue
index f67d921c5c..64652e76f4 100644
--- a/frontend/src/components/business/ms-comment/comment-item.vue
+++ b/frontend/src/components/business/ms-comment/comment-item.vue
@@ -19,7 +19,7 @@
             <span class="text-[var(--color-text-4)]">({{ element.childComments?.length }})</span>
           </div>
           <div
-            v-if="hasAnyPermission(['PROJECT_BUG:READ+COMMENT', 'FUNCTIONAL_CASE:READ+COMMENT'])"
+            v-if="hasAnyPermission(props.permissions)"
             class="comment-btn hover:bg-[var(--color-bg-3)]"
             :class="{ 'bg-[var(--color-text-n8)]': status === 'reply' }"
             @click="replyClick"
@@ -55,6 +55,7 @@
   const props = defineProps<{
     element: CommentItem; // 评论的具体内容
     mode: 'parent' | 'child'; // 父级评论还是子级评论
+    permissions: string[]; // 权限列表
     onReply?: () => void; // 回复
     onEdit?: () => void; // 编辑
     onDelete?: () => void; // 删除
@@ -62,10 +63,7 @@
 
   // 是否拥有编辑｜删除权限
   const hasAuth = computed(() => {
-    return (
-      props.element.createUser === userStore.id &&
-      hasAnyPermission(['PROJECT_BUG:READ+COMMENT', 'FUNCTIONAL_CASE:READ+COMMENT'])
-    );
+    return props.element.createUser === userStore.id && hasAnyPermission(props.permissions);
   });
 
   const status = defineModel<'normal' | 'edit' | 'reply' | 'delete'>('status', { default: 'normal' });
diff --git a/frontend/src/components/business/ms-comment/comment.tsx b/frontend/src/components/business/ms-comment/comment.tsx
index ce1ce2d4e0..715a784296 100644
--- a/frontend/src/components/business/ms-comment/comment.tsx
+++ b/frontend/src/components/business/ms-comment/comment.tsx
@@ -22,13 +22,16 @@ export default defineComponent({
     },
     uploadImage: {
       type: Function,
-      // eslint-disable-next-line @typescript-eslint/no-empty-function
       default: (file: File) => Promise<any>,
     },
     previewUrl: {
       type: String as PropType<string>,
       default: '',
     },
+    permissions: {
+      type: Array as PropType<string[]>,
+      default: () => [],
+    },
   },
   emits: {
     /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -179,6 +182,7 @@ export default defineComponent({
           {/* {expendedIds.value}--expendedIds */}
           <Item
             mode={'parent'}
+            permissions={props.permissions}
             onReply={() => handleReply(item)}
             onEdit={() => handelEdit(item)}
             onDelete={() => handleDelete(item)}
diff --git a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
index 65f9d17f4b..d7866420aa 100644
--- a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
+++ b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
@@ -26,7 +26,7 @@
             <a-radio value="Module">{{ t('project.fileManagement.module') }}</a-radio>
             <a-radio value="Storage">{{ t('project.fileManagement.storage') }}</a-radio>
           </a-radio-group>
-          <div class="mb-[8px] flex items-center gap-[8px]">
+          <div v-show="showType === 'Module'" class="mb-[8px] flex items-center gap-[8px]">
             <a-input
               v-model:model-value="moduleKeyword"
               :placeholder="t('project.fileManagement.folderSearchPlaceholder')"
@@ -94,9 +94,7 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { useVModel } from '@vueuse/core';
 
-  import MsButton from '@/components/pure/ms-button/index.vue';
   import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsSplitBox from '@/components/pure/ms-split-box/index.vue';
   import FileTree from './fileTree.vue';
@@ -155,10 +153,6 @@
 
   const isExpandAll = ref(false);
 
-  function changeExpand() {
-    isExpandAll.value = !isExpandAll.value;
-  }
-
   type FileShowType = 'Module' | 'Storage';
   const showType = ref<FileShowType>('Module');
 
diff --git a/frontend/src/components/business/ms-minders/featureCaseMinder/commentList.vue b/frontend/src/components/business/ms-minders/featureCaseMinder/commentList.vue
index 7458a38d10..8e3d557de0 100644
--- a/frontend/src/components/business/ms-minders/featureCaseMinder/commentList.vue
+++ b/frontend/src/components/business/ms-minders/featureCaseMinder/commentList.vue
@@ -20,6 +20,7 @@
         v-if="activeComment === 'reviewComment' || activeComment === 'executiveComment'"
         :review-comment-list="reviewCommentList"
         :active-comment="activeComment"
+        :permissions="['FUNCTIONAL_CASE:READ+COMMENT']"
       />
       <template v-else>
         <MsComment
diff --git a/frontend/src/views/api-test/management/components/import.vue b/frontend/src/views/api-test/management/components/import.vue
index 99e0cee0bb..2f1bb86f60 100644
--- a/frontend/src/views/api-test/management/components/import.vue
+++ b/frontend/src/views/api-test/management/components/import.vue
@@ -624,7 +624,7 @@
     (item) => ({
       ...item,
       operationTime: dayjs(item.operationTime).format('YYYY-MM-DD HH:mm:ss'),
-      nextTime: dayjs(item.nextTime).format('YYYY-MM-DD HH:mm:ss'),
+      nextTime: item.nextTime ? dayjs(item.nextTime).format('YYYY-MM-DD HH:mm:ss') : '-',
     })
   );
   function loadTaskList() {
diff --git a/frontend/src/views/api-test/management/components/management/api/apiTable.vue b/frontend/src/views/api-test/management/components/management/api/apiTable.vue
index 024183e2c6..410ea0b8d6 100644
--- a/frontend/src/views/api-test/management/components/management/api/apiTable.vue
+++ b/frontend/src/views/api-test/management/components/management/api/apiTable.vue
@@ -406,14 +406,14 @@
       dataIndex: 'protocol',
       slotName: 'protocol',
       showTooltip: true,
-      width: 150,
+      width: 80,
       showDrag: true,
     },
     {
       title: 'apiTestManagement.apiType',
       dataIndex: 'method',
       slotName: 'method',
-      width: 140,
+      width: 100,
       showDrag: true,
       filterConfig: {
         options: [],
@@ -458,7 +458,6 @@
       dataIndex: 'tags',
       isTag: true,
       isStringTag: true,
-      width: 400,
       showDrag: true,
     },
     {
diff --git a/frontend/src/views/api-test/management/components/management/case/caseTable.vue b/frontend/src/views/api-test/management/components/management/case/caseTable.vue
index 5527292afa..432ecf8083 100644
--- a/frontend/src/views/api-test/management/components/management/case/caseTable.vue
+++ b/frontend/src/views/api-test/management/components/management/case/caseTable.vue
@@ -409,7 +409,7 @@
       dataIndex: 'protocol',
       slotName: 'protocol',
       showTooltip: true,
-      width: 150,
+      width: 80,
       showDrag: true,
     },
     {
@@ -420,7 +420,7 @@
         options: casePriorityOptions,
         filterSlotName: FilterSlotNameEnum.CASE_MANAGEMENT_CASE_LEVEL,
       },
-      width: 150,
+      width: 100,
       showDrag: true,
     },
     {
@@ -451,7 +451,6 @@
       isTag: true,
       isStringTag: true,
       showDrag: true,
-      width: 400,
     },
     {
       title: 'case.lastReportStatus',
diff --git a/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue b/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue
index bee2c5e1b5..f815b9ad91 100644
--- a/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue
+++ b/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue
@@ -205,7 +205,7 @@
   });
 
   watch(
-    () => props.formKey,
+    () => [props.formKey, props.disabled],
     () => {
       formModel.value = {
         matchAll: matchAll.value,
diff --git a/frontend/src/views/bug-management/components/commentTab.vue b/frontend/src/views/bug-management/components/commentTab.vue
index 8b5a81ecb9..72e1a4c9c5 100644
--- a/frontend/src/views/bug-management/components/commentTab.vue
+++ b/frontend/src/views/bug-management/components/commentTab.vue
@@ -6,6 +6,7 @@
       :preview-url="EditorPreviewFileUrl"
       :comment-list="commentList"
       :upload-image="handleUploadImage"
+      :permissions="['PROJECT_BUG:READ+COMMENT']"
       @delete="handleDelete"
       @update-or-add="handleUpdate"
     />
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue
index 937c46628d..d8b36f5894 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue
@@ -14,6 +14,7 @@
         :upload-image="handleUploadImage"
         :comment-list="commentList"
         :preview-url="PreviewEditorImageUrl"
+        :permissions="['FUNCTIONAL_CASE:READ+COMMENT']"
         @delete="handleDelete"
         @update-or-add="handleUpdateOrAdd"
       />
diff --git a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
index c84e57c9ed..2c97efb688 100644
--- a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
+++ b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
@@ -713,15 +713,12 @@
   :deep(.param-input:not(.arco-input-focus, .arco-select-view-focus)) {
     &:not(:hover) {
       border-color: transparent !important;
-
       .arco-input::placeholder {
         @apply invisible;
       }
-
       .arco-select-view-icon {
         @apply invisible;
       }
-
       .arco-select-view-value {
         color: var(--color-text-1);
       }