Merge branch 'master' of gitee.com:youlaiorg/vue3-element-admin
# Conflicts: # .env.development # pnpm-lock.yaml # src/composables/index.ts # src/utils/request.ts # types/env.d.ts # vite.config.ts
This commit is contained in:
8
types/axios.d.ts
vendored
Normal file
8
types/axios.d.ts
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
import "axios";
|
||||
|
||||
declare module "axios" {
|
||||
interface AxiosRequestConfig {
|
||||
// 匿名请求:不注入访问令牌,也不触发令牌续期
|
||||
anonymous?: boolean;
|
||||
}
|
||||
}
|
||||
16
types/components.d.ts
vendored
16
types/components.d.ts
vendored
@@ -15,6 +15,10 @@ declare module 'vue' {
|
||||
Breadcrumb: typeof import('./../src/components/Breadcrumb/index.vue')['default']
|
||||
CommandPalette: typeof import('./../src/components/CommandPalette/index.vue')['default']
|
||||
CopyButton: typeof import('./../src/components/CopyButton/index.vue')['default']
|
||||
CrudModal: typeof import('./../src/components/Crud/CrudModal.vue')['default']
|
||||
CrudSearch: typeof import('./../src/components/Crud/CrudSearch.vue')['default']
|
||||
CrudTable: typeof import('./../src/components/Crud/CrudTable.vue')['default']
|
||||
DictItemPanel: typeof import('./../src/views/system/dict/components/DictItemPanel.vue')['default']
|
||||
DictSelect: typeof import('./../src/components/DictSelect/index.vue')['default']
|
||||
DictTag: typeof import('./../src/components/DictTag/index.vue')['default']
|
||||
ECharts: typeof import('./../src/components/ECharts/index.vue')['default']
|
||||
@@ -85,7 +89,6 @@ declare module 'vue' {
|
||||
ElWatermark: typeof import('element-plus/es')['ElWatermark']
|
||||
FileUpload: typeof import('./../src/components/Upload/FileUpload.vue')['default']
|
||||
Fullscreen: typeof import('./../src/components/Fullscreen/index.vue')['default']
|
||||
GithubCorner: typeof import('./../src/components/GithubCorner/index.vue')['default']
|
||||
Hamburger: typeof import('./../src/components/Hamburger/index.vue')['default']
|
||||
IconSelect: typeof import('./../src/components/IconSelect/index.vue')['default']
|
||||
InputTag: typeof import('./../src/components/InputTag/index.vue')['default']
|
||||
@@ -98,24 +101,23 @@ declare module 'vue' {
|
||||
LayoutSidebarItem: typeof import('./../src/layouts/components/LayoutSidebarItem.vue')['default']
|
||||
LayoutTagsView: typeof import('./../src/layouts/components/LayoutTagsView.vue')['default']
|
||||
LayoutToolbar: typeof import('./../src/layouts/components/LayoutToolbar.vue')['default']
|
||||
Login: typeof import('./../src/views/login/components/Login.vue')['default']
|
||||
MultiImageUpload: typeof import('./../src/components/Upload/MultiImageUpload.vue')['default']
|
||||
NoticeDropdown: typeof import('./../src/components/NoticeDropdown/index.vue')['default']
|
||||
NoticeCenter: typeof import('./../src/components/NoticeCenter/index.vue')['default']
|
||||
NoticeDetailDialog: typeof import('./../src/components/NoticeDetailDialog/index.vue')['default']
|
||||
OperationColumn: typeof import('./../src/components/OperationColumn/index.vue')['default']
|
||||
PageContent: typeof import('./../src/components/CURD/PageContent.vue')['default']
|
||||
PageModal: typeof import('./../src/components/CURD/PageModal.vue')['default']
|
||||
PageSearch: typeof import('./../src/components/CURD/PageSearch.vue')['default']
|
||||
Pagination: typeof import('./../src/components/Pagination/index.vue')['default']
|
||||
QrCodeLogin: typeof import('./../src/views/login/components/QrCodeLogin.vue')['default']
|
||||
Register: typeof import('./../src/views/login/components/Register.vue')['default']
|
||||
ResetPwd: typeof import('./../src/views/login/components/ResetPwd.vue')['default']
|
||||
RouterLink: typeof import('vue-router')['RouterLink']
|
||||
RouterView: typeof import('vue-router')['RouterView']
|
||||
SectionTitle: typeof import('./../src/components/SectionTitle/index.vue')['default']
|
||||
SingleImageUpload: typeof import('./../src/components/Upload/SingleImageUpload.vue')['default']
|
||||
SizeSelect: typeof import('./../src/components/SizeSelect/index.vue')['default']
|
||||
TableSelect: typeof import('./../src/components/TableSelect/index.vue')['default']
|
||||
TenantSwitcher: typeof import('./../src/components/TenantSwitcher/index.vue')['default']
|
||||
TextScroll: typeof import('./../src/components/TextScroll/index.vue')['default']
|
||||
ThemeSwitch: typeof import('./../src/components/ThemeSwitch/index.vue')['default']
|
||||
ThemeSwitcher: typeof import('./../src/components/ThemeSwitcher/index.vue')['default']
|
||||
UserDeptTree: typeof import('./../src/views/system/user/components/UserDeptTree.vue')['default']
|
||||
UserImportDialog: typeof import('./../src/views/system/user/components/UserImportDialog.vue')['default']
|
||||
WangEditor: typeof import('./../src/components/WangEditor/index.vue')['default']
|
||||
|
||||
5
types/env.d.ts
vendored
5
types/env.d.ts
vendored
@@ -11,6 +11,11 @@ interface ImportMetaEnv {
|
||||
readonly VITE_APP_TENANT_ENABLED?: string;
|
||||
readonly VITE_MOCK_DEV_SERVER: boolean;
|
||||
readonly VITE_BAIDU_MAP_AK?: string;
|
||||
// 上游代码引用的环境变量
|
||||
readonly VITE_API_BASE: string;
|
||||
readonly VITE_TENANT_ENABLED?: string;
|
||||
readonly VITE_AI_ENABLED?: string;
|
||||
readonly VITE_MOCK_ENABLED?: string;
|
||||
}
|
||||
|
||||
interface ImportMeta {
|
||||
|
||||
1
types/router.d.ts
vendored
1
types/router.d.ts
vendored
@@ -9,7 +9,6 @@ declare module "vue-router" {
|
||||
type?: string;
|
||||
icon?: string;
|
||||
hidden?: boolean;
|
||||
alwaysShow?: boolean;
|
||||
affix?: boolean;
|
||||
keepAlive?: boolean;
|
||||
breadcrumb?: boolean;
|
||||
|
||||
Reference in New Issue
Block a user