From a84414b4df945bcb5cacd91bacf71b470631633b Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Tue, 29 Oct 2024 16:59:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E6=B1=A0=E5=AE=B9=E9=87=8F?=
 =?UTF-8?q?bug&=E5=AF=8C=E6=96=87=E6=9C=AC=E5=B7=A5=E5=85=B7=E6=9D=A1?=
 =?UTF-8?q?=E9=81=AE=E7=9B=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pure/ms-rich-text/MsRichText.vue          |  6 ++
 .../components/capacityDrawer.vue             | 71 ++++++++++++++++---
 2 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/pure/ms-rich-text/MsRichText.vue b/frontend/src/components/pure/ms-rich-text/MsRichText.vue
index 5ad77324fa..3b5302383e 100644
--- a/frontend/src/components/pure/ms-rich-text/MsRichText.vue
+++ b/frontend/src/components/pure/ms-rich-text/MsRichText.vue
@@ -633,6 +633,12 @@
   }
   :deep(.editor-content) {
     .ms-scroll-bar();
+    & + div[data-tippy-root] {
+      transform: translate(60%) !important;
+    }
+  }
+  [data-tippy-root] {
+    inset: auto !important;
   }
   :deep(.tableWrapper) {
     .ms-scroll-bar();
diff --git a/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue b/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue
index d494a1c6ac..cca429aa66 100644
--- a/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue
+++ b/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue
@@ -80,6 +80,7 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
+  import dayjs from 'dayjs';
 
   import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
@@ -199,6 +200,50 @@
         options: statusList.value,
         filterSlotName: FilterSlotNameEnum.API_TEST_CASE_API_REPORT_STATUS,
       },
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showDrag: true,
+    },
+    {
+      title: 'ms.taskCenter.queue',
+      dataIndex: 'lineNum',
+      width: 100,
+      showDrag: true,
+    },
+    {
+      title: 'ms.taskCenter.threadID',
+      dataIndex: 'threadId',
+      showTooltip: true,
+      width: 190,
+      showDrag: true,
+    },
+    {
+      title: 'ms.taskCenter.startExecuteTime',
+      dataIndex: 'startTime',
+      width: 170,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showDrag: true,
+    },
+    {
+      title: 'ms.taskCenter.endExecuteTime',
+      dataIndex: 'endTime',
+      width: 170,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      showDrag: true,
+    },
+    {
+      title: 'ms.taskCenter.operationUser',
+      dataIndex: 'userName',
+      width: 100,
+      showTooltip: true,
       showDrag: true,
     },
     {
@@ -212,14 +257,24 @@
     },
   ];
 
-  const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getCapacityTaskList, {
-    tableKey: TableKeyEnum.SYSTEM_RESOURCE_POOL_CAPACITY,
-    scroll: { x: '100%' },
-    selectable: false,
-    showSetting: true,
-    heightUsed: 310,
-    showSelectAll: false,
-  });
+  const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(
+    getCapacityTaskList,
+    {
+      tableKey: TableKeyEnum.SYSTEM_RESOURCE_POOL_CAPACITY,
+      scroll: { x: '100%' },
+      selectable: false,
+      showSetting: true,
+      heightUsed: 310,
+      showSelectAll: false,
+    },
+    (item) => {
+      return {
+        ...item,
+        startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD HH:mm:ss') : '-',
+        endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD HH:mm:ss') : '-',
+      };
+    }
+  );
 
   const selectedNode = ref<string>('');
   const nodeList = computed<NodesListItem[]>(() => props.activeRecord?.testResourceDTO.nodesList ?? []);