2.4.8 bug fix

xiaobaidadada · Feb 4, 2025 · 5801c56 · 5801c56
1 parent f867a0e
commit 5801c56
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filecat",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "filecat 文件管理器",
   "author": "xiaobaidadada",
   "scripts": {
@@ -145,7 +145,7 @@
     "socket.io-parser": "^4.2.4",
     "sshpk": "^1.18.0",
     "style-loader": "^3.3.4",
-    "systeminformation": "^5.22.11",
+    "systeminformation": "^5.25.11",
     "tar": "^7.4.3",
     "tldts": "^6.1.20",
     "ts-node": "^10.9.2",

diff --git a/src/common/ValueUtil.js b/src/common/ValueUtil.js
@@ -69,3 +69,10 @@ export function formatter_time(date){
     return formatter.format(date);
 }
 
+export function  max_pages(total, pageSize) {
+    if (total <= 0 || pageSize <= 0) {
+        return 0;
+    }
+    return Math.ceil(total / pageSize);
+}
+
diff --git a/src/main/domain/ddns/ddns.service.ts b/src/main/domain/ddns/ddns.service.ts
@@ -1,4 +1,3 @@
-import si from "systeminformation";
 import {Ali, DdnsConnection, DdnsIPPojo, DdnsType, DnsPod, getIpType, Tengxun} from "../../../common/req/ddns.pojo";
 import {HttpRequest} from "../../../common/http";
 import {Fail, Sucess} from "../../other/Result";

diff --git a/src/web/project/component/file/component/workflow/WorkFlow.tsx b/src/web/project/component/file/component/workflow/WorkFlow.tsx
@@ -23,6 +23,7 @@ import TreeView from "../../../../../meta/component/TreeView";
 import {tree_list} from "../../../../../../common/req/common.pojo";
 import {Shell} from "../../../shell/Shell";
 import {Terminal} from "@xterm/xterm";
+import { max_pages } from "../../../../../../common/ValueUtil";
 
 let terminal_init_resolve;
 let terminal_value;
@@ -65,7 +66,7 @@ export function WorkFlow(props) {
             v.index = value.index;
             return v}))
         set_total(pojo.total);
-        set_max_page_num(parseInt(((pojo.total / page_size)+1).toFixed(0)))
+        set_max_page_num(max_pages(pojo.total,page_size))
     }
 
     const search_run_name = async (search_name)=>{
@@ -82,7 +83,7 @@ export function WorkFlow(props) {
             v.index = value.index;
             return v}))
         set_total(pojo.total);
-        set_max_page_num(parseInt(((pojo.total / page_size)+1).toFixed(0)))
+        set_max_page_num(max_pages(pojo.total,page_size))
         set_page_num(0)
         set_search_name_status(false);
     }