From 4a55df23ca6e503ba4cfd49443c11f72896c243e Mon Sep 17 00:00:00 2001
From: cp3hnu <cp3hnu@gmail.com>
Date: Thu, 3 Apr 2025 10:59:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 react-ui/src/components/IFramePage/index.tsx           | 2 +-
 react-ui/src/pages/Experiment/index.jsx                | 2 --
 react-ui/src/pages/System/User/components/ResetPwd.tsx | 3 ++-
 react-ui/src/pages/System/User/edit.tsx                | 4 ++--
 react-ui/src/pages/System/User/index.tsx               | 2 +-
 react-ui/src/services/system/user.ts                   | 6 +-----
 react-ui/src/types/system/user.d.ts                    | 1 +
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/react-ui/src/components/IFramePage/index.tsx b/react-ui/src/components/IFramePage/index.tsx
index e2c101d3..b57869d3 100644
--- a/react-ui/src/components/IFramePage/index.tsx
+++ b/react-ui/src/components/IFramePage/index.tsx
@@ -52,7 +52,7 @@ type IframePageProps = {
 };
 
 /** 系统内嵌 iframe，目前系统有数据标注、应用开发、开发环境、GitLink 四个子系统，使用时可以添加其他子系统 */
-function IframePage({ type, openInTab = true, className, style }: IframePageProps) {
+function IframePage({ type, openInTab = false, className, style }: IframePageProps) {
   const [iframeUrl, setIframeUrl] = useState('');
   const [loading, setLoading] = useState(false);
 
diff --git a/react-ui/src/pages/Experiment/index.jsx b/react-ui/src/pages/Experiment/index.jsx
index d283d863..b0006ce0 100644
--- a/react-ui/src/pages/Experiment/index.jsx
+++ b/react-ui/src/pages/Experiment/index.jsx
@@ -286,8 +286,6 @@ function Experiment() {
       message.success('运行成功');
       refreshExperimentList();
       refreshExperimentIns(id);
-    } else {
-      message.error('运行失败');
     }
   };
 
diff --git a/react-ui/src/pages/System/User/components/ResetPwd.tsx b/react-ui/src/pages/System/User/components/ResetPwd.tsx
index 07bd8c03..33581242 100644
--- a/react-ui/src/pages/System/User/components/ResetPwd.tsx
+++ b/react-ui/src/pages/System/User/components/ResetPwd.tsx
@@ -17,6 +17,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
   const [form] = Form.useForm();
   const loginPassword = Form.useWatch('password', form);
   const userId = props.values.userId;
+  const originPassword = props.values.originPassword;
 
   const intl = useIntl();
   const handleOk = () => {
@@ -26,7 +27,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
     props.onCancel();
   };
   const handleFinish = async (values: Record<string, any>) => {
-    props.onSubmit({ ...values, userId } as FormValueType);
+    props.onSubmit({ password: values.password, userId, originPassword } as FormValueType);
   };
 
   const checkPassword = (rule: any, value: string) => {
diff --git a/react-ui/src/pages/System/User/edit.tsx b/react-ui/src/pages/System/User/edit.tsx
index 8fb46945..e030eefb 100644
--- a/react-ui/src/pages/System/User/edit.tsx
+++ b/react-ui/src/pages/System/User/edit.tsx
@@ -80,6 +80,7 @@ const UserForm: React.FC<UserFormProps> = (props) => {
     const params = {
       ...values,
       userId: props.values.userId,
+      originPassword: props.values.originPassword,
     };
     props.onSubmit(params as UserFormData);
   };
@@ -194,7 +195,7 @@ const UserForm: React.FC<UserFormProps> = (props) => {
             id: 'system.user.user_name',
             defaultMessage: '用户账号',
           })}
-          hidden={userId}
+          disabled={!!props.values.userId}
           placeholder="请输入用户账号"
           colProps={{ md: 12, xl: 12 }}
           rules={[
@@ -214,7 +215,6 @@ const UserForm: React.FC<UserFormProps> = (props) => {
             id: 'system.user.password',
             defaultMessage: '密码',
           })}
-          hidden={userId}
           placeholder="请输入密码"
           colProps={{ md: 12, xl: 12 }}
           fieldProps={{
diff --git a/react-ui/src/pages/System/User/index.tsx b/react-ui/src/pages/System/User/index.tsx
index 52e68f9a..54361fa2 100644
--- a/react-ui/src/pages/System/User/index.tsx
+++ b/react-ui/src/pages/System/User/index.tsx
@@ -560,7 +560,7 @@ const UserTableList: React.FC = () => {
       />
       <ResetPwd
         onSubmit={async (values: any) => {
-          const success = await resetUserPwd(values.userId, values.password);
+          const success = await resetUserPwd(values);
           if (success) {
             setResetPwdModalVisible(false);
             setSelectedRows([]);
diff --git a/react-ui/src/services/system/user.ts b/react-ui/src/services/system/user.ts
index 93f30107..fbd34f32 100644
--- a/react-ui/src/services/system/user.ts
+++ b/react-ui/src/services/system/user.ts
@@ -94,11 +94,7 @@ export function updateUserProfile(data: API.CurrentUser) {
 }
 
 // 用户密码重置
-export function resetUserPwd(userId: number, password: string) {
-  const data = {
-    userId,
-    password,
-  };
+export function resetUserPwd(data: any) {
   return request<API.Result>('/api/system/user/resetPwd', {
     method: 'put',
     data: data,
diff --git a/react-ui/src/types/system/user.d.ts b/react-ui/src/types/system/user.d.ts
index 0eca095a..c129130c 100644
--- a/react-ui/src/types/system/user.d.ts
+++ b/react-ui/src/types/system/user.d.ts
@@ -22,6 +22,7 @@ declare namespace API.System {
     gitLinkUsername?: string;
     gitLinkPassword?: string;
     credit?: number;
+    originPassword?: string;
   }
 
   export interface UserListParams {