From 4f2e4e84fd2cdca1407ac06c1b44319518be39b9 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 21 十二月 2020 19:11:05 +0800 Subject: [PATCH] 2020-12-21 --- src/tabviews/custom/components/share/tabtransfer/index.jsx | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx index c783218..ed82365 100644 --- a/src/tabviews/custom/components/share/tabtransfer/index.jsx +++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx @@ -77,7 +77,7 @@ UNSAFE_componentWillReceiveProps(nextProps) { const { self } = this.state - if (!self && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { + if (!self && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { this.setState({mainSearch: fromJS(nextProps.mainSearch).toJS()}) } } @@ -162,11 +162,20 @@ const { config } = this.props let LText_field = [] let diffUser = false + let userName = sessionStorage.getItem('User_Name') || '' + let fullName = sessionStorage.getItem('Full_Name') || '' + + if (sessionStorage.getItem('isEditState') === 'true') { + userName = sessionStorage.getItem('CloudUserName') || '' + fullName = sessionStorage.getItem('CloudFullName') || '' + } + let _LText = params.map((item, index) => { let _script = item.script if (index === 0) { - _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg ='' + _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50) + select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}' ${_script} ` } @@ -229,7 +238,9 @@ } resetSearch = (search) => { - this.setState({mainSearch: search}) + this.setState({mainSearch: null}, () => { + this.setState({mainSearch: search}) + }) } getComponents = () => { -- Gitblit v1.8.0