diff --git a/ElectronJS/main.js b/ElectronJS/main.js
index f089802..e1b64a5 100644
--- a/ElectronJS/main.js
+++ b/ElectronJS/main.js
@@ -432,7 +432,7 @@ function handleOpenBrowser(event, lang = "en", user_data_folder = "", mobile = f
runBrowser(lang, user_data_folder, mobile);
let size = screen.getPrimaryDisplay().workAreaSize;
let width = parseInt(size.width);
- let height = parseInt(size.height * 0.7);
+ let height = parseInt(size.height * 0.65);
flowchart_window = new BrowserWindow({
x: 0,
y: 0,
diff --git a/ElectronJS/package-lock.json b/ElectronJS/package-lock.json
index 1b113ad..754d445 100644
--- a/ElectronJS/package-lock.json
+++ b/ElectronJS/package-lock.json
@@ -23,7 +23,7 @@
"@electron-forge/maker-rpm": "^6.0.5",
"@electron-forge/maker-squirrel": "^6.0.5",
"@electron-forge/maker-zip": "^6.0.5",
- "electron": "^20.0.1"
+ "electron": "^25.0.1"
}
},
"node_modules/@electron-forge/cli": {
@@ -980,9 +980,10 @@
"optional": true
},
"node_modules/@types/node": {
- "version": "16.18.38",
- "dev": true,
- "license": "MIT"
+ "version": "18.16.19",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.19.tgz",
+ "integrity": "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==",
+ "dev": true
},
"node_modules/@types/responselike": {
"version": "1.0.0",
@@ -1579,16 +1580,6 @@
"typedarray": "^0.0.6"
}
},
- "node_modules/config-chain": {
- "version": "1.1.13",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "ini": "^1.3.4",
- "proto-list": "~1.2.1"
- }
- },
"node_modules/console-control-strings": {
"version": "1.1.0",
"dev": true,
@@ -1799,31 +1790,27 @@
"minimatch": "^3.0.4"
}
},
- "node_modules/duplexer3": {
- "version": "0.1.5",
- "dev": true,
- "license": "BSD-3-Clause"
- },
"node_modules/eastasianwidth": {
"version": "0.2.0",
"dev": true,
"license": "MIT"
},
"node_modules/electron": {
- "version": "20.3.12",
+ "version": "25.2.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-25.2.0.tgz",
+ "integrity": "sha512-I/rhcW2sV2fyiveVSBr2N7v5ZiCtdGY0UiNCDZgk2fpSC+irQjbeh7JT2b4vWmJ2ogOXBjqesrN9XszTIG6DHg==",
"dev": true,
"hasInstallScript": true,
- "license": "MIT",
"dependencies": {
- "@electron/get": "^1.14.1",
- "@types/node": "^16.11.26",
+ "@electron/get": "^2.0.0",
+ "@types/node": "^18.11.18",
"extract-zip": "^2.0.1"
},
"bin": {
"electron": "cli.js"
},
"engines": {
- "node": ">= 10.17.0"
+ "node": ">= 12.20.55"
}
},
"node_modules/electron-installer-common": {
@@ -1991,215 +1978,11 @@
"node": ">= 4.0.0"
}
},
- "node_modules/electron/node_modules/@electron/get": {
- "version": "1.14.1",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "debug": "^4.1.1",
- "env-paths": "^2.2.0",
- "fs-extra": "^8.1.0",
- "got": "^9.6.0",
- "progress": "^2.0.3",
- "semver": "^6.2.0",
- "sumchecker": "^3.0.1"
- },
- "engines": {
- "node": ">=8.6"
- },
- "optionalDependencies": {
- "global-agent": "^3.0.0",
- "global-tunnel-ng": "^2.7.1"
- }
- },
- "node_modules/electron/node_modules/@sindresorhus/is": {
- "version": "0.14.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/electron/node_modules/@szmarczak/http-timer": {
- "version": "1.1.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "defer-to-connect": "^1.0.1"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/electron/node_modules/cacheable-request": {
- "version": "6.1.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "clone-response": "^1.0.2",
- "get-stream": "^5.1.0",
- "http-cache-semantics": "^4.0.0",
- "keyv": "^3.0.0",
- "lowercase-keys": "^2.0.0",
- "normalize-url": "^4.1.0",
- "responselike": "^1.0.2"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/electron/node_modules/decompress-response": {
- "version": "3.3.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "mimic-response": "^1.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/electron/node_modules/defer-to-connect": {
- "version": "1.1.3",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/electron/node_modules/fs-extra": {
- "version": "8.1.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^4.0.0",
- "universalify": "^0.1.0"
- },
- "engines": {
- "node": ">=6 <7 || >=8"
- }
- },
- "node_modules/electron/node_modules/got": {
- "version": "9.6.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@sindresorhus/is": "^0.14.0",
- "@szmarczak/http-timer": "^1.1.2",
- "cacheable-request": "^6.0.0",
- "decompress-response": "^3.3.0",
- "duplexer3": "^0.1.4",
- "get-stream": "^4.1.0",
- "lowercase-keys": "^1.0.1",
- "mimic-response": "^1.0.1",
- "p-cancelable": "^1.0.0",
- "to-readable-stream": "^1.0.0",
- "url-parse-lax": "^3.0.0"
- },
- "engines": {
- "node": ">=8.6"
- }
- },
- "node_modules/electron/node_modules/got/node_modules/get-stream": {
- "version": "4.1.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pump": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/electron/node_modules/got/node_modules/lowercase-keys": {
- "version": "1.0.1",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/electron/node_modules/json-buffer": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/electron/node_modules/jsonfile": {
- "version": "4.0.0",
- "dev": true,
- "license": "MIT",
- "optionalDependencies": {
- "graceful-fs": "^4.1.6"
- }
- },
- "node_modules/electron/node_modules/keyv": {
- "version": "3.1.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "json-buffer": "3.0.0"
- }
- },
- "node_modules/electron/node_modules/normalize-url": {
- "version": "4.5.1",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/electron/node_modules/p-cancelable": {
- "version": "1.1.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/electron/node_modules/responselike": {
- "version": "1.0.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "lowercase-keys": "^1.0.0"
- }
- },
- "node_modules/electron/node_modules/responselike/node_modules/lowercase-keys": {
- "version": "1.0.1",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/electron/node_modules/semver": {
- "version": "6.3.0",
- "dev": true,
- "license": "ISC",
- "bin": {
- "semver": "bin/semver.js"
- }
- },
- "node_modules/electron/node_modules/universalify": {
- "version": "0.1.2",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 4.0.0"
- }
- },
"node_modules/emoji-regex": {
"version": "8.0.0",
"dev": true,
"license": "MIT"
},
- "node_modules/encodeurl": {
- "version": "1.0.2",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/encoding": {
"version": "0.1.13",
"dev": true,
@@ -2803,21 +2586,6 @@
"which": "bin/which"
}
},
- "node_modules/global-tunnel-ng": {
- "version": "2.7.1",
- "dev": true,
- "license": "BSD-3-Clause",
- "optional": true,
- "dependencies": {
- "encodeurl": "^1.0.2",
- "lodash": "^4.17.10",
- "npm-conf": "^1.1.3",
- "tunnel": "^0.0.6"
- },
- "engines": {
- "node": ">=0.10"
- }
- },
"node_modules/globalthis": {
"version": "1.0.3",
"dev": true,
@@ -3891,28 +3659,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/npm-conf": {
- "version": "1.1.3",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "config-chain": "^1.1.11",
- "pify": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/npm-conf/node_modules/pify": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/npm-run-path": {
"version": "2.0.2",
"dev": true,
@@ -4288,14 +4034,6 @@
"node": ">=6"
}
},
- "node_modules/prepend-http": {
- "version": "2.0.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/process-nextick-args": {
"version": "2.0.1",
"license": "MIT"
@@ -4320,12 +4058,6 @@
"node": ">=10"
}
},
- "node_modules/proto-list": {
- "version": "1.2.4",
- "dev": true,
- "license": "ISC",
- "optional": true
- },
"node_modules/pump": {
"version": "3.0.0",
"dev": true,
@@ -5050,14 +4782,6 @@
"tmp": "^0.2.0"
}
},
- "node_modules/to-readable-stream": {
- "version": "1.0.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/to-regex-range": {
"version": "5.0.1",
"dev": true,
@@ -5098,15 +4822,6 @@
"dev": true,
"license": "0BSD"
},
- "node_modules/tunnel": {
- "version": "0.0.6",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "engines": {
- "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
- }
- },
"node_modules/type-fest": {
"version": "0.21.3",
"dev": true,
@@ -5163,17 +4878,6 @@
"node": ">= 10.0.0"
}
},
- "node_modules/url-parse-lax": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "prepend-http": "^2.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/username": {
"version": "5.1.0",
"dev": true,
diff --git a/ElectronJS/package.json b/ElectronJS/package.json
index ae15742..3ada183 100644
--- a/ElectronJS/package.json
+++ b/ElectronJS/package.json
@@ -27,7 +27,7 @@
"@electron-forge/maker-rpm": "^6.0.5",
"@electron-forge/maker-squirrel": "^6.0.5",
"@electron-forge/maker-zip": "^6.0.5",
- "electron": "^20.0.1"
+ "electron": "^25.0.1"
},
"repository": "https://github.com/NaiboWang/EasySpider",
"dependencies": {
@@ -76,4 +76,4 @@
"publishers": []
}
}
-}
\ No newline at end of file
+}
diff --git a/ElectronJS/src/taskGrid/FlowChart.html b/ElectronJS/src/taskGrid/FlowChart.html
index ffbef61..a63300f 100644
--- a/ElectronJS/src/taskGrid/FlowChart.html
+++ b/ElectronJS/src/taskGrid/FlowChart.html
@@ -502,7 +502,7 @@
-
+