diff --git a/package.json b/package.json index aaef101..37afd53 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@kevisual/center", "private": true, - "version": "0.0.3", + "version": "0.0.4", "type": "module", "scripts": { "dev": "vite", @@ -9,8 +9,8 @@ "dev:kv": "cross-env VITE_USE_KV=true vite", "lint": "eslint .", "preview": "vite preview", - "prepub": "envision switchOrg root", - "pub": "envision deploy ./dist -k center -v 0.0.3 -u" + "prepub": "envision switchMe", + "pub": "envision deploy ./dist -k center -v 0.0.5 -u" }, "dependencies": { "@abearxiong/flows": "0.0.1-alpha.9", diff --git a/src/App.tsx b/src/App.tsx index c7fbbf4..50c16cc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,4 @@ -import { BrowserRouter as Router, Route, Routes, Navigate } from 'react-router-dom'; +import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'; import { ConfigProvider } from 'antd'; import { App as ContainerApp } from './pages/container'; import { App as MapApp } from './pages/map'; @@ -6,6 +6,8 @@ import { App as UserApp } from './pages/user'; import { App as UserAppApp } from './pages/app'; import { App as FileApp } from './pages/file'; import { App as OrgApp } from './pages/org'; +import { basename } from './modules/basename'; +import { Redirect } from './modules/Redirect'; export const App = () => { return ( @@ -14,9 +16,9 @@ export const App = () => { theme={{ token: {}, }}> - + - } /> + } /> } /> } /> } /> diff --git a/src/modules/Redirect.tsx b/src/modules/Redirect.tsx new file mode 100644 index 0000000..6eca0f8 --- /dev/null +++ b/src/modules/Redirect.tsx @@ -0,0 +1,6 @@ +import { basename } from './basename'; +import { Navigate } from 'react-router-dom'; + +export const Redirect = (({ to }) => { + return ; +}) as any as typeof Navigate; diff --git a/src/modules/basename.ts b/src/modules/basename.ts new file mode 100644 index 0000000..6da2da4 --- /dev/null +++ b/src/modules/basename.ts @@ -0,0 +1 @@ +export const basename = DEV_SERVER ? '' : '/root/center'; diff --git a/src/modules/navicate.ts b/src/modules/navicate.ts index b7f4dfa..b9ce543 100644 --- a/src/modules/navicate.ts +++ b/src/modules/navicate.ts @@ -1,4 +1,5 @@ import { NavigateFunction, To, useNavigate } from 'react-router-dom'; +import { basename } from './basename'; /** * 如果有basepath,刚好给path加上basepath * @returns NavigateFunction @@ -6,6 +7,7 @@ import { NavigateFunction, To, useNavigate } from 'react-router-dom'; export const useNewNavigate = (): NavigateFunction => { const navigate = useNavigate(); const fn = (path: To, data?: any) => { + // navigate(basename + '/' + path, data); navigate(path, data); }; return fn as NavigateFunction; diff --git a/src/modules/redirect-to-login.ts b/src/modules/redirect-to-login.ts index af61421..2d50259 100644 --- a/src/modules/redirect-to-login.ts +++ b/src/modules/redirect-to-login.ts @@ -1,12 +1,14 @@ import { DialogModal } from '@kevisual/ui'; import '@kevisual/ui/dist/index.css'; - +import { basename } from './basename'; const content = document.createElement('div'); + +const loginHref = `${basename}/user/login`; content.innerHTML = `

Token 无效

您的登录凭证已失效,请重新登录。

- 确定 + 确定
`; export const modal = DialogModal.render(content, { diff --git a/src/pages/app/index.tsx b/src/pages/app/index.tsx index fe780ed..ad04eab 100644 --- a/src/pages/app/index.tsx +++ b/src/pages/app/index.tsx @@ -1,12 +1,13 @@ -import { Navigate, Route, Routes } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { Main } from './layouts'; import { List } from './edit/List'; import { AppVersionList } from './edit/AppVersionList'; +import { Redirect } from '@/modules/Redirect'; export const App = () => { return ( }> - }> + }> } /> } /> diff --git a/src/pages/container/index.tsx b/src/pages/container/index.tsx index b74f56a..820dfea 100644 --- a/src/pages/container/index.tsx +++ b/src/pages/container/index.tsx @@ -1,12 +1,13 @@ -import { Navigate, Route, Routes } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { ContainerList } from './edit/List'; import { Main } from './layouts'; import { Preview, PreviewWrapper } from './preview'; +import { Redirect } from '@/modules/Redirect'; export const App = () => { return ( }> - }> + }> } /> } /> diff --git a/src/pages/file/index.tsx b/src/pages/file/index.tsx index 9dad8a7..dec3fd1 100644 --- a/src/pages/file/index.tsx +++ b/src/pages/file/index.tsx @@ -1,11 +1,12 @@ -import { Navigate, Route, Routes } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { Main } from './layouts'; import { List } from './edit/List'; +import { Redirect } from '@/modules/Redirect'; export const App = () => { return ( }> - }> + }> } /> diff --git a/src/pages/org/index.tsx b/src/pages/org/index.tsx index 4b66070..9d4fe02 100644 --- a/src/pages/org/index.tsx +++ b/src/pages/org/index.tsx @@ -1,13 +1,14 @@ -import { Navigate, Route, Routes } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { List } from './edit/List'; import { Main } from './layouts'; import { UserList } from './edit/UserList'; +import { Redirect } from '@/modules/Redirect'; export const App = () => { return ( }> - }> + }> } /> } /> diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index d6b5098..6bced85 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -1,14 +1,15 @@ -import { Navigate, Route, Routes } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { List } from './edit/List'; import { Main } from './layouts'; import { Login } from './login/Login'; import { Login as WxLogin } from './wx/Login'; import { Profile } from './edit/Profile'; +import { Redirect } from '@/modules/Redirect'; export const App = () => { return ( }> - }> + }> } /> } /> diff --git a/vite.config.ts b/vite.config.ts index d3255e0..f454115 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -56,6 +56,7 @@ export default defineConfig({ define: { DEV_SERVER: JSON.stringify(process.env.NODE_ENV === 'development'), }, + base: isDev ? '/' : '/root/center/', server: { port: 6020, host: '0.0.0.0',