From 91e2a0553244a8ce9578b3c2322dc01bc115486d Mon Sep 17 00:00:00 2001 From: pdsuwwz Date: Tue, 27 Jun 2023 15:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=EF=B8=8F=20feat:=20update=20auto?= =?UTF-8?q?=20import=20types?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc-auto-import.json | 6 +++++- auto-imports.d.ts | 2 +- src/components/Navigation/Avatar.vue | 2 +- src/hooks/useTheme.ts | 2 +- src/plugins/DiscreteModal/index.ts | 1 - src/widgets/WorkMenu/config.ts | 2 -- vite.config.ts | 4 ++++ 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index f5a419d..7e63264 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -311,6 +311,10 @@ "whenever": true, "DataTableColumns": true, "useWorkPlatform": true, - "FormInst": true + "FormInst": true, + "GlobalThemeOverrides": true, + "DropdownOption": true, + "ConfigProviderProps": true, + "MenuOption": true } } diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 8484703..959d415 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -304,7 +304,7 @@ declare global { // @ts-ignore export type { RouteRecordRaw, RouteLocationRaw, LocationQuery, NavigationFailure, RouteParams, RouteLocationNormalizedLoaded, RouteRecordName, NavigationGuard } from 'vue-router' // @ts-ignore - export type { DataTableColumns, FormInst } from 'naive-ui' + export type { GlobalThemeOverrides, ConfigProviderProps, DataTableColumns, DropdownOption, MenuOption, FormInst } from 'naive-ui' } // for vue template auto import import { UnwrapRef } from 'vue' diff --git a/src/components/Navigation/Avatar.vue b/src/components/Navigation/Avatar.vue index 17cf5aa..71fe973 100644 --- a/src/components/Navigation/Avatar.vue +++ b/src/components/Navigation/Avatar.vue @@ -21,7 +21,7 @@ import Cookie from 'js-cookie' import { SignOut20Regular } from '@vicons/fluent' import { UserAvatar } from '@vicons/carbon' -import { DropdownOption, NIcon } from 'naive-ui' +import { NIcon } from 'naive-ui' export default defineComponent({ name: 'NavigationAvatar', diff --git a/src/hooks/useTheme.ts b/src/hooks/useTheme.ts index 0fdeb1a..b322616 100644 --- a/src/hooks/useTheme.ts +++ b/src/hooks/useTheme.ts @@ -1,4 +1,4 @@ -import { GlobalThemeOverrides, lightTheme } from 'naive-ui' +import { lightTheme } from 'naive-ui' import { computed, watch } from 'vue' import { darkTheme, useOsTheme } from 'naive-ui' import { useAppStore } from '@/store/hooks/useAppStore' diff --git a/src/plugins/DiscreteModal/index.ts b/src/plugins/DiscreteModal/index.ts index 769c7aa..ca5bed9 100644 --- a/src/plugins/DiscreteModal/index.ts +++ b/src/plugins/DiscreteModal/index.ts @@ -1,6 +1,5 @@ import { createDiscreteApi, - ConfigProviderProps, darkTheme, lightTheme } from 'naive-ui' diff --git a/src/widgets/WorkMenu/config.ts b/src/widgets/WorkMenu/config.ts index a6c9158..237926b 100644 --- a/src/widgets/WorkMenu/config.ts +++ b/src/widgets/WorkMenu/config.ts @@ -1,7 +1,5 @@ import { NIcon } from 'naive-ui' -import type { MenuOption } from 'naive-ui' - import { TeamOutlined as IconTeamOutlined, MenuOutlined as IconMenuOutlined diff --git a/vite.config.ts b/vite.config.ts index 36997df..15c2334 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -94,7 +94,11 @@ export default defineConfig(({ mode }) => { { from: 'naive-ui', imports: [ + 'GlobalThemeOverrides', + 'ConfigProviderProps', 'DataTableColumns', + 'DropdownOption', + 'MenuOption', 'FormInst' ], type: true