pull xiesi gitlink_server

src/forge/Order/MilepostDetail.jsx

@@ -179,7 +179,7 @@ function MilepostDetail(props){
               <i className="iconfont icon-a-31shijian font-14 mr5 color-grey-89"></i>
               <span className="color-grey-89">{milepost.effective_date || '暂无截止时间'}</span>
             </span>
-            {(milepost.percent || milepost.percent===0) ? <span style={{color: '#1aaf42'}}> {milepost.percent > 0 ? milepost.percent.toFixed(2)*100:milepost.percent}%完成 </span> :"" }
+            {(milepost.percent || milepost.percent===0) ? <span style={{color: '#1aaf42'}}> {milepost.percent > 0 ? parseInt(milepost.percent*100):milepost.percent}%完成 </span> :"" }
           </p>
         </div>
         <div className="milepostdiv">

src/forge/Wiki/components/sidebar/index.jsx

@@ -3,7 +3,7 @@ import { Tree, Dropdown, Menu, message, Modal, Input } from 'antd';
 import DelModal from '../../components/ModalFun';
 import './index.scss';
 import '../../components/ModalFun/index.scss';
-import { deleteWiki, findNodeByChildrenKey, findNodeByKey, treeToMd, updateWiki } from '../../api';
+import { deleteWiki, findNodeByChildrenKey, findNodeByKey, getWiki, treeToMd, updateWiki } from '../../api';
 import { useEffect } from 'react';
 import { Base64 } from 'js-base64';
 const Search = Input.Search;
@@ -25,6 +25,8 @@ export default function Sidebar(props) {
   const [isExpendedAll, setIsExpendedAll] = useState(false);
   // 重命名目录名称
   const [isEditName, setIsEditName] = useState(undefined);
+  // wiki重命名-wiki内容
+  const [wikiContent, setWikiContent] = useState(undefined);
 
   useEffect(()=>{
     if(defaultSelectedKeys){
@@ -299,6 +301,16 @@ export default function Sidebar(props) {
     let title = item.title.trim();
     const isFile = title.startsWith('[[') && title.endsWith(']]');
     title = isFile ? title.substring(2,title.length-2) : title.substring(2, title.length);
+    type === 2 && getWiki({
+      owner: owner,
+      repo: projectsId,
+      pageName: title,
+      projectId: project.id
+    }).then(res => {
+      if (res && res.message === "200") {
+        setWikiContent(res.data.md_content);
+      }
+    })
     setMenuName(title);
   }
 
@@ -372,6 +384,7 @@ export default function Sidebar(props) {
           pageName: oldTitle,
           // 现名称
           title: menuName,
+          content_base64: wikiContent,
           commit_message: '',
         }).then(res=>{
           if(res && res.message === '200'){

src/modules/loginRegister/Register.jsx

@@ -41,7 +41,7 @@ function Register(props){
       if (!err) {
         values.agreement && axios.post(`/accounts/register.json`, {
           login: values.email,
-          namespace: values.register_username,
+          namespace: values.register_username.trim(),
           password: values.register_psd,
           password_confirmation: values.psdComfirm,
           code: values.captcha
@@ -53,7 +53,7 @@ function Register(props){
             setEmailStr(values.email);
           }else if(response.data && response.data.status === 0){
             //注册成功，页面跳转即可，注册后登录流程forge处理了
-            window.location.href = "/"+values.register_username;
+            window.location.href = "/"+values.register_username.trim();
           } else {
             setEmailStr(values.email);
             setMess(response.data.message);
@@ -67,7 +67,7 @@ function Register(props){
   function usernameConfirm(rule, value, callback){
     setUserNameGo(true);
     value && (userNameGo || value !== loginStr) ? axios.post(`/accounts/check.json`, {
-      value: value,
+      value: value.trim(),
       type: 1
     }).then(response => {
       if (response.data.status === -1) {
@@ -238,6 +238,9 @@ function Register(props){
           <Form.Item>
             {getFieldDecorator('register_username',{
               rules:[
+                {
+                  transform: (value)=>{return value.trim()}
+                },
                 {
                   required:true,
                   message:"请输入用户名"