Merge remote-tracking branch 'upstream/gitlink_server' into gitlink_server

src/forge/Server/data.jsx

@@ -201,7 +201,7 @@ function Data(props) {
                                 : e.detect_status === "detecting" ?
                                   <div className="running">
                                     <span className="percentline" style={{ width: `${e.detect_process}%` }}></span>
-                                    <span className="percentNum" style={{ left: `${e.detect_process + 5}%` }}>{e.detect_process}%</span>
+                                    <span className="percentNum" style={{ left: `${parseInt(e.detect_process,0) + 5}%` }}>{e.detect_process}%</span>
                                   </div>
                                   : e.detect_status === "detected" ?
                                     <span className="success">成功</span> : <div className="running">

src/modules/loginRegister/ResetPassword.jsx

@@ -86,7 +86,7 @@ function ResetPassword(props) {
       }else{
         callback()
       }
-      setEmailStr(undefined);
+      // setEmailStr(undefined);
     }else{
       callback("请输入正确的手机号/邮箱")
     }