{
- query.removeToken();
- window.open('/user/login', '_self');
+ onClick={async () => {
+ const res = await queryLogin.logout();
+ // console.log(res);
+ if (res.success) {
+ window.open('/user/login', '_self');
+ } else {
+ message.error(res.message || 'Logout failed');
+ }
}}>
-
+
{t('Login Out')}
@@ -89,10 +92,27 @@ export const LayoutMain = (props: LayoutMainProps) => {
-
+
-
{menuStore.me?.type === 'org' && (
-
-
+
)}
diff --git a/src/modules/query.ts b/src/modules/query.ts
index f7c295b..92f3afb 100644
--- a/src/modules/query.ts
+++ b/src/modules/query.ts
@@ -33,15 +33,6 @@ export const request = query.post;
export const ws = query.qws?.ws;
-// 当连接成功时
-// query.qws.ws.onopen = () => {
-// console.log('Connected to WebSocket server');
-// };
-
-// // 处理 WebSocket 关闭
-// query.qws.ws.onclose = () => {
-// console.log('Disconnected from WebSocket server');
-// };
query.qws.listenConnect(() => {
console.log('Connected to WebSocket server');
});
diff --git a/src/pages/app/edit/List.tsx b/src/pages/app/edit/List.tsx
index 142cd8b..058a6cc 100644
--- a/src/pages/app/edit/List.tsx
+++ b/src/pages/app/edit/List.tsx
@@ -167,7 +167,7 @@ const ShareModal = () => {
onClose={() => {
containerStore.setShowEdit(false);
}}>
-
{iText.share.title}
+
{t('app.share')}
{
/>
Promise;
type?: 'yaml' | 'json';
@@ -42,7 +46,6 @@ export const DataYamlEdit = ({ onSave, type }: DataYamlEditProps) => {
}
}
}, [formData]);
- console.log(formData);
const handleSave = () => {
let data: any = {};
try {
@@ -109,14 +112,16 @@ export const DrawerEdit = () => {
await updateData({ ...values, id: formData.id }, { refresh: true });
};
const onSubmit = (data) => {
- console.log('Form Data:', data);
const pickValue = pick(data, ['title', 'key', 'description']);
onSave(pickValue);
};
+ const theme = useTheme();
+ const defaultProps = theme.components?.MuiTextField?.defaultProps;
return (
{
{tab === 'base' && (
-
);
};
-
+export const MyController = React.forwardRef(
+ ({ control, name, Component, componentProps }: { control: any; name: string; Component: (props: any) => JSX.Element; componentProps: any }, ref) => {
+ const theme = useTheme();
+ const defaultProps = theme.components?.MuiTextField?.defaultProps;
+ console.log(defaultProps, 'defaultProps');
+ const { field } = useController({ control, name });
+ return ;
+ },
+);
export const List = () => {
- const { list, getConfig, setShowEdit, setFormData, deleteConfig } = useConfigStore();
+ const { list, getConfig, setShowEdit, setFormData, deleteConfig, updateData, formData } = useConfigStore();
const [modal, contextHolder] = useModal();
useEffect(() => {
getConfig();
}, []);
+ const { setOpen, contextHolder: contextHolderPermission } = usePermissionModal({
+ onSave: async (values) => {
+ const permission = values;
+ console.log(permission, formData.id);
+ if (permission && formData.id) {
+ const res = await updateData({ data: { permission }, id: formData.id }, { refresh: true });
+ console.log(res);
+ return res.code === 200;
+ }
+ await new Promise((resolve) => setTimeout(resolve, 1000));
+ return true;
+ },
+ });
console.log(list);
+ const { t } = useTranslation();
return (
@@ -191,17 +217,26 @@ export const List = () => {
setShowEdit(true);
setFormData({});
}}>
-
+
-
+
-
+
{list.map((item) => (
-
+
{item.title}
-
{item.description}
+
+
+
{t('Description')}:
+
{item.description}
+
+
+
{t('Key')}:
+
{item.key}
+
+
+
+
+
{contextHolder}
+ {contextHolderPermission}
);
};
diff --git a/src/pages/config/store/config.ts b/src/pages/config/store/config.ts
index 6a0eee3..aca32c7 100644
--- a/src/pages/config/store/config.ts
+++ b/src/pages/config/store/config.ts
@@ -3,7 +3,7 @@ import { query } from '@/modules/query';
import { toast } from 'react-toastify';
import { QueryConfig } from '@kevisual/query-config';
-export const queryConfig = new QueryConfig({ query });
+export const queryConfig = new QueryConfig({ query: query as any });
interface ConfigStore {
list: any[];
diff --git a/src/pages/container/edit/List.tsx b/src/pages/container/edit/List.tsx
index 7663dd0..fe1321e 100644
--- a/src/pages/container/edit/List.tsx
+++ b/src/pages/container/edit/List.tsx
@@ -83,7 +83,7 @@ const FormModal = () => {
control={control}
defaultValue={[]}
render={({ field }) => {
- return
field.onChange(value)} />;
+ return field.onChange(value)} />;
}}
/>
{!isEdit && (
diff --git a/src/pages/org/edit/UserList.tsx b/src/pages/org/edit/UserList.tsx
index 01ca01d..39d7728 100644
--- a/src/pages/org/edit/UserList.tsx
+++ b/src/pages/org/edit/UserList.tsx
@@ -16,7 +16,6 @@ import { useModal } from '@kevisual/center-components/modal/Confirm.tsx';
import { TextField } from '@mui/material';
import { Select } from '@kevisual/center-components/select/index.tsx';
import { useForm, Controller } from 'react-hook-form';
-import EditOutlined from '@ant-design/icons/EditOutlined';
const FormModal = () => {
const { control, handleSubmit, reset } = useForm();
diff --git a/submodules/query-login b/submodules/query-login
index 24f091a..9ba45c3 160000
--- a/submodules/query-login
+++ b/submodules/query-login
@@ -1 +1 @@
-Subproject commit 24f091ac792342ea295496cf8ff49f6c79ab47a6
+Subproject commit 9ba45c37c2d642e7ae0a0856a29ba3f3cd61d2c9
diff --git a/vite.config.ts b/vite.config.ts
index d5b81c1..955018a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -32,13 +32,7 @@ if (true) {
target: backend,
changeOrigin: true,
ws: true,
- rewrite: (path: any) => path.replace(/^\/api/, '/api'),
- },
- '/api/router': {
- target: backendWss,
- changeOrigin: true,
- ws: true,
- rewriteWsOrigin: true,
+ cookieDomainRewrite: 'localhost',
rewrite: (path: any) => path.replace(/^\/api/, '/api'),
},
'/user/login': {
@@ -81,13 +75,6 @@ export default defineConfig({
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '/api'),
},
- '/api/router': {
- target: 'wss://localhost:4005',
- changeOrigin: true,
- ws: true,
- rewriteWsOrigin: true,
- rewrite: (path) => path.replace(/^\/api/, '/api'),
- },
...proxy,
},
},