From 1107981caea0696297771ac1fda1537270dcf714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 14 Apr 2023 09:45:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E7=A9=BA=E6=A0=BCtrim()=E5=8E=BB=E6=8E=89,=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=94=A8=E6=88=B7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/loginRegister/Register.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/loginRegister/Register.jsx b/src/modules/loginRegister/Register.jsx index 5ef66b47c..970786243 100644 --- a/src/modules/loginRegister/Register.jsx +++ b/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){ {getFieldDecorator('register_username',{ rules:[ + { + transform: (value)=>{return value.trim()} + }, { required:true, message:"请输入用户名" From 65e6f5aa4317369bc2b6dbd4317eb8e046d136a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 14 Apr 2023 10:51:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=BA=A6=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/MilepostDetail.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Order/MilepostDetail.jsx b/src/forge/Order/MilepostDetail.jsx index 5c519106b..3db34c636 100644 --- a/src/forge/Order/MilepostDetail.jsx +++ b/src/forge/Order/MilepostDetail.jsx @@ -179,7 +179,7 @@ function MilepostDetail(props){ {milepost.effective_date || '暂无截止时间'} - {(milepost.percent || milepost.percent===0) ? {milepost.percent > 0 ? milepost.percent.toFixed(2)*100:milepost.percent}%完成 :"" } + {(milepost.percent || milepost.percent===0) ? {milepost.percent > 0 ? parseInt(milepost.percent*100):milepost.percent}%完成 :"" }

From bab9e0e4dd1223f26b2aefb725f2c5507c9a6f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 14 Apr 2023 10:52:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9wiki=E5=90=8D=E7=A7=B0:?= =?UTF-8?q?=20=E5=85=88=E8=8E=B7=E5=8F=96wiki=E5=86=85=E5=AE=B9=E5=86=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Wiki/components/sidebar/index.jsx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/forge/Wiki/components/sidebar/index.jsx b/src/forge/Wiki/components/sidebar/index.jsx index 1ec88130b..d8b3254a2 100644 --- a/src/forge/Wiki/components/sidebar/index.jsx +++ b/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'){