From dbf9e42cf35642684686fc910b5f3121db5d95f1 Mon Sep 17 00:00:00 2001
From: Sun <95302870@qq.com>
Date: Mon, 15 Jan 2024 15:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E4=BC=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.json                            | 2 +-
 src/locales/zh-CN.json                            | 2 +-
 src/utils/request/apiMessage.ts                   | 2 +-
 src/utils/request/index.ts                        | 2 +-
 src/views/home/components/EditItem/IconEditor.vue | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 6877a02..5937b63 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -29,7 +29,7 @@
     "1201": "Please keep at least one",
     "1202": "Data record not found",
     "1300": "Upload failed",
-    "1301": "Unsupported file format",
+    "1301": "Upload failed, unsupported file format",
     "1400": "Parameter format error"
   },
   "appLauncher": {
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
index f101652..298baac 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -29,7 +29,7 @@
     "1201": "请至少保留一个",
     "1202": "未找到数据记录",
     "1300": "上传失败",
-    "1301": "不被支持的文件格式",
+    "1301": "上传失败，不被支持的文件格式",
     "1400": "参数格式错误"
   },
   "appLauncher": {
diff --git a/src/utils/request/apiMessage.ts b/src/utils/request/apiMessage.ts
index 543c00c..174f5bf 100644
--- a/src/utils/request/apiMessage.ts
+++ b/src/utils/request/apiMessage.ts
@@ -9,7 +9,7 @@ const themeRef = ref<'light' | 'dark'>('light')
 const configProviderPropsRef = computed<ConfigProviderProps>(() => ({
   theme: themeRef.value === 'light' ? lightTheme : darkTheme,
 }))
-const { message } = createDiscreteApi(['message'], { configProviderProps: configProviderPropsRef })
+export const { message } = createDiscreteApi(['message'], { configProviderProps: configProviderPropsRef })
 
 export function apiRespErrMsg(res: Response): boolean {
   const appStore = useAppStore()
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 989fc17..cf5cf99 100644
--- a/src/utils/request/index.ts
+++ b/src/utils/request/index.ts
@@ -1,6 +1,6 @@
 import type { AxiosProgressEvent, AxiosResponse, GenericAbortSignal } from 'axios'
 import request from './axios'
-import { apiRespErrMsg } from './apiMessage'
+import { apiRespErrMsg, message } from './apiMessage'
 import { t } from '@/locales'
 import { useAppStore, useAuthStore } from '@/store'
 import { router } from '@/router'
diff --git a/src/views/home/components/EditItem/IconEditor.vue b/src/views/home/components/EditItem/IconEditor.vue
index be24f8a..738f59f 100644
--- a/src/views/home/components/EditItem/IconEditor.vue
+++ b/src/views/home/components/EditItem/IconEditor.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { NButton, NColorPicker, NInput, NRadio, NUpload, useMessage } from 'naive-ui'
+import { NButton, NColorPicker, NInput, NRadio, NUpload } from 'naive-ui'
 import type { UploadFileInfo } from 'naive-ui'
 import { computed, defineProps } from 'vue'
 import { ItemIcon } from '@/components/common'
 import { useAuthStore } from '@/store'
-import { t } from '@/locales'
+import { apiRespErrMsg } from '@/utils/request/apiMessage'
 
 const props = defineProps<{
   itemIcon: Panel.ItemIcon | null
@@ -13,7 +13,6 @@ const emit = defineEmits<{
   (e: 'update:itemIcon', visible: Panel.ItemIcon): void // 定义修改父组件（prop内）的值的事件
 }>()
 const authStore = useAuthStore()
-const ms = useMessage()
 
 // 默认图标背景色
 const defautSwatchesBackground = [
@@ -75,7 +74,8 @@ const handleUploadFinish = ({
     emit('update:itemIcon', itemIconInfo.value || null)
   }
   else {
-    ms.error(`${t('common.uploadFail')}:${res.msg}`)
+    apiRespErrMsg(res)
+    // ms.error(`${t('common.uploadFail')}:${res.msg}`)
   }
 
   return file