From 21e9e0fa2739f04b108438b1a165b2897436eb7c Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Mon, 31 Mar 2025 18:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4=E6=AD=8C?=
 =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/data/VTsuruTypes.ts                       |  2 +-
 src/views/view/SongListView.vue               |  2 +-
 .../indexTemplate/DefaultIndexTemplate.vue    | 29 ++++++++-----------
 .../TraditionalSongListTemplate.vue           |  4 +--
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/data/VTsuruTypes.ts b/src/data/VTsuruTypes.ts
index 6400ade..0d26a58 100644
--- a/src/data/VTsuruTypes.ts
+++ b/src/data/VTsuruTypes.ts
@@ -195,7 +195,7 @@ export type ExtractConfigData<
  * @param items 一个只读的配置项定义数组。
  * @returns 类型被保留的同一个只读数组。
  */
-export function defineItems<
+export function defineTemplateConfig<
   const Items extends readonly ConfigItemDefinition[] // 使用 'const' 泛型进行推断
 >(items: Items): Items {
   // 如果需要，可以在此处添加基本的运行时验证。
diff --git a/src/views/view/SongListView.vue b/src/views/view/SongListView.vue
index 6d2b447..23f0ab4 100644
--- a/src/views/view/SongListView.vue
+++ b/src/views/view/SongListView.vue
@@ -78,7 +78,7 @@ import { computed, onMounted, ref, watch } from 'vue';
     if (componentType.value) {
       return SongListTemplateMap[componentType.value];
     }
-    return undefined;
+    return SongListTemplateMap[''];
   });
   const currentConfig = ref();
   watch(
diff --git a/src/views/view/indexTemplate/DefaultIndexTemplate.vue b/src/views/view/indexTemplate/DefaultIndexTemplate.vue
index 9683125..dd972a1 100644
--- a/src/views/view/indexTemplate/DefaultIndexTemplate.vue
+++ b/src/views/view/indexTemplate/DefaultIndexTemplate.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
-import { isDarkMode } from '@/Utils'
-import { useAccount } from '@/api/account'
-import { ResponseUserIndexModel, UserInfo } from '@/api/api-models'
-import { QueryGetAPI } from '@/api/query'
-import SimpleVideoCard from '@/components/SimpleVideoCard.vue'
-import { TemplateConfig } from '@/data/VTsuruTypes'
-import { USER_INDEX_API_URL } from '@/data/constants'
-import { NAlert, NAvatar, NButton, NCard, NDivider, NFlex, NSpace, NText, useMessage } from 'naive-ui'
-import { ref } from 'vue'
+import { isDarkMode } from '@/Utils';
+import { useAccount } from '@/api/account';
+import { ResponseUserIndexModel, UserInfo } from '@/api/api-models';
+import { QueryGetAPI } from '@/api/query';
+import SimpleVideoCard from '@/components/SimpleVideoCard.vue';
+import { defineTemplateConfig, ExtractConfigData } from '@/data/VTsuruTypes';
+import { USER_INDEX_API_URL } from '@/data/constants';
+import { NAvatar, NButton, NCard, NDivider, NFlex, NSpace, NText, useMessage } from 'naive-ui';
+import { ref } from 'vue';
 
 defineExpose({ Config, DefaultConfig })
 const width = window.innerWidth
@@ -46,13 +46,9 @@ function navigate(url: string) {
 </script>
 
 <script lang="ts">
-export type ConfigType = {
-  test: string
-}
+export type ConfigType = ExtractConfigData<typeof Config>
 export const DefaultConfig = {} as ConfigType
-export const Config: TemplateConfig<ConfigType> = {
-  name: 'Template.Index.Simple',
-  items: [
+export const Config = defineTemplateConfig([
     {
       name: '封面',
       type: 'image',
@@ -64,8 +60,7 @@ export const Config: TemplateConfig<ConfigType> = {
       type: 'string',
       key: 'test',
     },
-  ],
-}
+  ])
 </script>
 
 <template>
diff --git a/src/views/view/songListTemplate/TraditionalSongListTemplate.vue b/src/views/view/songListTemplate/TraditionalSongListTemplate.vue
index ae58316..56ed98a 100644
--- a/src/views/view/songListTemplate/TraditionalSongListTemplate.vue
+++ b/src/views/view/songListTemplate/TraditionalSongListTemplate.vue
@@ -2,7 +2,7 @@
   import { computed, h, ref, watch } from 'vue'; // Import computed and watch
   import { getUserAvatarUrl, isDarkMode } from '@/Utils';
   import { SongListConfigTypeWithConfig } from '@/data/TemplateTypes';
-  import { defineItems, ExtractConfigData } from '@/data/VTsuruTypes';
+  import { defineTemplateConfig, ExtractConfigData } from '@/data/VTsuruTypes';
   import { FILE_BASE_URL } from '@/data/constants';
   import { NButton, NFlex, NIcon, NInput, NInputGroup, NInputGroupLabel, NTag, NTooltip, NSelect } from 'naive-ui'; // Import NSelect
   import bilibili from '@/svgs/bilibili.svg';
@@ -216,7 +216,7 @@
 
   export type TraditionalConfigType = ExtractConfigData<typeof Config>;
   export const DefaultConfig = {} as TraditionalConfigType;
-  export const Config = defineItems([
+  export const Config = defineTemplateConfig([
     {
       name: '背景',
       type: 'image',