diff --git a/web-vue3/index.html b/web-vue3/index.html index ae722329e..fa4ccc825 100644 --- a/web-vue3/index.html +++ b/web-vue3/index.html @@ -26,20 +26,126 @@ - + - - - - Jpom项目管理系统 + + + + <%- title %> + -
+ + +
+
+
+ +
+
<%- title %>
+
+
+
diff --git a/web-vue3/package.json b/web-vue3/package.json index 871d9d0d0..b6029b3e0 100644 --- a/web-vue3/package.json +++ b/web-vue3/package.json @@ -1,7 +1,7 @@ { - "name": "web-vue3", + "name": "jpom-vue3", "private": true, - "version": "0.0.0", + "version": "2.10.39", "type": "module", "scripts": { "dev": "vite --mode dev", @@ -42,6 +42,7 @@ "eslint": "^8.36.0", "https": "^1.0.0", "typescript": "^5.0.2", - "vite": "^4.1.0" + "vite": "^4.1.0", + "vite-plugin-html": "^3.2.0" } } diff --git a/web-vue3/src/api/config.ts b/web-vue3/src/api/config.ts index 05da0d1ca..7375e454e 100644 --- a/web-vue3/src/api/config.ts +++ b/web-vue3/src/api/config.ts @@ -10,6 +10,8 @@ import { useMenuStore } from '@/stores/menu' const _window = window as any const delTimeout = 20 * 1000 const apiTimeout = _window.apiTimeout === '' ? delTimeout : _window.apiTimeout +// debug routerBase +const routerBase = _window.routerBase === '' ? '' : _window.routerBase const pro = process.env.NODE_ENV === 'production' @@ -30,15 +32,13 @@ instance.interceptors.request.use((config: InternalAxiosRequestConfig) => { const userStore = useUserStore() const { headers } = config - const accessToken = localStorage.getItem('accessToken') - headers['Authorization'] = accessToken ? 'Bearer ' + accessToken : '' headers[TOKEN_HEADER_KEY] = userStore.token headers[CACHE_WORKSPACE_ID] = appStore.getWorkspaceId - // if (_window.routerBase) { - // // 防止 url 出现 // - // config.url = (_window.routerBase + config.url).replace(new RegExp('//', 'gm'), '/') - // } + if (routerBase) { + // 防止 url 出现 // + config.url = (routerBase + config.url).replace(new RegExp('//', 'gm'), '/') + } return config }) diff --git a/web-vue3/src/interface/common.d.ts b/web-vue3/src/interface/common.d.ts index de9d13b36..cc8daf878 100644 --- a/web-vue3/src/interface/common.d.ts +++ b/web-vue3/src/interface/common.d.ts @@ -1,10 +1,18 @@ export interface SystemType { - disabledCaptcha: bollean - disabledGuide: bollean - inDocker: bollean - loginTitle: string - name: string - notificationPlacement: string - routerBase: string - subTitle: string + disabledCaptcha: bollean + disabledGuide: bollean + inDocker: bollean + loginTitle: string + name: string + notificationPlacement: string + routerBase: string + subTitle: string +} + +export interface GlobalWindow { + routerBase: string + apiTimeout: string + uploadFileSliceSize: string + uploadFileConcurrent: string + oauth2Provide: string } diff --git a/web-vue3/src/pages/login/install.vue b/web-vue3/src/pages/login/install.vue index 993cac5cc..4314421eb 100644 --- a/web-vue3/src/pages/login/install.vue +++ b/web-vue3/src/pages/login/install.vue @@ -1,6 +1,14 @@