fix(测试计划): 修改测试计划已归档不能关联和编辑&补充测试计划报告分享无资源

2024-05-22 10:53:05 +08:00 · 2024-05-22 10:53:05 +08:00 · a32ba8d291
parent 846ea5bfba
commit a32ba8d291
7 changed files with 70 additions and 42 deletions
--- a/frontend/src/views/setting/organization/serviceIntegration/components/serviceList.vue
+++ b/frontend/src/views/setting/organization/serviceIntegration/components/serviceList.vue
@ -90,7 +90,7 @@
                  >

                  <a-button
-                    v-if="item.config"
+                    v-if="hasAnyPermission(['SYSTEM_SERVICE_INTEGRATION:READ+DELETE']) && item.config"
                    v-permission="['SYSTEM_SERVICE_INTEGRATION:READ+DELETE']"
                    type="outline"
                    class="arco-btn-outline--secondary"
--- a/frontend/src/views/test-plan/report/detail/component/planDetail.vue
+++ b/frontend/src/views/test-plan/report/detail/component/planDetail.vue
@ -160,7 +160,7 @@

 <script setup lang="ts">
  import { ref } from 'vue';
-  import { useRoute } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
  import { useEventListener } from '@vueuse/core';
  import { Message } from '@arco-design/web-vue';
  import { cloneDeep } from 'lodash-es';
@ -187,6 +187,7 @@
  import { PreviewEditorImageUrl } from '@/api/requrls/case-management/featureCase';
  import { defaultReportDetail, statusConfig } from '@/config/testPlan';
  import { useI18n } from '@/hooks/useI18n';
+  import { NOT_FOUND_RESOURCE } from '@/router/constants';
  import useAppStore from '@/store/modules/app';
  import { addCommasToNumber } from '@/utils';
  import { hasAnyPermission } from '@/utils/permission';
@ -214,7 +215,7 @@
  /**
   * 分享share
   */
-
+  const router = useRouter();
  const shareLink = ref<string>('');
  const shareId = ref<string>(route.query.shareId as string);
  const reportId = ref<string>(props.reportId);
@ -395,7 +396,14 @@
  async function getDetail() {
    try {
      if (shareId.value) {
-        detail.value = await planReportShareDetail(shareId.value, reportId.value);
+        const result = await planReportShareDetail(shareId.value, reportId.value);
+        if (result.deleted) {
+          router.push({
+            name: NOT_FOUND_RESOURCE,
+          });
+        } else {
+          detail.value = result;
+        }
      } else {
        detail.value = await getReportDetail(reportId.value);
      }
@ -445,16 +453,19 @@
  ]);

  watchEffect(async () => {
+    if (props.reportId) {
+      await getDetail();
+      initOptionsData();
+    }
+  });
+
+  onMounted(async () => {
    nextTick(() => {
      const editorContent = document.querySelector('.editor-content');
      useEventListener(editorContent, 'click', () => {
        showButton.value = true;
      });
    });
-    if (props.reportId) {
-      await getDetail();
-      initOptionsData();
-    }
  });
 </script>

@ -497,4 +508,7 @@
      }
    }
  }
+  :deep(.rich-wrapper) .halo-rich-text-editor .ProseMirror {
+    height: 58px;
+  }
 </style>
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@ -184,33 +184,27 @@

    <template #operation="{ record }">
      <div class="flex items-center">
-        <MsButton
+        <div
          v-if="record.functionalCaseCount > 0 && hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])"
-          class="!mx-0"
-          @click="openDetail(record.id)"
-          >{{ t('testPlan.testPlanIndex.execution') }}</MsButton
+          class="flex items-center"
        >
-        <a-divider
-          v-if="record.functionalCaseCount > 0 && hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])"
-          direction="vertical"
-          :margin="8"
-        ></a-divider>
-
-        <MsButton
-          v-permission="['PROJECT_TEST_PLAN:READ+UPDATE']"
-          class="!mx-0"
-          @click="emit('editOrCopy', record.id, false)"
-          >{{ t('common.edit') }}</MsButton
+          <MsButton class="!mx-0" @click="openDetail(record.id)">{{ t('testPlan.testPlanIndex.execution') }}</MsButton>
+          <a-divider direction="vertical" :margin="8"></a-divider>
+        </div>
+        <div
+          v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) && record.status !== 'ARCHIVED'"
+          class="flex items-center"
        >
-        <a-divider direction="vertical" :margin="8"></a-divider>
-        <MsButton
-          v-if="record.functionalCaseCount < 1"
-          v-permission="['PROJECT_TEST_PLAN:READ+UPDATE']"
-          class="!mx-0"
-          @click="emit('editOrCopy', record.id, true)"
-          >{{ t('common.copy') }}</MsButton
+          <MsButton class="!mx-0" @click="emit('editOrCopy', record.id, false)">{{ t('common.edit') }}</MsButton>
+          <a-divider direction="vertical" :margin="8"></a-divider>
+        </div>
+        <div
+          v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) && record.functionalCaseCount < 1"
+          class="flex items-center"
        >
-        <a-divider v-if="record.functionalCaseCount < 1" direction="vertical" :margin="8"></a-divider>
+          <MsButton class="!mx-0" @click="emit('editOrCopy', record.id, true)">{{ t('common.copy') }}</MsButton>
+          <a-divider v-if="record.functionalCaseCount < 1" direction="vertical" :margin="8"></a-divider>
+        </div>

        <MsTableMoreAction
          :list="getMoreActions(record.status, record.functionalCaseCount)"
@ -566,7 +560,7 @@

  function getMoreActions(status: planStatusType, useCount: number) {
    // 有用例数量才可以执行 否则不展示执行
-    const copyAction = useCount > 0 ? copyActions : [];
+    const copyAction = useCount > 0 && hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) ? copyActions : [];
    // 单独操作已归档和已完成 不展示归档
    if (status === 'ARCHIVED' || status === 'PREPARED' || status === 'UNDERWAY') {
      return [
--- a/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
+++ b/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
@ -4,7 +4,7 @@
      v-model:focus-node-key="focusNodeKey"
      :selected-keys="props.selectedKeys"
      :data="testPlanTree"
-      :keyword="groupKeyword"
+      :keyword="moduleKeyword"
      :node-more-actions="caseMoreActions"
      :expand-all="props.isExpandAll"
      :empty-text="t('testPlan.testPlanIndex.planEmptyContent')"
@ -70,6 +70,7 @@

 <script setup lang="ts">
  import { computed, onBeforeMount, ref, watch } from 'vue';
+  import { useVModel } from '@vueuse/core';
  import { Message } from '@arco-design/web-vue';

  import MsButton from '@/components/pure/ms-button/index.vue';
@ -106,13 +107,21 @@
    isExpandAll: boolean; // 是否展开用例节点
    allNames?: string[]; // 所有的模块name列表
    modulesCount?: Record<string, number>; // 模块数量统计对象
+    groupKeyword: string;
  }>();

-  const emits = defineEmits(['update:selectedKeys', 'planTreeNodeSelect', 'init', 'dragUpdate', 'getNodeName']);
+  const emits = defineEmits([
+    'update:selectedKeys',
+    'planTreeNodeSelect',
+    'init',
+    'dragUpdate',
+    'getNodeName',
+    'update:groupKeyword',
+  ]);

  const currentProjectId = computed(() => appStore.currentProjectId);

-  const groupKeyword = ref<string>('');
+  const moduleKeyword = useVModel(props, 'groupKeyword', emits);

  const testPlanTree = ref<ModuleTreeNode[]>([]);

--- a/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
+++ b/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
@ -153,6 +153,7 @@
    planId?: string;
    moduleTree?: ModuleTreeNode[];
    isCopy: boolean;
+    moduleId?: string;
  }>();
  const innerVisible = defineModel<boolean>('visible', {
    required: true,
@ -307,6 +308,9 @@
      if (val) {
        form.value = cloneDeep(initForm);
        getDetail();
+        if (!props.planId && props.moduleId) {
+          form.value.moduleId = props.moduleId === 'all' ? 'root' : props.moduleId;
+        }
      }
    }
  );
--- a/frontend/src/views/test-plan/testPlan/detail/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/index.vue
@ -18,16 +18,16 @@
      </a-tooltip>
    </template>
    <template #headerRight>
-      <MsButton v-permission="['PROJECT_TEST_PLAN:READ+ASSOCIATION']" type="button" status="default" @click="linkCase">
+      <MsButton
+        v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+ASSOCIATION']) && detail.status !== 'ARCHIVED'"
+        type="button"
+        status="default"
+        @click="linkCase"
+      >
        <MsIcon type="icon-icon_link-record_outlined1" class="mr-[8px]" />
        {{ t('ms.case.associate.title') }}
      </MsButton>
-      <MsButton
-        v-permission="['PROJECT_TEST_PLAN:READ+UPDATE']"
-        type="button"
-        status="default"
-        @click="editorCopyHandler(false)"
-      >
+      <MsButton v-if="isEnableEdit" type="button" status="default" @click="editorCopyHandler(false)">
        <MsIcon type="icon-icon_edit_outlined" class="mr-[8px]" />
        {{ t('common.edit') }}
      </MsButton>
@ -162,6 +162,7 @@
  import useAppStore from '@/store/modules/app';
  import useUserStore from '@/store/modules/user';
  import { characterLimit } from '@/utils';
+  import { hasAnyPermission } from '@/utils/permission';

  import { ModuleTreeNode } from '@/models/common';
  import type { PassRateCountDetail, TestPlanDetail, TestPlanItem } from '@/models/testPlan/testPlan';
@ -230,6 +231,10 @@
    return fullActions.filter((e) => e.eventTag !== 'archive');
  });

+  const isEnableEdit = computed(() => {
+    return hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) && detail.value.status !== 'ARCHIVED';
+  });
+
  function getTabBadge(tabKey: string) {
    switch (tabKey) {
      case 'featureCase':
--- a/frontend/src/views/test-plan/testPlan/index.vue
+++ b/frontend/src/views/test-plan/testPlan/index.vue
@ -62,6 +62,7 @@
            <TestPlanTree
              ref="planTreeRef"
              v-model:selected-keys="selectedKeys"
+              v-model:groupKeyword="groupKeyword"
              :all-names="rootModulesName"
              :active-folder="activeFolder"
              :is-expand-all="isExpandAll"
@ -92,6 +93,7 @@
    <CreateAndEditPlanDrawer
      v-model:visible="showPlanDrawer"
      :plan-id="planId"
+      :module-id="selectedKeys[0]"
      :module-tree="folderTree"
      :is-copy="isCopy"
      @close="resetPlanId"