Merge branch 'master' into bzkf30

components.d.ts

@@ -7,37 +7,40 @@ declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     AppLink: typeof import('./src/components/AppLink/index.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
+<<<<<<< HEAD
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElLink: typeof import('element-plus/es')['ElLink']
+=======
+    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElLink: typeof import('element-plus/es')['ElLink']
+>>>>>>> zhuf
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-    ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
+<<<<<<< HEAD
+=======
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+>>>>>>> zhuf
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+<<<<<<< HEAD
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
+=======
+>>>>>>> zhuf
     FileLink: typeof import('./src/components/FileLink/index.vue')['default']
     FileUpload: typeof import('./src/components/FileUpload/index.vue')['default']
     ImportButton: typeof import('./src/components/ImportButton/index.vue')['default']
     ItemTable: typeof import('./src/components/ItemTable/index.vue')['default']
-    Loading: typeof import('element-plus/es')['ElLoadingDirective']
     PreviewAttach: typeof import('./src/components/PreviewAttach/index.vue')['default']
     RemoteCascader: typeof import('./src/components/RemoteCascader/index.vue')['default']
     RemoteCascaderClass: typeof import('./src/components/RemoteCascaderClass/index.vue')['default']

src/router/index.ts

@@ -6,9 +6,15 @@ import { app_ready, app_routes } from '~/store/app';
 // import localRoutes from './routes/xdjy';
 // import localRoutes from './routes/xdhq';
 
-const localRoutes = (await import(`./routes/${import.meta.env.MODE}.ts`))['default'] as RouteRecordDetailRaw[]
-console.log('localRoutes :>> ', localRoutes);
+// !auto switch routes way 1:
+// !build error
+// const localRoutes = (await import(`./routes/${import.meta.env.MODE}.ts`))['default'] as RouteRecordDetailRaw[]
+
+const currentRouteModule = import.meta.glob(`./routes/*.ts`, { eager: true })[`./routes/${import.meta.env.MODE}.ts`] as { title: string, default: RouteRecordDetailRaw[] }
+document.title = currentRouteModule['title']
+const localRoutes = currentRouteModule['default']
 
+console.log('localRoutes :>> ', localRoutes);
 
 const router = createRouter({
   history: createWebHashHistory(),

src/router/routes/xdhq.ts

@@ -1,5 +1,5 @@
 import { RouteRecordDetailRaw } from '../routes.d';
-document.title = "校端后勤管理系统"
+export const title = "校端后勤管理系统"
 
 export default <RouteRecordDetailRaw[]>[
   {

src/router/routes/xdjx.ts

@@ -1,7 +1,7 @@
 // import { RouteRecordRaw } from 'vue-router';
 import { RouteRecordDetailRaw } from '../routes.d';
 
-document.title = "校端教务学业管理应用"
+export const title = "校端教务学业管理应用"
 
 export default <RouteRecordDetailRaw[]>[
   {

src/router/routes/xdjy.ts

@@ -1,5 +1,5 @@
 import { RouteRecordDetailRaw } from '../routes.d';
-document.title = "校端教研管理系统"
+export const title = "校端教研管理系统"
 
 export default <RouteRecordDetailRaw[]>[
   {