fix windows icon show error

Sjj1024 · Oct 28, 2024 · 2676a76 · 2676a76
1 parent 492a721
commit 2676a76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -79,7 +79,7 @@
             }
         ],
         "security": {
-            "csp": "default-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' asset://localhost data:; img-src 'self' blob: data:; font-src 'self' asset://localhost data:; asset: https://asset.localhost"
+            "csp": "default-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' asset://localhost blob: data: https://asset.localhost; font-src 'self' asset://localhost data:;"
         },
         "bundle": {
             "active": true,

diff --git a/src/pages/edit.vue b/src/pages/edit.vue
@@ -87,7 +87,7 @@
                 </el-form-item>
                 <el-form-item :label="t('appIcon')" prop="icon">
                     <el-input
-                        :value="appForm.icon.split('assets/')[1]"
+                        :value="iconFileName"
                         readonly
                         @click="uploadIcon"
                         :placeholder="`${t('onlyPng')}`"
@@ -405,7 +405,7 @@ const saveImage = async (fileName: string, base64: string) => {
     console.log('appDataPath------', appDataPath)
     const targetDir = await join(appDataPath, 'assets')
     const savePath = await join(targetDir, fileName)
-    // 确保目标目录存在
+    // confirm target dir
     await createDir(targetDir, { recursive: true })
     // const savePath = await join(appDataPath, 'assets', fileName)
     // save file to app data dir
@@ -775,9 +775,10 @@ const getLatestRelease = async () => {
     }
 }
 
-onMounted(() => {
+onMounted(async () => {
     getLatestRelease()
     buildTime = 0
+    iconFileName.value = await basename(store.currentProject.icon)
     appWindow.setTitle(`${store.currentProject.name}`)
 })
 </script>