Commit 5c6a2a37 by fukai

修改返回时countMap错误判断问题

parent 96b60e24
...@@ -155,6 +155,10 @@ export class SWFPage extends Component ...@@ -155,6 +155,10 @@ export class SWFPage extends Component
this.props.actions.updateSwiftMessage(message) this.props.actions.updateSwiftMessage(message)
let flag = (this.props.params.rcvbic && this.props.params.rcvbic!='NONE') || this.props.params.action=='redit' let flag = (this.props.params.rcvbic && this.props.params.rcvbic!='NONE') || this.props.params.action=='redit'
// if(this.props.extra.countMap)
// this.props.extra.s_countMap = {...this.props.extra.countMap}
if(flag) if(flag)
this.props.history.push("preview/0") this.props.history.push("preview/0")
else else
...@@ -271,6 +275,14 @@ export class SWFPage extends Component ...@@ -271,6 +275,14 @@ export class SWFPage extends Component
let action = this.props.params.action let action = this.props.params.action
let mctid = this.props.params.mctid let mctid = this.props.params.mctid
this.props.extra.mctid = mctid this.props.extra.mctid = mctid
// if(!this.props.swift_message_tree)
// {
// //取出暂存countMap
// if(this.props.extra.s_countMap)
// this.props.extra.countMap = {...this.props.extra.s_countMap}
// }
if(action == 'edit') if(action == 'edit')
{ {
...@@ -832,7 +844,7 @@ export class Tag extends MessageArea ...@@ -832,7 +844,7 @@ export class Tag extends MessageArea
componentWillMount() componentWillMount()
{ {
if((this.props.action == 'redit' || this.props.action == 'redit2')&& this.props.seqlist) if(this.props.seqlist && !this.isEmpty(this.state.tagValue))
{ {
let {countMap={}} = this.props.extra let {countMap={}} = this.props.extra
for(let seqlbl of this.props.seqlist ) for(let seqlbl of this.props.seqlist )
...@@ -850,9 +862,7 @@ export class Tag extends MessageArea ...@@ -850,9 +862,7 @@ export class Tag extends MessageArea
{ {
if(this.props.seqlist) if(this.props.seqlist)
{ {
let val = this.state.tagValue if(this.isEmpty(this.state.tagValue))
let mval = val && val.length? val[1] : ''
if(!mval)
return return
let {countMap} = this.props.extra let {countMap} = this.props.extra
if(!countMap) if(!countMap)
...@@ -869,6 +879,8 @@ export class Tag extends MessageArea ...@@ -869,6 +879,8 @@ export class Tag extends MessageArea
{ {
if(!tagValue) if(!tagValue)
return true return true
if(!tagValue.length || tagValue.length < 1)
return true
return isTagValueEmpty("T"+this.props.pattern.tag,tagValue) return isTagValueEmpty("T"+this.props.pattern.tag,tagValue)
} }
output() output()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment