diff --git a/package.json b/package.json
index e1044d8..1395590 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,8 @@
"@unocss/preset-attributify": "^0.58.0",
"@unocss/preset-icons": "^0.58.0",
"@unocss/preset-uno": "^0.58.0",
- "@vue/compiler-sfc": "3.3.9",
+ "@vue/compiler-sfc": "3.3.11",
+ "@vue/runtime-core": "3.3.11",
"@vitejs/plugin-vue": "4.5.2",
"autoprefixer": "10.4.14",
"eslint": "8.55.0",
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 89b1f4c..3082beb 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -126,7 +126,7 @@ const toggleDark = () => useToggle(isDark);
const topNavChange = (val: any) => {
if (!val) {
appStore.toggleSideBarHide(false);
- permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
+ permissionStore.setSidebarRouters(permissionStore.defaultRoutes as any);
}
};
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index a905c70..f42473a 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -13,7 +13,7 @@
:collapse-transition="false"
mode="vertical"
>
-
+
@@ -29,7 +29,7 @@ import useSettingsStore from '@/store/modules/settings';
import usePermissionStore from '@/store/modules/permission';
import { RouteRecordRaw } from 'vue-router';
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
const appStore = useAppStore();
diff --git a/src/layout/components/TopBar/search.vue b/src/layout/components/TopBar/search.vue
index 62322a4..440b88d 100644
--- a/src/layout/components/TopBar/search.vue
+++ b/src/layout/components/TopBar/search.vue
@@ -54,7 +54,7 @@ const state = reactive({
const openSearch = () => {
state.menuQuery = '';
state.isShowSearch = true;
- state.menuList = generateRoutes(routes.value);
+ state.menuList = generateRoutes(routes.value as any);
nextTick(() => {
setTimeout(() => {
layoutMenuAutocompleteRef.value.focus();
diff --git a/src/permission.ts b/src/permission.ts
index 69795f8..ef9976a 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -40,8 +40,6 @@ router.beforeEach(async (to, from, next) => {
router.addRoute(route); // 动态添加可访问路由表
}
});
- const n = { ...to, replace: true };
- console.log(n);
next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
}
} else {
diff --git a/src/types/axios.d.ts b/src/types/axios.d.ts
index 2451f2a..9f2c6d2 100644
--- a/src/types/axios.d.ts
+++ b/src/types/axios.d.ts
@@ -1,5 +1,4 @@
-import axios from 'axios';
-
+export {};
declare module 'axios' {
interface AxiosResponse {
code: number;
diff --git a/src/types/element.d.ts b/src/types/element.d.ts
index 6a7bdef..2087773 100644
--- a/src/types/element.d.ts
+++ b/src/types/element.d.ts
@@ -5,30 +5,32 @@ declare global {
declare type ElTableInstance = ep.TableInstance;
declare type ElUploadInstance = ep.UploadInstance;
declare type ElScrollbarInstance = ep.ScrollbarInstance;
+ declare type ElInputInstance = ep.InputInstance;
+ declare type ElInputNumberInstance = ep.InputNumberInstance;
+ declare type ElRadioInstance = ep.RadioInstance;
+ declare type ElRadioGroupInstance = ep.RadioGroupInstance;
+ declare type ElRadioButtonInstance = ep.RadioButtonInstance;
+ declare type ElCheckboxInstance = ep.CheckboxInstance;
+ declare type ElSwitchInstance = ep.SwitchInstance;
+ declare type ElCascaderInstance = ep.CascaderInstance;
+ declare type ElColorPickerInstance = ep.ColorPickerInstance;
+ declare type ElRateInstance = ep.RateInstance;
+ declare type ElSliderInstance = ep.SliderInstance;
+
declare type ElTreeInstance = InstanceType;
declare type ElTreeSelectInstance = InstanceType;
declare type ElSelectInstance = InstanceType;
declare type ElCardInstance = InstanceType;
declare type ElDialogInstance = InstanceType;
- declare type ElInputInstance = InstanceType;
- declare type ElInputNumberInstance = InstanceType;
- declare type ElRadioInstance = InstanceType;
- declare type ElRadioGroupInstance = InstanceType;
- declare type ElRadioButtonInstance = InstanceType;
- declare type ElCheckboxInstance = InstanceType;
declare type ElCheckboxGroupInstance = InstanceType;
- declare type ElSwitchInstance = InstanceType;
declare type ElDatePickerInstance = InstanceType;
declare type ElTimePickerInstance = InstanceType;
declare type ElTimeSelectInstance = InstanceType;
- declare type ElCascaderInstance = InstanceType;
- declare type ElColorPickerInstance = InstanceType;
- declare type ElRateInstance = InstanceType;
- declare type ElSliderInstance = InstanceType;
declare type TransferKey = ep.TransferKey;
declare type CheckboxValueType = ep.CheckboxValueType;
declare type ElFormRules = ep.FormRules;
declare type DateModelType = ep.DateModelType;
- declare type UploadFile = typeof ep.UploadFile;
+ declare type UploadFile = ep.UploadFile;
+
}
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 10cc438..17476a3 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,5 +1,4 @@
-import type { ComponentInternalInstance as ComponentInstance } from 'vue/runtime-core';
-import type { PropType as VuePropType } from 'vue';
+import type { PropType as VuePropType, ComponentInternalInstance as ComponentInstance } from 'vue';
import { LanguageEnum } from '@/enums/LanguageEnum';
declare global {
diff --git a/src/types/module.d.ts b/src/types/module.d.ts
index 16b1116..bc2f16b 100644
--- a/src/types/module.d.ts
+++ b/src/types/module.d.ts
@@ -5,10 +5,12 @@ import auth from '@/plugins/auth';
import cache from '@/plugins/cache';
import animate from '@/animate';
import { useDict } from '@/utils/dict';
-import handleTree, { addDateRange, selectDictLabel, selectDictLabels, parseTime } from '@/utils/ruoyi';
+import { handleTree, addDateRange, selectDictLabel, selectDictLabels, parseTime } from '@/utils/ruoyi';
import { getConfigKey, updateConfigByKey } from '@/api/system/config';
import { download as rd } from '@/utils/request';
+export {};
+
declare module '@vue/runtime-core' {
interface ComponentCustomProperties {
// 全局方法声明
diff --git a/src/views/monitor/cache/index.vue b/src/views/monitor/cache/index.vue
index c58f89c..81bbf2d 100644
--- a/src/views/monitor/cache/index.vue
+++ b/src/views/monitor/cache/index.vue
@@ -126,8 +126,9 @@