fix: add route base close #404

vbenjs · Mar 23, 2021 · 8ad127c · 8ad127c
1 parent 8fb0396
commit 8ad127c
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 51 deletions.
diff --git a/build/tsconfig.json b/build/tsconfig.json
diff --git a/build/typeing.d.ts b/build/typeing.d.ts
diff --git a/build/utils.ts b/build/utils.ts
@@ -17,21 +17,6 @@ export function isReportMode(): boolean {
   return process.env.REPORT === 'true';
 }
 
-export interface ViteEnv {
-  VITE_PORT: number;
-  VITE_USE_MOCK: boolean;
-  VITE_USE_PWA: boolean;
-  VITE_PUBLIC_PATH: string;
-  VITE_PROXY: [string, string][];
-  VITE_GLOB_APP_TITLE: string;
-  VITE_GLOB_APP_SHORT_NAME: string;
-  VITE_USE_CDN: boolean;
-  VITE_DROP_CONSOLE: boolean;
-  VITE_BUILD_COMPRESS: 'gzip' | 'brotli' | 'none';
-  VITE_LEGACY: boolean;
-  VITE_USE_IMAGEMIN: boolean;
-}
-
 // Read all environment variable configuration files to process.env
 export function wrapperEnv(envConf: Recordable): ViteEnv {
   const ret: any = {};

diff --git a/build/vite/plugin/html.ts b/build/vite/plugin/html.ts
@@ -3,7 +3,6 @@
  * https://github.com/anncwb/vite-plugin-html
  */
 import type { Plugin } from 'vite';
-import type { ViteEnv } from '../../utils';
 
 import html from 'vite-plugin-html';
 

diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts
@@ -1,5 +1,4 @@
 import type { Plugin } from 'vite';
-import type { ViteEnv } from '../../utils';
 
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';

diff --git a/build/vite/plugin/pwa.ts b/build/vite/plugin/pwa.ts
@@ -2,7 +2,6 @@
  * Zero-config PWA for Vite
  * https://github.com/antfu/vite-plugin-pwa
  */
-import type { ViteEnv } from '../../utils';
 
 import { VitePWA } from 'vite-plugin-pwa';
 

diff --git a/mock/_util.ts b/mock/_util.ts
@@ -1,6 +1,6 @@
 // Interface data format used to return a unified format
 
-export function resultSuccess<T = any>(result: T, { message = 'ok' } = {}) {
+export function resultSuccess<T = Recordable>(result: T, { message = 'ok' } = {}) {
   return {
     code: 0,
     result,

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -9,7 +9,7 @@ const WHITE_NAME_LIST = [LoginRoute.name, REDIRECT_NAME];
 
 // app router
 const router = createRouter({
-  history: createWebHashHistory(),
+  history: createWebHashHistory(import.meta.env.VITE_PUBLIC_PATH),
   routes: (basicRoutes as unknown) as RouteRecordRaw[],
   strict: true,
   scrollBehavior: () => ({ left: 0, top: 0 }),

diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
@@ -20,7 +20,7 @@ const setting: ProjectConfig = {
   settingButtonPosition: SettingButtonPositionEnum.AUTO,
 
   // Permission mode
-  permissionMode: PermissionModeEnum.BACK,
+  permissionMode: PermissionModeEnum.ROLE,
 
   // Permission-related cache is stored in sessionStorage or localStorage
   permissionCacheType: CacheTypeEnum.LOCAL,

diff --git a/tsconfig.json b/tsconfig.json
@@ -34,6 +34,8 @@
     "src/**/*.vue",
     "types/**/*.d.ts",
     "types/**/*.ts",
+    "build/**/*.ts",
+    "build/**/*.d.ts",
     "mock/**/*.ts"
   ],
   "exclude": ["node_modules", "dist", "**/*.js"]

diff --git a/types/event.d.ts b/types/event.d.ts
diff --git a/types/global.d.ts b/types/global.d.ts
@@ -61,3 +61,28 @@ declare type ComponentRef<T extends HTMLElement = HTMLDivElement> = ComponentElR
 declare type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T>;
 
 type IsSame<A, B> = A | B extends A & B ? true : false;
+
+declare interface ChangeEvent extends Event {
+  target: HTMLInputElement;
+}
+
+declare interface WheelEvent {
+  path?: EventTarget[];
+}
+
+type ImportMetaEnv = ViteEnv;
+
+declare interface ViteEnv {
+  VITE_PORT: number;
+  VITE_USE_MOCK: boolean;
+  VITE_USE_PWA: boolean;
+  VITE_PUBLIC_PATH: string;
+  VITE_PROXY: [string, string][];
+  VITE_GLOB_APP_TITLE: string;
+  VITE_GLOB_APP_SHORT_NAME: string;
+  VITE_USE_CDN: boolean;
+  VITE_DROP_CONSOLE: boolean;
+  VITE_BUILD_COMPRESS: 'gzip' | 'brotli' | 'none';
+  VITE_LEGACY: boolean;
+  VITE_USE_IMAGEMIN: boolean;
+}