@@ -93,6 +95,6 @@ export const App = () => {
-
+
);
};
diff --git a/src/modules/layout/index.tsx b/src/modules/layout/index.tsx
index 41445ad..c52e5ff 100644
--- a/src/modules/layout/index.tsx
+++ b/src/modules/layout/index.tsx
@@ -17,6 +17,7 @@ import { IconButton } from '@kevisual/components/button/index.tsx';
import { Languages, QrCode } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { toast } from 'react-toastify';
+import { useTheme } from '@kevisual/components/theme/index.tsx';
type LayoutMainProps = {
title?: React.ReactNode;
diff --git a/src/pages/user/edit/Profile.tsx b/src/pages/user/edit/Profile.tsx
index 9d31e22..328f523 100644
--- a/src/pages/user/edit/Profile.tsx
+++ b/src/pages/user/edit/Profile.tsx
@@ -10,9 +10,10 @@ import UploadOutlined from '@ant-design/icons/UploadOutlined';
import PandaPNG from '@/assets/panda.png';
import { FileUpload } from '../module/FileUpload';
import { useTranslation } from 'react-i18next';
-import { Edit } from 'lucide-react';
+import { Edit, UserCog } from 'lucide-react';
import { toast } from 'react-toastify';
import { useAdminStore } from '../admin/store/admin-store';
+import { IconButton } from '@kevisual/components/button/index.tsx';
export const CheckUserExistModal = () => {
const { t } = useTranslation();
const userStore = useUserStore(
@@ -62,7 +63,57 @@ export const CheckUserExistModal = () => {
);
};
-
+export const ChangePasswordModal = () => {
+ const { t } = useTranslation();
+ const userStore = useUserStore(
+ useShallow((state) => {
+ return {
+ showChangePassword: state.showChangePassword,
+ setShowChangePassword: state.setShowChangePassword,
+ updateSelf: state.updateSelf,
+ };
+ }),
+ );
+ const [newPassword, setNewPassword] = useState('');
+ const [confirmPassword, setConfirmPassword] = useState('');
+ const onSubmit = async () => {
+ if (newPassword !== confirmPassword) {
+ toast.error('两次密码不一致');
+ return;
+ }
+ const res = await userStore.updateSelf({
+ password: newPassword,
+ });
+ if (res.code === 200) {
+ onClose();
+ }
+ };
+ const onClose = () => {
+ setNewPassword('');
+ setConfirmPassword('');
+ userStore.setShowChangePassword(false);
+ };
+ return (
+
+ );
+};
export const Profile = () => {
const { t } = useTranslation();
const { control, handleSubmit, setValue, reset, formState, getValues } = useForm({
@@ -83,6 +134,7 @@ export const Profile = () => {
setFormData: state.setFormData,
updateSelf: state.updateSelf,
setShowCheckUserExist: state.setShowCheckUserExist,
+ setShowChangePassword: state.setShowChangePassword,
};
}),
);
@@ -201,8 +253,16 @@ export const Profile = () => {
+
+
+ userStore.setShowChangePassword(true)}>
+
+
+
+
+
);
diff --git a/src/pages/user/store/index.ts b/src/pages/user/store/index.ts
index 7ac4307..e16d596 100644
--- a/src/pages/user/store/index.ts
+++ b/src/pages/user/store/index.ts
@@ -17,6 +17,8 @@ type UserStore = {
updateData: (data: any) => Promise;
updateSelf: (data: any) => Promise;
deleteData: (id: string) => Promise;
+ showChangePassword: boolean;
+ setShowChangePassword: (showChangePassword: boolean) => void;
};
export const useUserStore = create((set, get) => {
return {
@@ -88,5 +90,7 @@ export const useUserStore = create((set, get) => {
message.error(res.message || 'Request failed');
}
},
+ showChangePassword: false,
+ setShowChangePassword: (showChangePassword) => set({ showChangePassword }),
};
});
diff --git a/submodules/query-upload b/submodules/query-upload
index a7faaca..86e6a86 160000
--- a/submodules/query-upload
+++ b/submodules/query-upload
@@ -1 +1 @@
-Subproject commit a7faaca4188cae055deb1af1d1b758b6d5439f8d
+Subproject commit 86e6a8686e9cdb258beefbd8a934674bae17c3a0
diff --git a/submodules/store b/submodules/store
index d70118a..351b2e3 160000
--- a/submodules/store
+++ b/submodules/store
@@ -1 +1 @@
-Subproject commit d70118ad3db513a4ae95a925f0dd651929a8f632
+Subproject commit 351b2e336624b05e1b2c9f8b67d9a45cda7ebf9d
diff --git a/tsconfig.app.json b/tsconfig.app.json
index eb02035..2b3108d 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -32,7 +32,8 @@
},
"include": [
"src",
- "packages/**/*"
+ // "packages/**/*"
+ "@kevisual/components/**/*"
],
"exclude": [
"node_modules",