From 042ee3b9b15d7e6e8e4d2ac673ab0dbd8b6317ee Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Fri, 29 Nov 2024 11:24:39 +0800
Subject: [PATCH] update

---
 src/store/modules/profile.ts                  |  6 +-
 .../profile/components/SegmentList.vue        |  7 +--
 .../related/profile/components/TaskList.vue   | 63 +++++++++----------
 3 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/src/store/modules/profile.ts b/src/store/modules/profile.ts
index 4fd4b200..55ac9a5b 100644
--- a/src/store/modules/profile.ts
+++ b/src/store/modules/profile.ts
@@ -80,7 +80,7 @@ export const profileStore = defineStore({
       this.analyzeTrees = [];
     },
     setCurrentSegment(segment: Trace) {
-      this.currentSegment = segment;
+      this.currentSegment = segment || {};
       this.segmentSpans = segment.spans || [];
       if (segment.spans) {
         this.currentSpan = segment.spans[0] || {};
@@ -155,10 +155,10 @@ export const profileStore = defineStore({
         return res.data;
       }
       if (segmentList[0]) {
-        this.currentSegment = segmentList[0];
+        this.setCurrentSegment(segmentList[0]);
         this.getSegmentSpans(segmentList[0].segmentId);
       } else {
-        this.currentSegment = {};
+        this.setCurrentSegment({});
       }
       return res.data;
     },
diff --git a/src/views/dashboard/related/profile/components/SegmentList.vue b/src/views/dashboard/related/profile/components/SegmentList.vue
index e0069ff1..03101d77 100644
--- a/src/views/dashboard/related/profile/components/SegmentList.vue
+++ b/src/views/dashboard/related/profile/components/SegmentList.vue
@@ -56,12 +56,7 @@ limitations under the License. -->
   const { t } = useI18n();
   const profileStore = useProfileStore();
   const key = computed(
-    () =>
-      (profileStore.currentSegment &&
-        profileStore.currentSegment.spans &&
-        profileStore.currentSegment.spans.length &&
-        profileStore.currentSegment.spans[0].segmentId) ||
-      "",
+    () => (profileStore.currentSegment.spans?.length && profileStore.currentSegment.spans[0].segmentId) || "",
   );
 
   async function selectSegment(item: Trace) {
diff --git a/src/views/dashboard/related/profile/components/TaskList.vue b/src/views/dashboard/related/profile/components/TaskList.vue
index 39a26249..9efc0b0f 100644
--- a/src/views/dashboard/related/profile/components/TaskList.vue
+++ b/src/views/dashboard/related/profile/components/TaskList.vue
@@ -14,38 +14,36 @@ See the License for the specific language governing permissions and
 limitations under the License. -->
 <template>
   <div class="profile-task-list flex-v">
-    <div class="profile-task-wrapper flex-v">
-      <div class="profile-t-tool flex-h">{{ t("taskList") }}</div>
-      <div class="profile-t-wrapper">
-        <div class="no-data" v-show="!profileStore.taskList.length">
-          {{ t("noData") }}
-        </div>
-        <table class="profile-t">
-          <tr class="profile-tr cp" v-for="(i, index) in profileStore.taskList" @click="changeTask(i)" :key="index">
-            <td
-              class="profile-td"
-              :class="{
-                selected: profileStore.currentTask && profileStore.currentTask.id === i.id,
-              }"
-            >
-              <div class="ell">
-                <span>{{ i.endpointName }}</span>
-                <a class="profile-btn r" @click="viewTask($event, i)">
-                  <Icon iconName="view" size="middle" />
-                </a>
-              </div>
-              <div class="grey ell sm">
-                <span class="mr-10 sm">
-                  {{ dateFormat(i.startTime) }}
-                </span>
-                <span class="mr-10 sm">
-                  {{ dateFormat(i.startTime + i.duration * 60 * 1000) }}
-                </span>
-              </div>
-            </td>
-          </tr>
-        </table>
+    <div class="profile-t-tool flex-h">{{ t("taskList") }}</div>
+    <div class="profile-t-wrapper">
+      <div class="no-data" v-show="!profileStore.taskList.length">
+        {{ t("noData") }}
       </div>
+      <table class="profile-t">
+        <tr class="profile-tr cp" v-for="(i, index) in profileStore.taskList" @click="changeTask(i)" :key="index">
+          <td
+            class="profile-td"
+            :class="{
+              selected: profileStore.currentTask && profileStore.currentTask.id === i.id,
+            }"
+          >
+            <div class="ell">
+              <span>{{ i.endpointName }}</span>
+              <a class="profile-btn r" @click="viewTask($event, i)">
+                <Icon iconName="view" size="middle" />
+              </a>
+            </div>
+            <div class="grey ell sm">
+              <span class="mr-10 sm">
+                {{ dateFormat(i.startTime) }}
+              </span>
+              <span class="mr-10 sm">
+                {{ dateFormat(i.startTime + i.duration * 60 * 1000) }}
+              </span>
+            </div>
+          </td>
+        </tr>
+      </table>
     </div>
   </div>
   <el-dialog v-model="viewDetail" :destroy-on-close="true" fullscreen @closed="viewDetail = false">
@@ -117,7 +115,6 @@ limitations under the License. -->
   const selectorStore = useSelectorStore();
   const viewDetail = ref<boolean>(false);
   const service = ref<string>("");
-  // const selectedTask = ref<TaskListItem | Record<string, never>>({});
   const instanceLogs = ref<TaskLog | any>({});
 
   async function changeTask(item: TaskListItem) {
@@ -130,7 +127,7 @@ limitations under the License. -->
   }
 
   async function viewTask(e: Event, item: TaskListItem) {
-    window.event ? (window.event.cancelBubble = true) : e.stopPropagation();
+    e.stopPropagation();
     viewDetail.value = true;
     profileStore.setCurrentTask(item);
     service.value = (selectorStore.services.filter((s: any) => s.id === item.serviceId)[0] || {}).label;