diff --git a/config/vite.config.prod.ts b/config/vite.config.prod.ts index 35b7592e..83e3f3ae 100644 --- a/config/vite.config.prod.ts +++ b/config/vite.config.prod.ts @@ -9,6 +9,7 @@ import configStyleImportPlugin from './plugin/styleImport' export default mergeConfig( { + base: '', mode: 'production', plugins: [ configCompressPlugin('gzip'), diff --git a/package.json b/package.json index ca052393..7f982b15 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dev": "vite --config ./config/vite.config.dev.ts", "cloud": "VITE_ROLE=cloud vite --config ./config/vite.config.dev.ts", "build": "vite build --config ./config/vite.config.prod.ts", - "build:docker": "vite build --config ./config/vite.config.prod.ts --base /dashboard/", + "build:docker": "vite build --config ./config/vite.config.prod.ts", "build:test": "vite build --config ./config/vite.config.prod.ts --mode test --base /dashboard/ && vue-tsc --noEmit", "build:staging": "vite build --config ./config/vite.config.prod.ts --mode staging --base /dashboard/ && vue-tsc --noEmit", "report": "cross-env REPORT=true pnpm run build", @@ -147,4 +147,4 @@ "gifsicle": "5.2.0" }, "packageManager": "pnpm@9.1.0" -} +} \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 42df72b5..591804cc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,11 +27,8 @@ }) const { setRole } = useUserStore() - const { host } = storeToRefs(useAppStore()) const { updateSettings } = useAppStore() - host.value = window.location.origin - const role = import.meta.env.VITE_ROLE || 'admin' setRole(role) @@ -41,11 +38,12 @@ if (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'production') { // Assuming local greptimeDB is up and running - const { username, password, database }: any = useStorage('config', {}).value + const { username, password, database, host }: any = useStorage('config', {}).value updateSettings({ username, password, database, + host, }) } diff --git a/src/components/global-setting/index.vue b/src/components/global-setting/index.vue index c397257c..2c184e30 100644 --- a/src/components/global-setting/index.vue +++ b/src/components/global-setting/index.vue @@ -124,6 +124,9 @@ a-drawer.settings-drawer( }) onMounted(() => { + if (!host.value) { + host.value = window.location.href.replace(/\/dashboard(?!.*\/dashboard).*/, '') + } axios.defaults.baseURL = host.value })