fix(工作台): 修复工作台首页卡片查询项目权限关闭后刷新bug

frontend/src/views/workbench/homePage/components/apiAndScenarioCase.vue

@@ -296,16 +296,15 @@
   }
 
   function changeProject() {
-    nextTick(async () => {
+    nextTick(() => {
-      await initApiOrScenarioCount();
       emit('change');
-      if (hasPermission.value) {
-        initApiCountRate();
-      }
     });
   }
 
+  const isInit = ref<boolean>(true);
+
   onMounted(() => {
+    isInit.value = false;
     initApiOrScenarioCount();
   });
 
@@ -330,13 +329,14 @@
   );
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -360,14 +360,13 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    await initApiOrScenarioCount();
-      if (val) {
+    if (hasPermission.value && !isInit.value) {
-        initApiOrScenarioCount();
+      initApiCountRate();
-      }
     }
-  );
+  });
 </script>
 
 <style scoped lang="less">

frontend/src/views/workbench/homePage/components/apiChangeList.vue

@@ -190,7 +190,6 @@
 
   function changeProject() {
     nextTick(() => {
-      initData();
       emit('change');
     });
   }
@@ -200,13 +199,14 @@
   });
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -230,14 +230,10 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    initData();
-      if (val) {
+  });
-        initData();
-      }
-    }
-  );
 </script>
 
 <style scoped></style>

frontend/src/views/workbench/homePage/components/apiCount.vue

@@ -192,15 +192,13 @@
 
   function changeProject() {
     nextTick(async () => {
-      await initApiCount();
       emit('change');
-      if (hasPermission.value) {
-        initApiCountRate();
-      }
     });
   }
+  const isInit = ref(true);
 
   onMounted(() => {
+    isInit.value = false;
     initApiCount();
     emit('change');
   });
@@ -235,13 +233,14 @@
   );
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -265,14 +264,13 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    await initApiCount();
-      if (val) {
+    if (hasPermission.value && !isInit.value) {
-        initApiCount();
+      initApiCountRate();
-      }
     }
-  );
+  });
 </script>
 
 <style scoped lang="less">

frontend/src/views/workbench/homePage/components/caseCount.vue

@@ -157,7 +157,6 @@
 
   function changeProject() {
     nextTick(() => {
-      initCaseCount();
       emit('change');
     });
   }
@@ -167,21 +166,23 @@
   });
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
     () => projectId.value,
     (val) => {
-      if (val) {
+      innerProjectIds.value = [val];
-        innerProjectIds.value = [val];
+    },
-      }
+    {
+      immediate: true,
     }
   );
 
@@ -197,14 +198,10 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    initCaseCount();
-      if (val) {
+  });
-        initCaseCount();
-      }
-    }
-  );
 </script>
 
 <style scoped lang="less"></style>

frontend/src/views/workbench/homePage/components/caseReviewedCount.vue

@@ -135,7 +135,6 @@
 
   function changeProject() {
     nextTick(() => {
-      initReviewCount();
       emit('change');
     });
   }
@@ -145,13 +144,14 @@
   });
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -175,14 +175,10 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    initReviewCount();
-      if (val) {
+  });
-        initReviewCount();
-      }
-    }
-  );
 </script>
 
 <style scoped lang="less"></style>

frontend/src/views/workbench/homePage/components/defectCount.vue

@@ -168,7 +168,6 @@
 
   function changeProject() {
     nextTick(() => {
-      initCount();
       emit('change');
     });
   }
@@ -178,14 +177,14 @@
   });
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
-      const [newProjectId] = val;
+      if (val) {
-      projectId.value = newProjectId;
+        const [newProjectId] = val;
+        projectId.value = newProjectId;
+      }
     },
-    {
+    { immediate: true }
-      immediate: true,
-    }
   );
 
   watch(
@@ -210,14 +209,10 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    initCount();
-      if (val) {
+  });
-        initCount();
-      }
-    }
-  );
 </script>
 
 <style scoped lang="less"></style>

frontend/src/views/workbench/homePage/components/defectMemberBar.vue

@@ -80,8 +80,6 @@
     required: true,
   });
 
-  const memberIds = ref<string[]>(innerHandleUsers.value);
-
   const timeForm = inject<Ref<TimeFormParams>>(
     'timeForm',
     ref({
@@ -179,10 +177,8 @@
   }
 
   function changeProject() {
-    memberIds.value = [];
+    innerHandleUsers.value = [];
     nextTick(() => {
-      getMemberOptions();
-      getDefectMemberDetail();
       emit('change');
     });
   }
@@ -195,13 +191,14 @@
   }
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -225,15 +222,11 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    getMemberOptions();
-      if (val) {
+    getDefectMemberDetail();
-        getMemberOptions();
+  });
-        getDefectMemberDetail();
-      }
-    }
-  );
 
   onMounted(() => {
     getMemberOptions();

frontend/src/views/workbench/homePage/components/overview.vue

@@ -223,7 +223,6 @@
   function changeProject() {
     if (isInit.value) return;
     nextTick(() => {
-      initOverViewDetail();
       emit('change');
     });
   }
@@ -260,6 +259,11 @@
       }
     }
   );
+
+  watch([() => props.refreshKey, () => innerProjectIds.value], async () => {
+    await nextTick();
+    initOverViewDetail();
+  });
 </script>
 
 <style scoped lang="less">

frontend/src/views/workbench/homePage/components/overviewMember.vue

@@ -179,6 +179,7 @@
       value: e.id,
     }));
   }
+  const isInit = ref(true);
 
   function changeProject() {
     innerHandleUsers.value = [];
@@ -197,14 +198,14 @@
   }
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
-        innerHandleUsers.value = [];
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -213,7 +214,8 @@
       if (val) {
         innerProjectIds.value = [val];
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -229,23 +231,20 @@
   );
 
   onMounted(() => {
+    isInit.value = false;
     initOverViewMemberDetail();
     if (props.item.projectIds.length) {
       getMemberOptions();
     }
   });
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    initOverViewMemberDetail();
-      if (val) {
+    if (props.item.projectIds.length) {
-        initOverViewMemberDetail();
+      getMemberOptions();
-        if (props.item.projectIds.length) {
-          getMemberOptions();
-        }
-      }
     }
-  );
+  });
 </script>
 
 <style scoped lang="less"></style>

frontend/src/views/workbench/homePage/components/relatedCaseCount.vue

@@ -128,7 +128,6 @@
 
   function changeProject() {
     nextTick(() => {
-      getRelatedCaseCount();
       emit('change');
     });
   }
@@ -168,14 +167,12 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async ([refreshKey]) => {
-    () => props.refreshKey,
+    if (refreshKey) {
-    (val) => {
+      await nextTick();
-      if (val) {
+      getRelatedCaseCount();
-        getRelatedCaseCount();
-      }
     }
-  );
+  });
 </script>
 
 <style scoped lang="less"></style>

frontend/src/views/workbench/homePage/components/testPlanCount.vue

@@ -250,7 +250,6 @@
 
   function changeProject() {
     nextTick(() => {
-      initTestPlanCount();
       emit('change');
     });
   }
@@ -265,17 +264,19 @@
       if (val) {
         innerProjectIds.value = [val];
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
-    () => innerProjectIds.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
         const [newProjectId] = val;
         projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -290,14 +291,10 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    initTestPlanCount();
-      if (val) {
+  });
-        initTestPlanCount();
-      }
-    }
-  );
 </script>
 
 <style scoped lang="less">

frontend/src/views/workbench/homePage/components/waitReviewList.vue

@@ -205,6 +205,7 @@
         handleUsers: [],
       });
       await loadList();
+      isNoPermission.value = false;
     } catch (error) {
       isNoPermission.value = error === 'no_project_permission';
       // eslint-disable-next-line no-console
@@ -217,7 +218,6 @@
 
   function changeProject() {
     nextTick(() => {
-      initData();
       emit('change');
     });
   }
@@ -227,12 +227,14 @@
   });
 
   watch(
-    () => projectId.value,
+    () => props.item.projectIds,
     (val) => {
       if (val) {
-        innerProjectIds.value = [val];
+        const [newProjectId] = val;
+        projectId.value = newProjectId;
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -241,7 +243,8 @@
       if (val) {
         innerProjectIds.value = [val];
       }
-    }
+    },
+    { immediate: true }
   );
 
   watch(
@@ -256,14 +259,10 @@
     }
   );
 
-  watch(
+  watch([() => props.refreshKey, () => projectId.value], async () => {
-    () => props.refreshKey,
+    await nextTick();
-    (val) => {
+    initData();
-      if (val) {
+  });
-        initData();
-      }
-    }
-  );
 </script>
 
 <style scoped></style>