From 0ad5eb7e646511c314626b6f3dd44a2490410f6d Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Mon, 27 May 2024 17:49:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80):=20=20=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86/=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92/=E8=84=91=E5=9B=BE=E9=83=A8=E5=88=86=20bug=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/modules/message/index.ts     |  3 +--
 .../ms-minders/featureCaseMinder/basInfo.vue  | 11 +++++++--
 .../ms-minders/featureCaseMinder/index.vue    | 14 +++++++++--
 .../ms-personal-drawer/components/setPsw.vue  |  2 ++
 .../pure/ms-minder-editor/main/mainEditor.vue | 24 +++++++++++++++----
 .../ms-minder-editor/menu/edit/editDel.vue    | 21 +++++++++++++---
 .../components/pure/ms-minder-editor/props.ts |  5 ++--
 .../ms-minder-editor/script/runtime/hotbox.ts | 14 +++++------
 .../pure/ms-time-selector/MsTimeSelector.vue  |  2 +-
 frontend/src/enums/minderEnum.ts              |  7 ++++++
 .../modules/components/minder-editor/index.ts | 19 +++++++++++----
 .../modules/components/minder-editor/types.ts | 10 +++++---
 frontend/src/store/modules/user/index.ts      |  8 ++++---
 .../src/views/login/components/login-form.vue |  2 +-
 frontend/src/views/login/locale/en-US.ts      |  2 +-
 frontend/src/views/login/locale/zh-CN.ts      |  2 +-
 .../testPlan/createAndEditPlanDrawer.vue      | 20 +++++++++++-----
 17 files changed, 122 insertions(+), 44 deletions(-)
 create mode 100644 frontend/src/enums/minderEnum.ts

diff --git a/frontend/src/api/modules/message/index.ts b/frontend/src/api/modules/message/index.ts
index 56dd7d6d73..b606307398 100644
--- a/frontend/src/api/modules/message/index.ts
+++ b/frontend/src/api/modules/message/index.ts
@@ -1,5 +1,4 @@
 import MSR from '@/api/http/index';
-import * as bugURL from '@/api/requrls/bug-management';
 
 import { CommonList, TableQueryParams } from '@/models/common';
 
@@ -91,5 +90,5 @@ export function getMessageReadAll(resourceType?: string) {
 }
 
 export function getMessageUnReadCount(projectId: string) {
-  return MSR.get<number>({ url: '/notification/un-read', params: projectId });
+  return MSR.get<number>({ url: '/notification/un-read', params: projectId }, { ignoreCancelToken: true });
 }
diff --git a/frontend/src/components/business/ms-minders/featureCaseMinder/basInfo.vue b/frontend/src/components/business/ms-minders/featureCaseMinder/basInfo.vue
index 7309d4acd2..55edf3fc23 100644
--- a/frontend/src/components/business/ms-minders/featureCaseMinder/basInfo.vue
+++ b/frontend/src/components/business/ms-minders/featureCaseMinder/basInfo.vue
@@ -36,7 +36,7 @@
       >
         {{ t('common.save') }}
       </a-button>
-      <a-button type="secondary" :disabled="saveLoading">{{ t('common.cancel') }}</a-button>
+      <a-button type="secondary" :disabled="saveLoading" @click="handleCancel">{{ t('common.cancel') }}</a-button>
     </div>
   </div>
 </template>
@@ -47,6 +47,7 @@
   import MsFormCreate from '@/components/pure/ms-form-create/ms-form-create.vue';
   import { FormItem, FormRuleItem } from '@/components/pure/ms-form-create/types';
   import { MinderJsonNode } from '@/components/pure/ms-minder-editor/props';
+  import MsTagsInput from '@/components/pure/ms-tags-input/index.vue';
 
   import { getCaseDefaultFields, updateCaseRequest } from '@/api/modules/case-management/featureCase';
   import { useI18n } from '@/hooks/useI18n';
@@ -61,6 +62,9 @@
     activeCase: Record<string, any>;
     loading: boolean;
   }>();
+  const emit = defineEmits<{
+    (e: 'cancel'): void;
+  }>();
 
   const appStore = useAppStore();
   const userStore = useUserStore();
@@ -149,7 +153,7 @@
                 fileList: [],
               });
               const selectedNode: MinderJsonNode = window.minder.getSelectedNode();
-              if (selectedNode.data) {
+              if (selectedNode?.data) {
                 selectedNode.data.text = baseInfoForm.value.name;
               }
               Message.success(t('common.saveSuccess'));
@@ -164,6 +168,9 @@
       }
     });
   }
+  function handleCancel() {
+    emit('cancel');
+  }
 
   watch(
     () => props.activeCase.id,
diff --git a/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue b/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue
index 86209ff53b..a9f5123ea8 100644
--- a/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue
+++ b/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue
@@ -17,7 +17,12 @@
     @save="handleMinderSave"
   >
     <template #extractTabContent>
-      <baseInfo v-if="activeExtraKey === 'baseInfo'" :loading="baseInfoLoading" :active-case="activeCase" />
+      <baseInfo
+        v-if="activeExtraKey === 'baseInfo'"
+        :loading="baseInfoLoading"
+        :active-case="activeCase"
+        @cancel="handleBaseInfoCancel"
+      />
       <attachment
         v-else-if="activeExtraKey === 'attachment'"
         v-model:model-value="fileList"
@@ -69,7 +74,7 @@
   const topTags = [moduleTag, caseTag];
   const descTags = [t('ms.minders.stepDesc'), t('ms.minders.textDesc')];
   const importJson = ref<MinderJson>({
-    root: {},
+    root: {} as MinderJsonNode,
     template: 'default',
     treePath: [],
   });
@@ -552,6 +557,11 @@
     fileList.value = [];
   }
 
+  function handleBaseInfoCancel() {
+    extraVisible.value = false;
+    resetExtractInfo();
+  }
+
   /**
    * 处理脑图节点激活/点击
    * @param node 被激活/点击的节点
diff --git a/frontend/src/components/business/ms-personal-drawer/components/setPsw.vue b/frontend/src/components/business/ms-personal-drawer/components/setPsw.vue
index 57578204b7..6bd0e953a1 100644
--- a/frontend/src/components/business/ms-personal-drawer/components/setPsw.vue
+++ b/frontend/src/components/business/ms-personal-drawer/components/setPsw.vue
@@ -42,6 +42,7 @@
   import { useI18n } from '@/hooks/useI18n';
   import useUserStore from '@/store/modules/user';
   import { encrypted } from '@/utils';
+  import { clearToken } from '@/utils/auth';
   import { validatePasswordLength, validateWordPassword } from '@/utils/validate';
 
   const router = useRouter();
@@ -111,6 +112,7 @@
           }, 1000);
           setTimeout(() => {
             clearInterval(timer);
+            clearToken();
             router.push({
               name: 'login',
               query: {
diff --git a/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue b/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue
index 05a3767fc7..2a17bbdc58 100644
--- a/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue
+++ b/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue
@@ -92,6 +92,8 @@
   import useMinderStore from '@/store/modules/components/minder-editor';
   import { findNodePathByKey } from '@/utils';
 
+  import { MinderEventName } from '@/enums/minderEnum';
+
   import { editMenuProps, insertProps, mainEditorProps, MinderJsonNode, priorityProps, tagProps } from '../props';
   import Editor from '../script/editor';
   import { markChangeNode, markDeleteNode } from '../script/tool/utils';
@@ -222,8 +224,12 @@
   const menuVisible = ref(false);
   const menuPopupOffset = ref([0, 0]);
 
-  function switchNode(node: any) {
-    innerImportJson.value = cloneDeep(findNodePathByKey([props.importJson.root], node.id, 'data', 'id'));
+  /**
+   * 切换脑图展示的节点层级
+   * @param node 切换的节点
+   */
+  function switchNode(node: MinderJsonNode) {
+    innerImportJson.value = cloneDeep(findNodePathByKey([props.importJson.root], node.data?.id, 'data', 'id'));
     innerImportJson.value.data.expandState = 'expand';
     window.minder.importJson(innerImportJson.value);
     window.minder.execCommand('template', Object.keys(window.kityminder.Minder.getTemplateList())[minderStore.mold]);
@@ -232,7 +238,7 @@
   watch(
     () => minderStore.event.timestamp,
     () => {
-      if (minderStore.event.name === 'hotbox') {
+      if (minderStore.event.name === MinderEventName.HOTBOX && minderStore.event.nodePosition) {
         const nodeDomWidth = minderStore.event.nodeDom?.getBoundingClientRect().width || 0;
         menuPopupOffset.value = [
           minderStore.event.nodePosition.x + nodeDomWidth / 2,
@@ -240,12 +246,16 @@
         ];
         menuVisible.value = true;
       }
-      if (minderStore.event.name === 'enterNode') {
-        switchNode(minderStore.event.nodeData);
+      if (minderStore.event.name === MinderEventName.ENTER_NODE && minderStore.event.node) {
+        switchNode(minderStore.event.node);
       }
     }
   );
 
+  /**
+   * 执行插入
+   * @param command 插入命令
+   */
   function execInsertCommand(command: string) {
     const node: MinderJsonNode = window.minder.getSelectedNode();
     if (props.insertNode) {
@@ -257,6 +267,10 @@
     }
   }
 
+  /**
+   * 处理快捷菜单选择
+   * @param val 选择的菜单项
+   */
   function handleMinderMenuSelect(val: string | number | Record<string, any> | undefined) {
     const selectedNode = window.minder.getSelectedNode();
     switch (val) {
diff --git a/frontend/src/components/pure/ms-minder-editor/menu/edit/editDel.vue b/frontend/src/components/pure/ms-minder-editor/menu/edit/editDel.vue
index 37e5b67788..d73d5d24b1 100644
--- a/frontend/src/components/pure/ms-minder-editor/menu/edit/editDel.vue
+++ b/frontend/src/components/pure/ms-minder-editor/menu/edit/editDel.vue
@@ -19,10 +19,15 @@
   import { nextTick, onMounted, reactive, ref } from 'vue';
 
   import { useI18n } from '@/hooks/useI18n';
+  import useMinderStore from '@/store/modules/components/minder-editor';
+  import { MinderNodePosition } from '@/store/modules/components/minder-editor/types';
+
+  import { MinderEventName } from '@/enums/minderEnum';
 
   import { delProps } from '../../props';
   import { isDeleteDisableNode } from '../../script/tool/utils';
 
+  const minderStore = useMinderStore();
   const { t } = useI18n();
 
   const props = defineProps(delProps);
@@ -54,9 +59,19 @@
     if (removeNodeDisabled.value || !minder.queryCommandState || !minder.execCommand) {
       return;
     }
-    if (props.delConfirm) {
-      props.delConfirm();
-      return;
+    const node = minder.getSelectedNode();
+    let position: MinderNodePosition | undefined;
+    if (node) {
+      if (props.delConfirm) {
+        props.delConfirm(node);
+        return;
+      }
+      const box = node.getRenderBox();
+      position = {
+        x: box.cx,
+        y: box.cy,
+      };
+      minderStore.dispatchEvent(MinderEventName.DELETE_NODE, position, node.rc.node, node.data);
     }
     minder.forceRemoveNode();
   }
diff --git a/frontend/src/components/pure/ms-minder-editor/props.ts b/frontend/src/components/pure/ms-minder-editor/props.ts
index af9e8cb6a0..a231e16c6c 100644
--- a/frontend/src/components/pure/ms-minder-editor/props.ts
+++ b/frontend/src/components/pure/ms-minder-editor/props.ts
@@ -19,8 +19,8 @@ export interface MinderJsonNodeData {
   [key: string]: any;
 }
 export interface MinderJsonNode {
+  data: MinderJsonNodeData;
   parent?: MinderJsonNode;
-  data?: MinderJsonNodeData;
   children?: MinderJsonNode[];
   [key: string]: any; // minder 内置字段
 }
@@ -148,8 +148,9 @@ export const moleProps = {
 };
 
 export const delProps = {
+  // 节点删除确认
   delConfirm: {
-    type: Function,
+    type: Function as PropType<(node: MinderJsonNode) => void>,
     default: null,
   },
 };
diff --git a/frontend/src/components/pure/ms-minder-editor/script/runtime/hotbox.ts b/frontend/src/components/pure/ms-minder-editor/script/runtime/hotbox.ts
index 56a500f6bc..007893fa20 100644
--- a/frontend/src/components/pure/ms-minder-editor/script/runtime/hotbox.ts
+++ b/frontend/src/components/pure/ms-minder-editor/script/runtime/hotbox.ts
@@ -1,9 +1,7 @@
 import useMinderStore from '@/store/modules/components/minder-editor';
+import type { MinderNodePosition } from '@/store/modules/components/minder-editor/types';
 
-interface Position {
-  x: number;
-  y: number;
-}
+import { MinderEventName } from '@/enums/minderEnum';
 
 function HotboxRuntime(this: any) {
   const { fsm } = this;
@@ -18,14 +16,14 @@ function HotboxRuntime(this: any) {
 
   function handleHotBoxShow() {
     const node = minder.getSelectedNode();
-    let position: Position | undefined;
+    let position: MinderNodePosition | undefined;
     if (node) {
       const box = node.getRenderBox();
       position = {
         x: box.cx,
         y: box.cy,
       };
-      minderStore.dispatchEvent('hotbox', position, node.rc.node);
+      minderStore.dispatchEvent(MinderEventName.HOTBOX, position, node.rc.node);
     }
   }
 
@@ -48,14 +46,14 @@ function HotboxRuntime(this: any) {
       e.preventDefault(); // 阻止默认行为
       // 执行进入模块方法
       const node = minder.getSelectedNode();
-      let position: Position | undefined;
+      let position: MinderNodePosition | undefined;
       if (node) {
         const box = node.getRenderBox();
         position = {
           x: box.cx,
           y: box.cy,
         };
-        minderStore.dispatchEvent('enterNode', position, node.rc.node, node.data);
+        minderStore.dispatchEvent(MinderEventName.ENTER_NODE, position, node.rc.node, node.data);
         return;
       }
     }
diff --git a/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue b/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue
index 58984ec246..d8ab1371c4 100644
--- a/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue
+++ b/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue
@@ -68,8 +68,8 @@
     modelValue.value = result;
     nextTick(() => {
       initNumberAndType();
+      emit('change', modelValue.value);
     });
-    emit('change', modelValue.value);
   }
 
   const option = [
diff --git a/frontend/src/enums/minderEnum.ts b/frontend/src/enums/minderEnum.ts
new file mode 100644
index 0000000000..d7b955f318
--- /dev/null
+++ b/frontend/src/enums/minderEnum.ts
@@ -0,0 +1,7 @@
+export enum MinderEventName {
+  'DELETE_NODE' = 'DELETE_NODE', // 删除节点
+  'HOTBOX' = 'HOTBOX', // 热键菜单
+  'ENTER_NODE' = 'ENTER_NODE', // 进入节点
+}
+
+export default {};
diff --git a/frontend/src/store/modules/components/minder-editor/index.ts b/frontend/src/store/modules/components/minder-editor/index.ts
index c9d6049250..d32803f980 100644
--- a/frontend/src/store/modules/components/minder-editor/index.ts
+++ b/frontend/src/store/modules/components/minder-editor/index.ts
@@ -1,30 +1,41 @@
 import { defineStore } from 'pinia';
 
+import type { MinderJsonNode } from '@/components/pure/ms-minder-editor/props';
+
+import type { MinderEventName } from '@/enums/minderEnum';
+
 import { MinderNodePosition, MinderState } from './types';
 
 // 脑图组件的 store
 const useMinderStore = defineStore('minder', {
   state: (): MinderState => ({
     event: {
-      name: '',
+      name: '' as MinderEventName,
       timestamp: 0,
       nodePosition: {
         x: 0,
         y: 0,
       },
       nodeDom: undefined,
-      nodeData: undefined,
+      node: undefined,
     },
     mold: 0,
   }),
   actions: {
-    dispatchEvent(name: string, position: MinderNodePosition, nodeDom?: HTMLElement, nodeData?: Record<string, any>) {
+    /**
+     * 脑图组件派发事件
+     * @param name 事件名称
+     * @param position 触发事件的节点/鼠标位置
+     * @param nodeDom 节点 DOM
+     * @param node 节点
+     */
+    dispatchEvent(name: MinderEventName, position?: MinderNodePosition, nodeDom?: HTMLElement, node?: MinderJsonNode) {
       this.event = {
         name,
         timestamp: Date.now(),
         nodePosition: position,
         nodeDom,
-        nodeData,
+        node,
       };
     },
     setMold(val: number) {
diff --git a/frontend/src/store/modules/components/minder-editor/types.ts b/frontend/src/store/modules/components/minder-editor/types.ts
index d8bbe78b36..f64fbcf1c1 100644
--- a/frontend/src/store/modules/components/minder-editor/types.ts
+++ b/frontend/src/store/modules/components/minder-editor/types.ts
@@ -1,14 +1,18 @@
+import type { MinderJsonNode } from '@/components/pure/ms-minder-editor/props';
+
+import type { MinderEventName } from '@/enums/minderEnum';
+
 export interface MinderNodePosition {
   x: number;
   y: number;
 }
 
 export interface MinderEvent {
-  name: string;
+  name: MinderEventName;
   timestamp: number;
-  nodePosition: MinderNodePosition;
+  nodePosition?: MinderNodePosition;
   nodeDom?: HTMLElement;
-  nodeData?: Record<string, any>;
+  node?: MinderJsonNode;
 }
 
 export interface MinderState {
diff --git a/frontend/src/store/modules/user/index.ts b/frontend/src/store/modules/user/index.ts
index cc692a289f..58b2fd6ede 100644
--- a/frontend/src/store/modules/user/index.ts
+++ b/frontend/src/store/modules/user/index.ts
@@ -142,11 +142,13 @@ const useUserStore = defineStore('user', {
       appStore.resetSystemPackageType();
     },
     // 登出
-    async logout() {
+    async logout(silence = false) {
       try {
         const { t } = useI18n();
-        const appStore = useAppStore();
-        appStore.showLoading(t('message.logouting'));
+        if (!silence) {
+          const appStore = useAppStore();
+          appStore.showLoading(t('message.logouting'));
+        }
         await userLogout();
       } finally {
         this.logoutCallBack();
diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue
index 0d8c209870..c69fc3239d 100644
--- a/frontend/src/views/login/components/login-form.vue
+++ b/frontend/src/views/login/components/login-form.vue
@@ -162,7 +162,7 @@
       setLoading(true);
       try {
         try {
-          await userStore.logout(); // 登录之前先注销，防止未登出就继续登录导致报错
+          await userStore.logout(true); // 登录之前先注销，防止未登出就继续登录导致报错
         } catch (error) {
           // eslint-disable-next-line no-console
           console.log('logout error', error);
diff --git a/frontend/src/views/login/locale/en-US.ts b/frontend/src/views/login/locale/en-US.ts
index 7b4e1bc24f..ca8cc34877 100644
--- a/frontend/src/views/login/locale/en-US.ts
+++ b/frontend/src/views/login/locale/en-US.ts
@@ -1,5 +1,5 @@
 export default {
-  'login.form.title': 'One-stop open source continuous testing platform',
+  'login.form.title': 'Modern, open-source test management and interface testing tools',
   'login.form.userName.errMsg': 'Username cannot be empty',
   'login.form.password.errMsg': 'Password cannot be empty',
   'login.form.login.errMsg': 'Login error, refresh and try again',
diff --git a/frontend/src/views/login/locale/zh-CN.ts b/frontend/src/views/login/locale/zh-CN.ts
index 1b360f70db..d591d1c94e 100644
--- a/frontend/src/views/login/locale/zh-CN.ts
+++ b/frontend/src/views/login/locale/zh-CN.ts
@@ -1,5 +1,5 @@
 export default {
-  'login.form.title': '一站式开源持续测试平台',
+  'login.form.title': '现代化、开源的测试管理和接口测试工具',
   'login.form.userName.errMsg': '邮箱不能为空',
   'login.form.password.errMsg': '密码不能为空',
   'login.form.login.errMsg': '登录出错，请刷新重试',
diff --git a/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue b/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
index ce0d2994d0..4476337105 100644
--- a/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
+++ b/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
@@ -61,7 +61,7 @@
           value-format="timestamp"
           :separator="t('common.to')"
           :time-picker-props="{
-            defaultValue: ['00:00:00', '00:00:00'],
+            defaultValue: tempRange,
           }"
           :disabled-time="disabledTime"
           @select="handleTimeSelect"
@@ -196,14 +196,14 @@
     return (nodeData as ModuleTreeNode).name.toLowerCase().indexOf(searchValue.toLowerCase()) > -1;
   }
 
-  const tempRange = ref<(Date | string | number | undefined)[]>([]);
+  const tempRange = ref<(Date | string | number)[]>(['00:00:00', '00:00:00']);
 
-  function makeLessNumbers(value: number) {
+  function makeLessNumbers(value: number, isSecond = false) {
     const res = [];
     for (let i = 0; i < value; i++) {
       res.push(i);
     }
-    return res;
+    return isSecond && res.length === 0 ? [0] : res; // 秒至少相差 1 秒
   }
 
   function disabledTime(current: Date, type: 'start' | 'end'): DisabledTimeProps {
@@ -230,7 +230,7 @@
             currentDate.isSame(startDate, 'h') &&
             currentDate.isSame(startDate, 'm')
           ) {
-            return makeLessNumbers(startDate.get('s'));
+            return makeLessNumbers(startDate.get('s'), true);
           }
           return [];
         },
@@ -240,7 +240,15 @@
   }
 
   function handleTimeSelect(value: (Date | string | number | undefined)[]) {
-    tempRange.value = value;
+    if (value) {
+      // const start = dayjs(value[0]);
+      // const end = dayjs(value[1]);
+      // if (start.isSame(end, 'D') && end.hour() === 0 && end.minute() === 0 && end.second() === 0) {
+      //   const newEnd = end.hour(23).minute(59).second(59);
+      //   value[1] = newEnd.valueOf();
+      // }
+      tempRange.value = value as number[];
+    }
   }
 
   const switchList: SwitchListModel[] = [