From 61abecde531c2035eb116871f451cf670bf0b47d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 20 Dec 2021 17:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/Detail.js | 4 +-- src/forge/Order/order.js | 29 +++++++++++----- src/forge/users/Material/Index.jsx | 8 ++--- src/forge/users/Material/Password.jsx | 48 +++++++++++++++------------ 4 files changed, 52 insertions(+), 37 deletions(-) diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 57e4af549..9d5132063 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -303,7 +303,7 @@ class Detail extends Component {

负责人: - {data && data.assign_user_name ? data.assign_user_name : "--"} + {data && data.assign_user_name ? {data.assign_user_name} : "--"}

@@ -325,7 +325,7 @@ class Detail extends Component {

里程碑: - {data && data.version ? data.version : "--"} + {data && data.version ? {data.version} : "--"}

diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 4b3581754..85b40716f 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -248,16 +248,28 @@ class order extends Component { }); const { status_type } = this.state; - this.state.select_params.search = value; - this.state.select_params.page = 1; - this.getIssueList(status_type); + this.setState({ + select_params:{ + search:value, + page:1 + } + },()=>{ + this.getIssueList(status_type); + }) }; openorder = (type) => { - this.setState({ + const s = { author_id: undefined, assigned_to_id: undefined, + page:1, + limit:15 + } + this.setState({ status_type: type, + select_params:s, + author_id: undefined, + assigned_to_id: undefined, issue_tag_ids: "标记", tracker_ids: "类型", author_ids: "发布人", @@ -265,13 +277,12 @@ class order extends Component { status_ids: "状态", done_ratios: "完成度", fixed_version_ids:"里程碑", - paix: "排序", checkedValue:[], - all:undefined + all:undefined, + paix: "排序", + },()=>{ + this.getIssueList(type); }); - this.state.select_params.page = 1; - this.state.select_params.limit = 15; - this.getIssueList(type); }; // 筛选：全部、指派给我、由我创建 diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx index 8833c6543..e1b30e3a2 100644 --- a/src/forge/users/Material/Index.jsx +++ b/src/forge/users/Material/Index.jsx @@ -9,7 +9,7 @@ import '../../SecuritySetting/notice/manager/Index.scss'; function Index(props){ // const { username } = props && props.match && props.match.params; const { pathname } = props && props.location; - // const { current_user } = props; + const { current_user } = props; const [ key , setKey ] = useState("0"); @@ -28,10 +28,10 @@ function Index(props){ return(

- - 基本资料 + setKey(e.key)}> + 基本资料 {/* 基本资料 */} - {/* 密码管理 */} + 密码管理
diff --git a/src/forge/users/Material/Password.jsx b/src/forge/users/Material/Password.jsx index d7a2abc6a..645bc3f1f 100644 --- a/src/forge/users/Material/Password.jsx +++ b/src/forge/users/Material/Password.jsx @@ -7,11 +7,10 @@ import Axios from 'axios'; export default Form.create()( forwardRef((props)=>{ const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form; - const { username } = props && props.match && props.match.params; const { current_user} = props; - const [ oldPass , setOldPass ] = useState(undefined); - const [ oldPassRepeat , setOldPassRepeat ] = useState(undefined); + const [ NewPass , setNewPass ] = useState(undefined); + const [ NewPassRepeat , setNewPassRepeat ] = useState(undefined); function submit() { validateFields((error,values)=>{ @@ -34,23 +33,29 @@ export default Form.create()( } // 判断两次输入的密码是否一致 + var reg = /(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/; function checkIdentifier(rule, value, callback , inputValue){ if(!value){ callback(); } + if (value && !inputValue && !reg.test(value)) { + callback("请输入8-16位密码，区分大小写、不能使用空格"); + } if (value && inputValue && value !== inputValue) { callback("两次输入的密码不一致"); } callback(); } - var reg = /(?!.*\s)(?!^[\u4e00-\u9fa5]+$)(?!^[0-9]+$)(?!^[A-z]+$)(?!^[^A-z0-9]+$)^.{8,16}$/; - function checkNewPass(rule, value, callback) { + function checkNewPass(rule, value, callback,newpassrepeat) { if(!value){ callback(); } if (!reg.test(value)) { - callback("8-16个字符,不包含空格,必须包含数字,字母或字符至少两种"); + callback("请输入8-16位密码，区分大小写、不能使用空格"); + } + if(value && newpassrepeat && newpassrepeat!==value){ + callback("两次输入的密码不一致"); } callback(); } @@ -60,37 +65,36 @@ export default Form.create()( {getFieldDecorator("old_password",{ rules:[ - {required:true,message:"请输入旧密码"}, - {validator:(rule, value, callback)=>checkIdentifier(rule, value, callback,oldPassRepeat)} + {required:true,message:"请输入旧密码"} ] })( - {setOldPass(e.target.value)}}/> - )} - - - {getFieldDecorator("old_password_repeat",{ - rules:[ - {required:true,message:"请重新输入旧密码"}, - {validator:(rule, value, callback)=>checkIdentifier(rule, value, callback,oldPass)} - ] - })( - {setOldPassRepeat(e.target.value)}}/> + )} {getFieldDecorator("password",{ rules:[ {required:true,message:"请输入新密码"}, - {validator:checkNewPass} + {validator:(rule, value, callback)=>checkNewPass(rule, value, callback,NewPassRepeat)} ] })( - + {setNewPass(e.target.value)}}/> + )} + + + {getFieldDecorator("new_password_repeat",{ + rules:[ + {required:true,message:"请重新输入新密码"}, + {validator:(rule, value, callback)=>checkIdentifier(rule, value, callback,NewPass)} + ] + })( + {setNewPassRepeat(e.target.value)}}/> )} - + )