fix: 修复同步数据源耗时展示错误问题 (#1970)

TencentBlueKing · Nov 7, 2024 · 5b04542 · 5b04542
1 parent 9329537
commit 5b04542
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 32 deletions.
diff --git a/src/pages/src/components/SyncRecords.vue b/src/pages/src/components/SyncRecords.vue
@@ -173,25 +173,16 @@ const getSyncRecordsList = async () => {
   }
 };
 
-const durationText = (value) => {
+const durationText = (value: string) => {
   if (value) {
-    value = value.slice(6);
-    if (value < 60) {
+    const [hour, min, sec] = value.split(':').map(Number);
+    const roundedSec = Math.round(sec);
+    if (min < 1) {
       return `<1 ${t('分钟')}`;
+    } if (hour < 1) {
+      return `${min} ${t('分钟')}${roundedSec > 0 ? ` ${roundedSec} ${t('秒')}` : ''}`;
     }
-    if (60 <= value && value < 3600) {
-      const time = value / 60;
-      const min = time.toString().split('.')[0];
-      const sec = parseInt(time.toString().split('.')[1][0], 10) * 6;
-      return `${min} ${t('分钟')} ${sec} ${t('秒')}`;
-    }
-    if (3600 <= value) {
-      const time = value / 3600;
-      const hour = time.toString().split('.')[0];
-      const min = parseInt(time.toString().split('.')[1][0], 10) * 6;
-      return `${hour}小时${min}分钟`;
-    }
-    return value;
+    return `${hour}小时${min}分钟`;
   }
 };
 

diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue
@@ -482,25 +482,16 @@ const handleRowExpand = async ({ row }) => {
   }
 };
 
-const durationText = (value) => {
+const durationText = (value: string) => {
   if (value) {
-    value = value.slice(6);
-    if (value < 60) {
+    const [hour, min, sec] = value.split(':').map(Number);
+    const roundedSec = Math.round(sec);
+    if (min < 1) {
       return `<1 ${t('分钟')}`;
+    } if (hour < 1) {
+      return `${min} ${t('分钟')}${roundedSec > 0 ? ` ${roundedSec} ${t('秒')}` : ''}`;
     }
-    if (60 <= value && value < 3600) {
-      const time = value / 60;
-      const min = time.toString().split('.')[0];
-      const sec = parseInt(time.toString().split('.')[1][0], 10) * 6;
-      return `${min} ${t('分钟')} ${sec} ${t('秒')}`;
-    }
-    if (3600 <= value) {
-      const time = value / 3600;
-      const hour = time.toString().split('.')[0];
-      const min = parseInt(time.toString().split('.')[1][0], 10) * 6;
-      return `${hour}小时${min}分钟`;
-    }
-    return value;
+    return `${hour}小时${min}分钟`;
   }
 };
 </script>