移除 timespan 模块；修复 0 秒的 bug；

KUD2 · Mar 15, 2020 · 820b74a · 820b74a
1 parent 139288d
commit 820b74a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,8 +8,7 @@
     "react": "^16.13.0",
     "react-dom": "^16.13.0",
     "react-scripts": "^3.4.0",
-    "react-tooltip": "^4.1.2",
-    "timespan": "^2.3.0"
+    "react-tooltip": "^4.1.2"
   },
   "scripts": {
     "start": "react-app-rewired start",

diff --git a/src/utils/helper.js b/src/utils/helper.js
@@ -1,10 +1,18 @@
-import TimeSpan from 'timespan';
-
 export const formatDuration = (seconds) => {
-  let time = TimeSpan.fromSeconds(seconds);
-  let text = `${time.seconds} 秒`;
-  if (time.minutes) text = `${time.minutes} 分 ${text}`;
-  if (time.hours) text = `${Math.floor(time.totalHours())} 小时 ${text}`;
+  let s = parseInt(seconds);
+  let m = 0;
+  let h = 0;
+  if (s >= 60) {
+    m = parseInt(s / 60);
+    s = parseInt(s % 60);
+    if (m >= 60) {
+      h = parseInt(m / 60);
+      m = parseInt(m % 60);
+    }
+  }
+  let text = `${s} 秒`;
+  if (m > 0) text = `${m} 分 ${text}`;
+  if (h > 0) text = `${h} 小时 ${text}`;
   return text;
 }