fix(version): 🐛 修复升级tauri版本导致的高度问题 (#125)

This commit is contained in:
Dawn
2024-12-25 23:17:02 +08:00
committed by GitHub
parent 7b762e26a0
commit adf47e7acc
6 changed files with 90 additions and 61 deletions
+2 -2
View File
@@ -53,13 +53,13 @@
"@tauri-apps/api": "2.1.1",
"@tauri-apps/plugin-autostart": "2.2.0",
"@tauri-apps/plugin-clipboard-manager": "2.2.0",
"@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-fs": "~2",
"@tauri-apps/plugin-http": "2.0.1",
"@tauri-apps/plugin-os": "2.0.0",
"@tauri-apps/plugin-process": "2.2.0",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-sql": "^2.0.1",
"@tauri-apps/plugin-updater": "^2.3.0",
"@tauri-apps/plugin-updater": "~2",
"colorthief": "^2.6.0",
"dayjs": "^1.11.11",
"dompurify": "^3.2.3",
+2 -2
View File
@@ -24,7 +24,7 @@ importers:
specifier: 2.2.0
version: 2.2.0
'@tauri-apps/plugin-fs':
specifier: ^2.2.0
specifier: ~2
version: 2.2.0
'@tauri-apps/plugin-http':
specifier: 2.0.1
@@ -42,7 +42,7 @@ importers:
specifier: ^2.0.1
version: 2.2.0
'@tauri-apps/plugin-updater':
specifier: ^2.3.0
specifier: ~2
version: 2.3.0
colorthief:
specifier: ^2.6.0
+76 -47
View File
@@ -1461,6 +1461,15 @@ dependencies = [
"miniz_oxide",
]
[[package]]
name = "fluent-uri"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
dependencies = [
"bitflags 1.3.2",
]
[[package]]
name = "flume"
version = "0.11.0"
@@ -2457,18 +2466,41 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "json-patch"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
dependencies = [
"jsonptr 0.4.7",
"serde",
"serde_json",
"thiserror 1.0.63",
]
[[package]]
name = "json-patch"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
dependencies = [
"jsonptr",
"jsonptr 0.6.3",
"serde",
"serde_json",
"thiserror 1.0.63",
]
[[package]]
name = "jsonptr"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627"
dependencies = [
"fluent-uri",
"serde",
"serde_json",
]
[[package]]
name = "jsonptr"
version = "0.6.3"
@@ -4932,9 +4964,9 @@ dependencies = [
[[package]]
name = "tao"
version = "0.30.8"
version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da"
checksum = "a0dbbebe82d02044dfa481adca1550d6dd7bd16e086bc34fa0fbecceb5a63751"
dependencies = [
"bitflags 2.6.0",
"cocoa",
@@ -4999,9 +5031,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tauri"
version = "2.1.1"
version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c"
checksum = "d3889b392db6d32a105d3757230ea0220090b8f94c90d3e60b6c5eb91178ab1b"
dependencies = [
"anyhow",
"bytes",
@@ -5037,7 +5069,7 @@ dependencies = [
"tauri-runtime",
"tauri-runtime-wry",
"tauri-utils",
"thiserror 2.0.7",
"thiserror 1.0.63",
"tokio",
"tray-icon",
"url",
@@ -5050,16 +5082,16 @@ dependencies = [
[[package]]
name = "tauri-build"
version = "2.0.3"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01"
checksum = "9f96827ccfb1aa40d55d0ded79562d18ba18566657a553f992a982d755148376"
dependencies = [
"anyhow",
"cargo_toml",
"dirs 5.0.1",
"glob",
"heck 0.5.0",
"json-patch",
"json-patch 3.0.1",
"schemars",
"semver",
"serde",
@@ -5072,14 +5104,14 @@ dependencies = [
[[package]]
name = "tauri-codegen"
version = "2.0.3"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf"
checksum = "8947f16f47becd9e9cd39b74ee337fd1981574d78819be18e4384d85e5a0b82f"
dependencies = [
"base64 0.22.1",
"brotli",
"ico",
"json-patch",
"json-patch 2.0.0",
"plist",
"png",
"proc-macro2",
@@ -5090,7 +5122,7 @@ dependencies = [
"sha2",
"syn 2.0.90",
"tauri-utils",
"thiserror 2.0.7",
"thiserror 1.0.63",
"time",
"url",
"uuid",
@@ -5099,9 +5131,9 @@ dependencies = [
[[package]]
name = "tauri-macros"
version = "2.0.3"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03"
checksum = "8bd1c8d4a66799d3438747c3a79705cd665a95d6f24cb5f315413ff7a981fe2a"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -5215,9 +5247,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-http"
version = "2.2.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e62a9bde54d6a0218b63f5a248f02056ad4316ba6ad81dfb9e4f73715df5deb1"
checksum = "784333f1632d96c94346e8145bfe52970923a38a0e6eacd3dccaa12289275acf"
dependencies = [
"data-url",
"http",
@@ -5229,7 +5261,7 @@ dependencies = [
"tauri",
"tauri-plugin",
"tauri-plugin-fs",
"thiserror 2.0.7",
"thiserror 1.0.63",
"tokio",
"url",
"urlpattern",
@@ -5237,9 +5269,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-os"
version = "2.2.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dda2d571a9baf0664c1f2088db227e3072f9028602fafa885deade7547c3b738"
checksum = "fbc5f23a86f37687c7f4fecfdc706b279087bc44f7a46702f7307ff1551ee03a"
dependencies = [
"gethostname 0.5.0",
"log",
@@ -5250,7 +5282,7 @@ dependencies = [
"sys-locale",
"tauri",
"tauri-plugin",
"thiserror 2.0.7",
"thiserror 1.0.63",
]
[[package]]
@@ -5265,9 +5297,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-shell"
version = "2.2.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2c50a63e60fb8925956cc5b7569f4b750ac197a4d39f13b8dd46ea8e2bad79"
checksum = "371fb9aca2823990a2d0db7970573be5fdf07881fcaa2b835b29631feb84aec1"
dependencies = [
"encoding_rs",
"log",
@@ -5280,7 +5312,7 @@ dependencies = [
"shared_child",
"tauri",
"tauri-plugin",
"thiserror 2.0.7",
"thiserror 1.0.63",
"tokio",
]
@@ -5301,9 +5333,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-sql"
version = "2.2.0"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6ccca89ded6bd2ff49fdad9a5b34bcd624aa223fdfddbab83c85706ee3a4948"
checksum = "eb7022ccbcd1799dcf7acb97805f1a5fc7f046b4cf67518296a2e8921bab613a"
dependencies = [
"futures-core",
"indexmap 2.4.0",
@@ -5313,7 +5345,7 @@ dependencies = [
"sqlx",
"tauri",
"tauri-plugin",
"thiserror 2.0.7",
"thiserror 1.0.63",
"time",
"tokio",
]
@@ -5350,9 +5382,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-upload"
version = "2.2.1"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e90ac6d3a783d4406caeae8c75aa05e96346474765517fddfd1dc313ff91aa89"
checksum = "116754130d3f95cf73552a0723376186a8f21607ac5ff350980af87a0eccba73"
dependencies = [
"futures-util",
"log",
@@ -5362,16 +5394,16 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
"thiserror 2.0.7",
"thiserror 1.0.63",
"tokio",
"tokio-util",
]
[[package]]
name = "tauri-plugin-websocket"
version = "2.2.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14055b796521e0facf6582256dea9322453595917851082610c557293862c966"
checksum = "d2793b69e1dd494beed1e0a29865f38bd00011e7ccc35a3cfde8e3939328b790"
dependencies = [
"futures-util",
"http",
@@ -5381,16 +5413,16 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
"thiserror 2.0.7",
"thiserror 1.0.63",
"tokio",
"tokio-tungstenite",
]
[[package]]
name = "tauri-runtime"
version = "2.2.0"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958"
checksum = "a1ef7363e7229ac8d04e8a5d405670dbd43dde8fc4bc3bc56105c35452d03784"
dependencies = [
"dpi",
"gtk",
@@ -5400,16 +5432,16 @@ dependencies = [
"serde",
"serde_json",
"tauri-utils",
"thiserror 2.0.7",
"thiserror 1.0.63",
"url",
"windows 0.58.0",
]
[[package]]
name = "tauri-runtime-wry"
version = "2.2.0"
version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2"
checksum = "62fa2068e8498ad007b54d5773d03d57c3ff6dd96f8c8ce58beff44d0d5e0d30"
dependencies = [
"gtk",
"http",
@@ -5433,9 +5465,9 @@ dependencies = [
[[package]]
name = "tauri-utils"
version = "2.1.0"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9271a88f99b4adea0dc71d0baca4505475a0bbd139fb135f62958721aaa8fe54"
checksum = "1fc65d6f5c54e56b66258948a6d9e47a82ea41f4b5a7612bfbdd1634c2913ed0"
dependencies = [
"brotli",
"cargo_metadata",
@@ -5443,9 +5475,8 @@ dependencies = [
"dunce",
"glob",
"html5ever",
"http",
"infer",
"json-patch",
"json-patch 2.0.0",
"kuchikiki",
"log",
"memchr",
@@ -5460,7 +5491,7 @@ dependencies = [
"serde_json",
"serde_with",
"swift-rs",
"thiserror 2.0.7",
"thiserror 1.0.63",
"toml 0.8.2",
"url",
"urlpattern",
@@ -6753,13 +6784,12 @@ dependencies = [
[[package]]
name = "wry"
version = "0.47.2"
version = "0.46.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61ce51277d65170f6379d8cda935c80e3c2d1f0ff712a123c8bddb11b31a4b73"
checksum = "cd5cdf57c66813d97601181349c63b96994b3074fc3d7a31a8cce96e968e3bbd"
dependencies = [
"base64 0.22.1",
"block2",
"cookie",
"crossbeam-channel",
"dpi",
"dunce",
@@ -6784,7 +6814,6 @@ dependencies = [
"soup3",
"tao-macros",
"thiserror 1.0.63",
"url",
"webkit2gtk",
"webkit2gtk-sys",
"webview2-com",
+8 -8
View File
@@ -17,24 +17,24 @@ strip = true # 删除调试符号
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies]
tauri-build = { version = "2.0.3", features = [] }
tauri-build = { version = "2.0.2", features = [] }
[dependencies]
tauri = { version = "2.1.1", features = [ "macos-private-api", "tray-icon", "image-png"] }
tauri-plugin-os = "2.2.0"
tauri-plugin-shell = "2.2.0"
tauri = { version = "2.0.6", features = [ "macos-private-api", "tray-icon", "image-png"] }
tauri-plugin-os = "2.0.1"
tauri-plugin-shell = "2.0.1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri-plugin-websocket = "2.2.0"
tauri-plugin-http = {version="2.2.0",features= ["unsafe-headers"] }
tauri-plugin-websocket = "2.0.1"
tauri-plugin-http = {version="2.0.1",features= ["unsafe-headers"] }
tauri-plugin-process = "2.2.0"
tauri-plugin-fs = "2.0.1"
tauri-plugin-dialog = "2.2.0"
tauri-plugin-upload = "2.2.1"
tauri-plugin-upload = "2.0.1"
tauri-plugin-global-shortcut = "2.2.0"
tauri-plugin-clipboard-manager = "2.2.0"
tauri-plugin-updater = "2.3.0"
tauri-plugin-sql = { version = "2.2.0", features = ["sqlite"] }
tauri-plugin-sql = { version = "2", features = ["sqlite"] }
tauri-plugin-single-instance = "2.2.0"
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-autostart = "2.2.0"
+1 -1
View File
@@ -84,7 +84,7 @@
}
},
"permissions": {
"description": "List of permissions attached to this capability.\n\nMust include the plugin name as prefix in the form of `${plugin-name}:${permission-name}`. For commands directly implemented in the application itself only `${permission-name}` is required.\n\n## Example\n\n```json [ \"core:default\", \"shell:allow-open\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] } ] ```",
"description": "List of permissions attached to this capability.\n\nMust include the plugin name as prefix in the form of `${plugin-name}:${permission-name}`. For commands directly implemented in the application itself only `${permission-name}` is required.\n\n## Example\n\n```json [ \"core:default\", \"shell:allow-open\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] } ```",
"type": "array",
"items": {
"$ref": "#/definitions/PermissionEntry"
+1 -1
View File
@@ -56,7 +56,7 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
id: _,
position: _,
rect: _} => {
tray.app_handle().emit_("notify", "notify_leave", ()).unwrap();
tray.app_handle().emit_to("notify", "notify_leave", ()).unwrap();
}
_ => {}