update cloud gui

flomesh-io · Aug 31, 2024 · 3071aef · 3071aef
1 parent 713c21d
commit 3071aef
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 26 deletions.
diff --git a/gui/apps/ztm/cloud/views/Files.vue b/gui/apps/ztm/cloud/views/Files.vue
@@ -464,7 +464,7 @@ onMounted(()=>{
 					 					<Button :disabled="!selectedFile?.path" @click="doDownload(selectedFile)" class="w-full" icon="pi pi-cloud-download" label="Download" severity="secondary"  />
 					 				</div>
 					 				<div  class="flex-item px-2" v-if="selectedFile?.state != 'missing'">
-					 					<Button :disabled="!selectedFile?.path" @click="openFile(`${config.localDir}${selectedFile?.path}`)" class="w-full" icon="pi pi-external-link" label="Select" severity="secondary"  />
+					 					<Button :disabled="!selectedFile?.path" @click="openFile(`${config.localDir}${selectedFile?.path}`)" class="w-full" icon="pi pi-external-link" label="Open" severity="secondary"  />
 					 				</div>
 									
 					 			</div>

diff --git a/gui/package.json b/gui/package.json
@@ -39,14 +39,14 @@
     "download-ztm-android": "mkdir -p download && cd download && curl -o pipy.tar.gz https://pipy-oss-1255617643.cos.ap-beijing.myqcloud.com/repo/ztm/arm64-v8a/library/libztm.tar.gz && tar -xzf pipy.tar.gz && cp -f ./usr/local/lib/libztm.so ../src-android/app/src/main/assets/libztm.so && cp -f ./usr/local/lib/libc++_shared.so ../src-android/app/src/main/assets/libc++_shared.so"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.0.0-rc.0",
-    "@tauri-apps/plugin-clipboard-manager": "2.0.0-rc.0",
-    "@tauri-apps/plugin-fs": "2.0.0-rc.0",
-    "@tauri-apps/plugin-http": "2.0.0-rc.0",
-    "@tauri-apps/plugin-os": "2.0.0-rc.0",
-    "@tauri-apps/plugin-process": "2.0.0-rc.0",
-    "@tauri-apps/plugin-shell": "2.0.0-rc.0",
-    "@tauri-apps/plugin-dialog": "2.0.0-rc.0",
+    "@tauri-apps/api": "2.0.0-rc.4",
+    "@tauri-apps/plugin-clipboard-manager": "2.0.0-rc.1",
+    "@tauri-apps/plugin-fs": "2.0.0-rc.2",
+    "@tauri-apps/plugin-http": "2.0.0-rc.2",
+    "@tauri-apps/plugin-os": "2.0.0-rc.1",
+    "@tauri-apps/plugin-process": "2.0.0-rc.1",
+    "@tauri-apps/plugin-shell": "2.0.0-rc.1",
+    "@tauri-apps/plugin-dialog": "2.0.0-rc.1",
     "@vee-validate/rules": "4.12.7",
     "axios": "^0.28.0",
     "chart.js": "3.3.2",
@@ -69,7 +69,7 @@
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.1.4",
-    "@tauri-apps/cli": "2.0.0-rc.1",
+    "@tauri-apps/cli": "2.0.0-rc.8",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vue/eslint-config-prettier": "^7.0.0",
     "eslint": "^8.22.0",

diff --git a/gui/src-tauri/Cargo.toml b/gui/src-tauri/Cargo.toml
@@ -12,22 +12,22 @@ name = "ztm_lib"
 crate-type = ["lib", "cdylib", "staticlib"]
 
 [build-dependencies]
-tauri-build = { version = "=2.0.0-rc.0", features = [] }
+tauri-build = { version = "=2.0.0-rc.7", features = [] }
 
 # tauri = { version = "=2.0.0-rc.0", features = ["devtools"] }
 [dependencies]
 fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }
-tauri = { version = "=2.0.0-rc.0", features = ["macos-proxy", "unstable"] }
-tauri-utils = "=2.0.0-rc.0"
-tauri-runtime = "=2.0.0-rc.0"
-tauri-plugin-shell = "=2.0.0-rc.0"
-tauri-plugin-process = "=2.0.0-rc.0"
-tauri-plugin-http = "=2.0.0-rc.0"
-tauri-plugin-os = "=2.0.0-rc.0"
-tauri-plugin-fs = "=2.0.0-rc.0"
-tauri-plugin-dialog = "=2.0.0-rc.0"
-tauri-plugin-deep-link = "=2.0.0-rc.0"
-tauri-plugin-clipboard-manager = "=2.0.0-rc.0"
+tauri = { version = "=2.0.0-rc.8", features = ["macos-proxy", "unstable"] }
+tauri-utils = "=2.0.0-rc.7"
+tauri-runtime = "=2.0.0-rc.7"
+tauri-plugin-shell = "=2.0.0-rc.3"
+tauri-plugin-process = "=2.0.0-rc.1"
+tauri-plugin-http = "=2.0.0-rc.1"
+tauri-plugin-os = "=2.0.0-rc.1"
+tauri-plugin-fs = "=2.0.0-rc.1"
+tauri-plugin-dialog = "=2.0.0-rc.3"
+tauri-plugin-deep-link = "=2.0.0-rc.2"
+tauri-plugin-clipboard-manager = "=2.0.0-rc.3"
 lazy_static = "1.4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -40,7 +40,7 @@ wry = "0.41.0"
 # log = "0.4.22"
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-tauri-plugin-cli = "=2.0.0-rc.0"
+tauri-plugin-cli = "=2.0.0-rc.1"
 
 [target.'cfg(any(target_os = "android"))']
 linker = "~/Library/Android/sdk/ndk/27.0.11718014/toolchains/llvm/prebuilt/darwin-x86_64/bin"
diff --git a/gui/src-tauri/capabilities/main.json b/gui/src-tauri/capabilities/main.json
@@ -6,7 +6,7 @@
     "*"
   ],
 	"remote": {
-		"urls": ["http://*","https://*","ipc://*","socks5://*","*://*"]
+		"urls": ["http://127.0.0.1:*/","http://*","https://*","ipc://*","socks5://*","*://*"]
 	},
   "permissions": [
 		"clipboard-manager:allow-write-text",

diff --git a/gui/src-tauri/capabilities/windows.json b/gui/src-tauri/capabilities/windows.json
@@ -5,6 +5,9 @@
   "windows": [
     "*"
   ],
+	"remote": {
+		"urls": ["http://127.0.0.1:*/","http://*","https://*","ipc://*","socks5://*","*://*"]
+	},
   "permissions": [
 		"clipboard-manager:allow-write-text",
     "core:path:default",

diff --git a/gui/src/service/AppService.js b/gui/src/service/AppService.js
@@ -191,8 +191,7 @@ export default class AppService {
 	getAppUrl({
 		mesh, provider, app
 	}) {
-		// return getUrl(`/api/meshes/${mesh}/apps/${provider}/${app}`);
-		return `/api/meshes/${mesh}/apps/${provider}/${app}`;
+		return getUrl(`/api/meshes/${mesh}/apps/${provider}/${app}`);
 	}
 	getApp({
 		mesh, ep, provider, app