暂存

src/module/datasource/component/DatasourceManage.jsx

@@ -664,7 +664,11 @@ const DatasourceManage = ({ dataType }, ref) => {
       )}
       {dataType === 'ailab' && (
         <Table
-          rowSelection={rowSelection}
+          rowSelection={
+            ['1', '2', '3'].includes(sessionStorage.getItem('role'))
+              ? rowSelection
+              : null
+          }
           columns={ailab_columns}
           dataSource={filterAilabDataList}
           bordered

src/module/login/page/LoginView.jsx

@@ -89,25 +89,20 @@ const LoginView = () => {
   const navigate = useNavigate()
   const [loginForm] = Form.useForm()
   const login = () => {
-    loginForm
-      .validateFields()
-      .then(async () => {
-        const { account, password } = loginForm.getFieldValue()
-        const { data } = await loginUser({
-          username: account,
-          password: Base64.encode(password),
-        })
-        if (data.code === 200) {
-          sessionStorage.setItem('user_token', data.data.auth_token)
-          sessionStorage.setItem('user_id', data.data.id)
-          navigate('/datasource')
-        } else {
-          message.error(data.msg)
-        }
-      })
-      .catch(err => {
-        message.error('请检查表单数据是否完整')
+    loginForm.validateFields().then(async () => {
+      const { account, password } = loginForm.getFieldValue()
+      const { data } = await loginUser({
+        username: account,
+        password: Base64.encode(password),
       })
+      if (data.code === 200) {
+        sessionStorage.setItem('user_token', data.data.auth_token)
+        sessionStorage.setItem('user_id', data.data.id)
+        navigate('/datasource')
+      } else {
+        message.error(data.msg)
+      }
+    })
   }
   return (
     <LoginWrapper>

src/module/login/page/RegisterView.jsx

@@ -71,6 +71,15 @@ const LoginWrapper = styled.div`
     line-height: 30px;
     letter-spacing: 2px;
   }
+  .login {
+    display: flex;
+    justify-content: flex-end;
+    color: #1890ff;
+    margin: 30px;
+    span {
+      cursor: pointer;
+    }
+  }
 }`
 
 const FormItem = Form.Item
@@ -81,30 +90,25 @@ const LoginView = () => {
   const [loginForm] = Form.useForm()
 
   const login = () => {
-    loginForm
-      .validateFields()
-      .then(async () => {
-        const { account, password, repassword } = loginForm.getFieldValue()
-        if (password === repassword) {
-          const params = {
-            name: account,
-            username: account,
-            password: Base64.encode(password),
-          }
-          const { data } = await registerUser(params)
-          if (data.code === 200) {
-            message.success('注册成功')
-            navigate('/login')
-          } else {
-            message.error(data.msg)
-          }
+    loginForm.validateFields().then(async () => {
+      const { account, password, repassword } = loginForm.getFieldValue()
+      if (password === repassword) {
+        const params = {
+          name: account,
+          username: account,
+          password: Base64.encode(password),
+        }
+        const { data } = await registerUser(params)
+        if (data.code === 200) {
+          message.success('注册成功')
+          navigate('/login')
         } else {
-          message.error('两次输入的密码不一致')
+          message.error(data.msg)
         }
-      })
-      .catch(err => {
-        message.error('请检查表单数据是否完整')
-      })
+      } else {
+        message.error('两次输入的密码不一致')
+      }
+    })
   }
   return (
     <LoginWrapper>
@@ -164,6 +168,14 @@ const LoginView = () => {
             注册
           </Button>
         </div>
+        <div className="login">
+          <span
+            onClick={() => {
+              navigate('/login')
+            }}>
+            返回登录
+          </span>
+        </div>
       </div>
     </LoginWrapper>
   )