feat: 支持后台统一用户

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);
 

react-ui/src/pages/Experiment/index.jsx

@@ -286,8 +286,6 @@ function Experiment() {
       message.success('运行成功');
       refreshExperimentList();
       refreshExperimentIns(id);
-    } else {
-      message.error('运行失败');
     }
   };
 

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) => {

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={{

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([]);

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,

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 {