- 删除
diff --git a/src/pages/apps/store/user-app.ts b/src/pages/apps/store/user-app.ts
index 85d42a0..c5c9752 100644
--- a/src/pages/apps/store/user-app.ts
+++ b/src/pages/apps/store/user-app.ts
@@ -43,7 +43,8 @@ export const useUserAppStore = create((set, get) => {
});
set({ loading: false });
if (res.code === 200) {
- set({ list: res.data });
+ const list = res.data.list || [];
+ set({ list: list });
} else {
message.error(res.message || 'Request failed');
}
diff --git a/src/pages/auth/index.tsx b/src/pages/auth/index.tsx
index 041ff38..afa034a 100644
--- a/src/pages/auth/index.tsx
+++ b/src/pages/auth/index.tsx
@@ -15,7 +15,7 @@ export const AuthProvider = ({ children, mustLogin }: Props) => {
useEffect(() => {
store.init()
}, [])
- const loginUrl = '/root/login?redirect=' + encodeURIComponent(window.location.href);
+ const loginUrl = '/root/login/?redirect=' + encodeURIComponent(window.location.href);
if (mustLogin && !store.me) {
return (
)
diff --git a/src/pages/auth/store.ts b/src/pages/auth/store.ts
index 2d5223b..4ec23a6 100644
--- a/src/pages/auth/store.ts
+++ b/src/pages/auth/store.ts
@@ -54,11 +54,12 @@ export const useLayoutStore = create {
- setOpen(false);
- }}>
-
- 打开应用
-
+
- 重新加载
-
+
- 用户: {store.me?.username}
-
-
+
+
+
+
+
);
};
diff --git a/src/modules/layout/index.tsx b/src/modules/layout/index.tsx
index 420212f..0aec4a1 100644
--- a/src/modules/layout/index.tsx
+++ b/src/modules/layout/index.tsx
@@ -57,10 +57,7 @@ export const LayoutMain = (props: LayoutMainProps) => {
useLayoutEffect(() => {
platformStore.init();
- }, []);
-
- useEffect(() => {
- menuStore.getMe();
+ console.log('menuStore', menuStore.me);
}, []);
return (
@@ -76,7 +73,6 @@ export const LayoutMain = (props: LayoutMainProps) => {
版本列表
-
+
{iText.share.tips}
-
+
+
+ 用户: {store.me?.username}
+
+
-
+
{items.length > 0 && (
-
-
-
-
-
-
-
- {items.map((item, index) => (
- {
- store.switchOrg(item.key, 'org');
- }}>
-
- ))}
-
-
-
-
-
-
+
+
+
+
+ {items.map((item, index) => (
+ {
+ store.switchOrg(item.key);
+ }}>
+
+ ))}
+
+
)}
-
-
{item.icon}
- {item.label}
- 切换组织
-{item.icon}
+ {item.label}
+
- {menu.map((item, index) => {
- return (
-
- {
- if (item.link) {
- openLink(item.link, '_self');
- setOpen(false);
- } else {
- message.info('即将上线');
- }
- }}>
-
- );
- })}
- {item.icon}
- {item.title}
- {
- const res = await queryLogin.logout();
- if (res.success) {
- const url = new URL(location.origin);
- url.pathname = '/root/login';
- openLink(url.toString(), '_self');
- } else {
- message.error(res.message || '退出失败');
- }
- }}>
-
+ 用户信息和账户管理
+
+
+
+
-
+
-
- 退出登录
+
+
-
+ {menu.map((item, index) => (
+
{
+ if (item.link) {
+ openLink(item.link, '_self');
+ setOpen(false);
+ } else {
+ message.info('即将上线');
+ }
+ }}>
+
+ ))}
{item.icon}
+ {item.title}
+
{quickMenu.map((item, index) => {
const isActive = location.pathname === item.link;
- console.log('isActive', location, item.link, isActive);
return (
打开对应的文件夹
diff --git a/src/pages/apps/app/page.tsx b/src/pages/apps/app/page.tsx
index cb4fd7e..b3852bf 100644
--- a/src/pages/apps/app/page.tsx
+++ b/src/pages/apps/app/page.tsx
@@ -17,8 +17,7 @@ import { Controller, useForm } from 'react-hook-form';
import { pick } from 'es-toolkit';
import { useAppDeleteModalStore, AppDeleteModal } from '../modules/AppDeleteModal';
import { AIEditorLink } from './AIEditorLink';
-import { openLink } from '@/modules/basename';
-import { LayoutMain } from '@/modules/layout';
+import { useNavigate } from '@tanstack/react-router';
const FormModal = () => {
const { control, handleSubmit, reset } = useForm();
@@ -130,6 +129,7 @@ export const AppVersionList = () => {
}),
);
const [isUpload, setIsUpload] = useState(false);
+ const navigate = useNavigate();
useEffect(() => {
// fetch app version list
if (appKey) {
@@ -170,8 +170,7 @@ export const AppVersionList = () => {
variant='ghost'
size='icon'
onClick={() => {
- // navigate('/app/edit/list');
- history.back();
+ navigate({ to: '/apps' });
}}>
-
+ return
);
};
const FormModal = () => {
@@ -276,6 +275,7 @@ export const List = () => {
useEffect(() => {
userAppStore.getList();
}, []);
+ const navigate = useNavigate();
return (
{
{
- menuStore.switchOrg('', 'user');
+ menuStore.switchOrg('');
}}>
diff --git a/src/modules/layout/store/index.ts b/src/modules/layout/store/index.ts
index 30df147..faab359 100644
--- a/src/modules/layout/store/index.ts
+++ b/src/modules/layout/store/index.ts
@@ -2,6 +2,7 @@
import { query, queryLogin } from '@/modules/query';
import { create } from 'zustand';
import { toast as message } from 'sonner';
+import { useLayoutStore } from '@/pages/auth/store';
export const getIsMac = async () => {
// @ts-ignore
const userAgentData = navigator.userAgentData;
@@ -68,38 +69,4 @@ export type LayoutStore = {
setIsAdmin: (isAdmin: boolean) => void;
checkHasOrg: () => boolean;
};
-export const useLayoutStore = create((set, get) => ({
- open: false,
- setOpen: (open) => set({ open }),
- me: {},
- setMe: (me) => set({ me }),
- getMe: async () => {
- const res = await queryLogin.getMe();
- if (res.code === 200) {
- set({ me: res.data });
- set({ isAdmin: res.data.orgs?.includes('admin') });
- }
- },
- openUser: false,
- setOpenUser: (openUser) => set({ openUser }),
- switchOrg: async (username?: string, type?: string) => {
- const res = await queryLogin.switchUser(username || '');
- if (res.code === 200) {
- message.success('Switch success');
- setTimeout(() => {
- window.location.reload();
- }, 1000);
- } else {
- message.error(res.message || 'Request failed');
- }
- },
- isAdmin: false,
- setIsAdmin: (isAdmin) => set({ isAdmin }),
- checkHasOrg: () => {
- const user = get().me || {};
- if (!user.orgs) {
- return false;
- }
- return user?.orgs?.length > 0;
- },
-}));
+export { useLayoutStore }
\ No newline at end of file
diff --git a/src/modules/query.ts b/src/modules/query.ts
index 11928d9..8fa2026 100644
--- a/src/modules/query.ts
+++ b/src/modules/query.ts
@@ -3,7 +3,15 @@ import { QueryLoginBrowser } from '@kevisual/api/query-login'
import { useContextKey } from '@kevisual/context';
export const query = useContextKey('query', new Query({
url: '/api/router',
+
}));
+query.afterResponse = async (response, ctx) => {
+ if (response.code === 401) {
+ queryLogin.logout();
+ setTimeout(() => { location.reload() }, 2000);
+ }
+ return response;
+}
export const queryClient = useContextKey('queryClient', new Query({
url: '/client/router',
diff --git a/src/pages/apps/app/AIEditorLink.tsx b/src/pages/apps/app/AIEditorLink.tsx
index 782272b..899d671 100644
--- a/src/pages/apps/app/AIEditorLink.tsx
+++ b/src/pages/apps/app/AIEditorLink.tsx
@@ -20,9 +20,8 @@ export const AIEditorLink = (props: Props) => {
return (
-
+
@@ -301,7 +301,7 @@ export const List = () => {
padding: '8px',
}}
onClick={() => {
- openLink('/domain/', '_self');
+ navigate({ to: '/domain' });
}}>
-
+
编辑
-
+
@@ -27,13 +27,15 @@ export const AuthProvider = ({ children, mustLogin }: Props) => {
- {
+ window.open(loginUrl, '_self')
+ }}
>
需要登录
请先登录以继续访问此页面
+
diff --git a/src/pages/config/page.tsx b/src/pages/config/page.tsx
index 25268ec..cd8bffa 100644
--- a/src/pages/config/page.tsx
+++ b/src/pages/config/page.tsx
@@ -26,7 +26,6 @@ import {
PopoverTrigger,
} from '@/components/ui/popover';
import { Plus, Pencil, Trash2, Code } from 'lucide-react';
-import { LayoutMain } from '@/modules/layout';
const TableList = () => {
const { list, setShowEdit, setFormData, deleteConfig, setShowDataEdit, setDataFormData } = useConfigStore();
@@ -90,12 +89,11 @@ const TableList = () => {
-
((set, get) => ({
getDomainList: async () => {
const res = await query.get({
- path: 'app.domain.manager',
+ path: 'app_domain_manager',
key: 'list',
});
if (res.code === 200) {
@@ -43,7 +43,7 @@ export const useDomainStore = create((set, get) => ({
},
updateDomain: async (data: any, opts?: { refresh?: boolean }) => {
const res = await query.post({
- path: 'app.domain.manager',
+ path: 'app_domain_manager',
key: 'update',
data,
});
@@ -61,7 +61,7 @@ export const useDomainStore = create((set, get) => ({
},
deleteDomain: async (data: any) => {
const res = await query.post({
- path: 'app.domain.manager',
+ path: 'app_domain_manager',
key: 'delete',
data,
});
@@ -74,7 +74,7 @@ export const useDomainStore = create((set, get) => ({
},
getDomainDetail: async (data: any) => {
const res = await query.post({
- path: 'app.domain.manager',
+ path: 'app_domain_manager',
key: 'get',
data,
});
diff --git a/src/pages/flowme/channel/page.tsx b/src/pages/flowme/channel/page.tsx
index 283fcc4..7cc8b62 100644
--- a/src/pages/flowme/channel/page.tsx
+++ b/src/pages/flowme/channel/page.tsx
@@ -18,10 +18,8 @@ import {
DialogContent,
DialogHeader,
DialogTitle,
- DialogTrigger,
} from '@/components/ui/dialog';
import { Plus, Pencil, Trash2 } from 'lucide-react';
-import { LayoutMain } from '@/modules/layout';
const TableList = () => {
const { list, setShowEdit, setFormData, deleteData } = useFlowmeChannelStore();
@@ -163,18 +161,14 @@ export const List = () => {
return (
-
确认删除该配置？
@@ -301,6 +299,4 @@ export const List = () => {
);
};
-export default () => {
- return
-
+
-
+
-
+
确认删除该组织？
@@ -204,6 +203,4 @@ export const List = () => {
);
};
-export default () => {
- return
+
diff --git a/src/pages/remote/page.tsx b/src/pages/remote/page.tsx
index baa8c4e..44c3fc3 100644
--- a/src/pages/remote/page.tsx
+++ b/src/pages/remote/page.tsx
@@ -1,5 +1,4 @@
'use client';
-import { LayoutMain } from "@/modules/layout";
import { RemoteApp } from "@kevisual/remote-app";
import { useEffect } from "react";
import { QueryRouterServer } from "@kevisual/router/browser";
@@ -54,10 +53,8 @@ export default function Home() {
}
}
return (
-
*/} -
+
+
-
-
-
+ 
@@ -287,6 +286,4 @@ export const UserProfile = () => {
);
};
-export default () => {
- return
-
+
+
);
}
diff --git a/src/pages/token/page.tsx b/src/pages/token/page.tsx
index f398d55..de3cc23 100644
--- a/src/pages/token/page.tsx
+++ b/src/pages/token/page.tsx
@@ -6,7 +6,6 @@ import { Controller, useForm } from 'react-hook-form';
import { Plus, Pencil, Trash2, Calendar as CalendarIcon, Eye, Copy } from 'lucide-react';
import { toast } from 'sonner';
import { useConfigStore, type Item } from './store';
-import { LayoutMain } from '@/modules/layout';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
@@ -264,6 +263,4 @@ export const List = () => {
);
};
-export default () => {
- return
@@ -221,4 +219,4 @@ export const List = () => {
);
};
-export default
*/} -