Merge branch 'ncb' of https://gitee.com/zeng_hui/swifteditor into ncb

src/swift/LeadPage.js

@@ -105,7 +105,7 @@ export   class LeadPage extends Component
         render:(text,record)=>{
             return <a href="javascript:void(0);" onClick={()=>{
                 this.props.actions.initSwiftMessageTree(null)  //清空
-                this.props.history.push(`swift/edit/${record.mty}`)
+                this.props.history.push(`swift/edit/${this.props.params.mctid?this.props.params.mctid+'/':''}${record.mty}`)
                 }
                 }>Create {record.desp}</a>
         }

src/swift/Result.js

@@ -37,7 +37,7 @@ const Step = Steps.Step;
             //         sndkey:this.props.rcv_bic
             //     }
             // }
-            `smhinr=${this.props.extra.smhinr?this.props.extra.smhinr:''}&sf2msg=${encodeURIComponent(this.props.swift_message)}&datas=${encodeURIComponent(JSON.stringify(datas))}`
+            `smhinr=${this.props.extra.smhinr?this.props.extra.smhinr:''}&user=${this.props.extra.mctid||"NONE" }&sf2msg=${encodeURIComponent(this.props.swift_message)}`
             ).then(data=>{
                 if(typeof data=='string')
                 {

src/swift/SWFPage2.js

@@ -403,7 +403,7 @@ export  class SWFPage extends Component
                                     :null
                                     }
                                     
-                                       <TempSaver getTemplateJSON={this.saveTemp} mty={mty} style={{marginRight:'1em',width:'8em'}}/>
+                                       <TempSaver getTemplateJSON={this.saveTemp} mty={mty} mctid={this.props.extra.mctid} style={{marginRight:'1em',width:'8em'}}/>
                                         <br/>
                                         <br/>
                                    

src/swift/TemplateSave.js

@@ -43,7 +43,7 @@ export default class TemplateSaver extends Component{
         this.setState({ loading: true });
         //调用模板保存API
         let tempJsn = this.props.getTemplateJSON()
-        let json = {...vals,sf2temp:tempJsn,mty:this.props.mty}
+        let json = {...vals,sf2temp:tempJsn,mty:this.props.mty,user:this.props.mctid||'NONE'}
         console.log(json)
         ServiceAPI.saveTemplate(json).then(data=>{
             if(typeof data=='string')