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

src/swift/Tags/T37K.js

+import React,{Component} from 'react'
+
+import { Form, Input, DatePicker,Row, Col,Button,Icon ,Select} from 'antd';
+import {InputSize,Currency,FormatAmount} from "./Utils"
+
+const FormItem = Form.Item;
+const Option = Select.Option
+
+export default class T37K extends Component
+{
+
+    name='37K'
+    desp = "(Currency)(Rate)"
+    
+    pattern = "3!a12d"
+    tno = -1
+
+
+    keys=[1,2]
+    onChange=(index,value)=>
+    {
+        let obj = {};
+        if(!value)
+            value = ""
+        
+        let objtemp =this.props.value
+        
+        objtemp = objtemp && objtemp.length? objtemp[0] : {}
+
+        objtemp["s"+index] = value;
+
+        this.keys.forEach(i=>{
+            obj['s'+i] = objtemp['s'+i]
+        });
+        let temp = FormatAmount(obj.s2);
+        
+        let mval = `${obj.s1}${temp}`.replace(/\//g,'')
+        this.props.onValue([obj,mval])
+    }
+
+    render()
+    {
+        let value =this.props.value
+
+        let mval = value && value.length? value[1] : ''
+        let errmsg = value && value.length==3?value[2]:{}
+
+        value = value && value.length? value[0] : {}
+
+        return (<Row>
+            <Col style={{"minWidth":'100px'}} span={3}>
+                <FormItem
+                    label="Currency"
+                       required={this.props.status=='M' || mval?'required':null}
+                  help={errmsg.s2}
+                    validateStatus={errmsg.s2?'error':null}
+                >
+                           <Select  
+                           placeholder="Currency"
+                           showSearch
+                           allowClear={true}
+                            optionFilterProp="children"
+                            notFoundContent="Wrong Code"
+                            style={{ width: "100%" }} value={value.s1} onChange={val=>this.onChange(1,val)} >
+                                {
+                                   Currency.map(cur=><Option key={cur} value={cur}>{cur}</Option>) 
+                                }
+                            </Select>
+                </FormItem>
+            </Col>
+            <Col span={12}>
+                <FormItem
+                 label="Rate"  
+                    required={this.props.status=='M' || mval?'required':null}
+                  help={errmsg.s2}
+                    validateStatus={errmsg.s2?'error':null}
+                >
+                        
+                        <Input  value={value.s2} onChange={e=>this.onChange(2,e.target.value)}  maxLength={12} style={{imeMode:'disabled'}} placeholder="Rate"/>
+                </FormItem>
+            </Col>
+        </Row>)
+    }
+}
\ No newline at end of file

src/swift/Tags/index.js

@@ -223,6 +223,8 @@ import T26C from './T26C';
 import T33G from './T33G';
 import T71C from './T71C';
 import T32F from './T32F';
+import T37K from './T37K';
+import T17R from './T17R';
 
 
 export default  function(tag,props,onValue){
@@ -452,6 +454,8 @@ export default  function(tag,props,onValue){
 		case "T33G"	:return <T33G	{...props}	onValue={onValue}	/>;
 		case "T71C"	:return <T71C	{...props}	onValue={onValue}	/>;
 		case "T32F"	:return <T32F	{...props}	onValue={onValue}	/>;
+		case "T37K"	:return <T37K	{...props}	onValue={onValue}	/>;
+		case "T17R"	:return <T17R	{...props}	onValue={onValue}	/>;
 
 	}