From cb03111c22164365f2e5198d5162bff172492ffe Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 6 Sep 2024 20:43:31 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.js                    | 1 +
 src/components/GiCodeView/index.vue | 7 -------
 src/components/GiSvgIcon/index.vue  | 4 ++--
 src/hooks/modules/useTable.ts       | 8 ++++----
 src/stores/modules/app.ts           | 8 ++++----
 src/types/components.d.ts           | 7 -------
 6 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index 09443b9..2606913 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -47,6 +47,7 @@ export default antfu(
       'style/brace-style': [2, '1tbs', { allowSingleLine: true }], // 对块执行一致的大括号样式
       'style/comma-dangle': [2, 'never'], // 要求或不允许尾随逗号
       'ts/consistent-type-definitions': 0,
+      'ts/no-unused-expressions': 0,
       'node/prefer-global/process': 0,
       'antfu/top-level-function': 0,
       'antfu/if-newline': 0
diff --git a/src/components/GiCodeView/index.vue b/src/components/GiCodeView/index.vue
index fe7c3b9..9f9bbd1 100644
--- a/src/components/GiCodeView/index.vue
+++ b/src/components/GiCodeView/index.vue
@@ -37,11 +37,6 @@ const defaultConfig = {
 const config = defaultConfig
 
 const codeValue = computed(() => props.codeJson)
-const visible = ref(false)
-// 打开
-const open = () => {
-  visible.value = true
-}
 
 const extensions = computed(() => {
   const arr = [isDark.value ? oneDark : githubLight]
@@ -53,8 +48,6 @@ const extensions = computed(() => {
   }
   return arr
 })
-
-defineExpose({ open })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/GiSvgIcon/index.vue b/src/components/GiSvgIcon/index.vue
index 5b90a35..5afa6f3 100644
--- a/src/components/GiSvgIcon/index.vue
+++ b/src/components/GiSvgIcon/index.vue
@@ -33,9 +33,9 @@ const iconSize = computed<string | number>(() => {
   return getUnitValue(props.size)
 })
 
-const iconName = computed<string>(() => `#icon-${props.name}`)
+const iconName = computed(() => `#icon-${props.name}`)
 
-const svgClass = computed<string>(() => {
+const svgClass = computed(() => {
   if (props.name) return `svg-icon icon-${props.name}`
   return 'svg-icon'
 })
diff --git a/src/hooks/modules/useTable.ts b/src/hooks/modules/useTable.ts
index d3b48cf..df77ad1 100644
--- a/src/hooks/modules/useTable.ts
+++ b/src/hooks/modules/useTable.ts
@@ -3,8 +3,8 @@ import { Message, Modal } from '@arco-design/web-vue'
 import type { Options as paginationOptions } from './usePagination'
 import { usePagination } from '@/hooks'
 
-interface Options<T> {
-  formatResult?: (data: T[]) => any
+interface Options<T, U> {
+  formatResult?: (data: T[]) => U[]
   onSuccess?: () => void
   immediate?: boolean
   rowKey?: keyof T
@@ -14,11 +14,11 @@ interface Options<T> {
 type PaginationParams = { page: number, size: number }
 type Api<T> = (params: PaginationParams) => Promise<ApiRes<PageRes<T[]>>> | Promise<ApiRes<T[]>>
 
-export function useTable<T>(api: Api<T>, options?: Options<T>) {
+export function useTable<T extends U, U = T>(api: Api<T>, options?: Options<T, U>) {
   const { formatResult, onSuccess, immediate, rowKey } = options || {}
   const { pagination, setTotal } = usePagination(() => getTableData(), options?.paginationOption)
   const loading = ref(false)
-  const tableData = ref<T[]>([])
+  const tableData: Ref<U[]> = ref([])
 
   async function getTableData() {
     try {
diff --git a/src/stores/modules/app.ts b/src/stores/modules/app.ts
index 7b9827f..9f58678 100644
--- a/src/stores/modules/app.ts
+++ b/src/stores/modules/app.ts
@@ -13,8 +13,8 @@ const storeSetup = () => {
   // 深色菜单主题色变量
   const themeCSSVar = computed<Record<string, string>>(() => {
     const obj: Record<string, string> = {}
-    const list = generate(settingConfig.themeColor, { list: true, dark: true })
-    list.forEach((color: string, index: number) => {
+    const list = generate(settingConfig.themeColor, { list: true, dark: true }) as string[]
+    list.forEach((color, index) => {
       obj[`--primary-${index + 1}`] = getRgbStr(color)
     })
     return obj
@@ -24,8 +24,8 @@ const storeSetup = () => {
   const setThemeColor = (color: string) => {
     if (!color) return
     settingConfig.themeColor = color
-    const list = generate(settingConfig.themeColor, { list: true, dark: settingConfig.theme === 'dark' })
-    list.forEach((color: string, index: number) => {
+    const list = generate(settingConfig.themeColor, { list: true, dark: settingConfig.theme === 'dark' }) as string[]
+    list.forEach((color, index) => {
       const rgbStr = getRgbStr(color)
       document.body.style.setProperty(`--primary-${index + 1}`, rgbStr)
     })
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 65a6b72..ce302d0 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -8,13 +8,6 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
-    CrontabDay: typeof import('./../components/CornTab/CrontabDay.vue')['default']
-    CrontabField: typeof import('./../components/CornTab/CrontabField.vue')['default']
-    CrontabGenerator: typeof import('./../components/CornTab/CrontabGenerator.vue')['default']
-    CrontabModel: typeof import('./../components/CornTab/CrontabModel.vue')['default']
-    CrontabMonth: typeof import('./../components/CornTab/CrontabMonth.vue')['default']
-    CrontabWeek: typeof import('./../components/CornTab/CrontabWeek.vue')['default']
-    CrontabYear: typeof import('./../components/CornTab/CrontabYear.vue')['default']
     DateRangePicker: typeof import('./../components/DateRangePicker/index.vue')['default']
     GiCellAvatar: typeof import('./../components/GiCell/GiCellAvatar.vue')['default']
     GiCellGender: typeof import('./../components/GiCell/GiCellGender.vue')['default']