From 5cc410c7b454e45c2a65e8b257a2ab31e4d009c2 Mon Sep 17 00:00:00 2001
From: chansee97 <chen.dev@foxmail.com>
Date: Thu, 25 Jul 2024 22:32:52 +0800
Subject: [PATCH] fix: type error & local icon error

---
 .github/FUNDING.yml                 |  1 -
 src/components/common/NovaIcon.vue  | 14 +++++---------
 src/layouts/mixMenu.layout.vue      |  4 ++--
 src/views/demo/icons/index.vue      |  3 +++
 src/views/list/commonList/index.vue |  4 ++--
 src/views/setting/account/index.vue |  2 +-
 tsconfig.json                       |  1 +
 7 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 9fdd938..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-custom: ['https://cdn.jsdelivr.net/gh/chansee97/static/sponsor-wechat.png', 'https://cdn.jsdelivr.net/gh/chansee97/static/sponsor-alipay.png']
diff --git a/src/components/common/NovaIcon.vue b/src/components/common/NovaIcon.vue
index 74e6147..2cc7f41 100644
--- a/src/components/common/NovaIcon.vue
+++ b/src/components/common/NovaIcon.vue
@@ -3,7 +3,7 @@ import { Icon } from '@iconify/vue'
 
 interface iconPorps {
   /* 图标名称 */
-  icon?: string
+  icon: string
   /* 图标颜色 */
   color?: string
   /* 图标大小 */
@@ -13,11 +13,10 @@ interface iconPorps {
 }
 const props = withDefaults(defineProps<iconPorps>(), {
   size: 18,
-  isLocal: false,
 })
 
 const isLocal = computed(() => {
-  return props.icon && props.icon.startsWith('local:')
+  return props.icon.startsWith('local:')
 })
 
 function getLocalIcon(icon: string) {
@@ -28,25 +27,22 @@ function getLocalIcon(icon: string) {
     eager: true,
   })
 
-  const domparser = new DOMParser()
-  return domparser.parseFromString(svg[`/src/assets/svg-icons/${svgName}.svg`], 'image/svg+xml')
+  return svg[`/src/assets/svg-icons/${svgName}.svg`]
 }
 </script>
 
 <template>
   <n-icon
-    v-if="icon && !isLocal"
+    v-if="icon"
     :size="size"
     :depth="depth"
     :color="color"
   >
     <template v-if="isLocal">
-      {{ getLocalIcon(icon) }}
+      <i v-html="getLocalIcon(icon)" />
     </template>
     <template v-else>
       <Icon :icon="icon" />
     </template>
   </n-icon>
 </template>
-
-<style scoped></style>
diff --git a/src/layouts/mixMenu.layout.vue b/src/layouts/mixMenu.layout.vue
index bf5e816..d781a4c 100644
--- a/src/layouts/mixMenu.layout.vue
+++ b/src/layouts/mixMenu.layout.vue
@@ -52,8 +52,8 @@ onMounted(() => {
 
 const sideMenu = ref<MenuOption[]>([])
 function handleSideMenu(key: string) {
-  // @ts-expect-error no error at here
-  const targetMenu = routeStore.menus.find(i => i.key === key)
+  const routeMenu = routeStore.menus as MenuOption[]
+  const targetMenu = routeMenu.find(i => i.key === key)
   if (targetMenu) {
     sideMenu.value = targetMenu.children ? targetMenu.children : [targetMenu]
   }
diff --git a/src/views/demo/icons/index.vue b/src/views/demo/icons/index.vue
index ae72c9d..3e1265b 100644
--- a/src/views/demo/icons/index.vue
+++ b/src/views/demo/icons/index.vue
@@ -24,6 +24,9 @@
       <div>
         大大大：<svg-icons-cool class="text-4em" />
       </div>
+      <div>
+        nova-icon组件加载：<nova-icon icon="local:cool" />
+      </div>
     </n-card>
   </n-space>
 </template>
diff --git a/src/views/list/commonList/index.vue b/src/views/list/commonList/index.vue
index e15457a..e506cfc 100644
--- a/src/views/list/commonList/index.vue
+++ b/src/views/list/commonList/index.vue
@@ -81,8 +81,8 @@ const columns: DataTableColumns<Entity.DemoList> = [
       return (
         <NSwitch
           value={row.disabled}
-          onUpdateValue={disabled =>
-            handleUpdateDisabled(disabled, row.id)}
+          onUpdateValue={(value: boolean) =>
+            handleUpdateDisabled(value, row.id)}
         >
           {{ checked: () => '启用', unchecked: () => '禁用' }}
         </NSwitch>
diff --git a/src/views/setting/account/index.vue b/src/views/setting/account/index.vue
index 516dae2..5f5486c 100644
--- a/src/views/setting/account/index.vue
+++ b/src/views/setting/account/index.vue
@@ -74,7 +74,7 @@ const columns: DataTableColumns<Entity.User> = [
           value={row.status}
           checked-value={1}
           unchecked-value={0}
-          onUpdateValue={value =>
+          onUpdateValue={(value: 0 | 1) =>
             handleUpdateDisabled(value, row.id!)}
         >
           {{ checked: () => '启用', unchecked: () => '禁用' }}
diff --git a/tsconfig.json b/tsconfig.json
index 9725c26..31dc278 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "ESNext",
     "jsx": "preserve",
+    "jsxImportSource": "vue",
     "lib": ["ESNext", "DOM"],
     "baseUrl": ".",
     "module": "ESNext",