MT760中44H换成44J

8fcd5b06 · s_guodong · b5d3d6ce · 8fcd5b06 · 8fcd5b06 · 8fcd5b06
Commit 8fcd5b06 authored Oct 19, 2023 by s_guodong
Hide whitespace changes
Inline Side-by-side

Showing with 112 additions and 10 deletions

MT760.js src/swift/MT/MT760.js +4 -4

TagRegMap.js src/swift/TagRegMap.js +7 -6

T44J.js src/swift/Tags/T44J.js +99 -0

index.js src/swift/Tags/index.js +2 -0

No files found.
--- a/src/swift/MT/MT760.js
+++ b/src/swift/MT/MT760.js
@@ -40,7 +40,7 @@ const Tags = [
 	{tag:"77U",status:M,tno:26,letter:[],label:"Undertaking Terms and Conditions"},
 	{tag:"49",status:O,tno:27,letter:[],label:"Confirmation Instructions"},
 	{tag:"58A",status:O,tno:28,letter:["58A","58D"],label:"Requested Confirmation Party"},
-	{tag:"44H",status:O,tno:29,letter:[],label:"Governing Law and/or Place of Jurisdiction"},
+	{tag:"44J",status:O,tno:29,letter:[],label:"Governing Law/Jurisdiction"},
 	{tag:"23F",status:O,tno:30,letter:[],label:"Automatic Extension Period"},
 	{tag:"78",status:O,tno:31,letter:[],label:"Automatic Extension Non-Extension Notification"},
 	{tag:"26E",status:O,tno:32,letter:[],label:"Automatic Extension Notification Period"},
@@ -76,7 +76,7 @@ const Tags = [
 	{tag:"77U",status:M,tno:26,letter:[],label:"Undertaking Terms and Conditions"},
 	{tag:"49",status:O,tno:27,letter:[],label:"Confirmation Instructions"},
 	{tag:"58A",status:O,tno:28,letter:["58A","58D"],label:"Requested Confirmation Party"},
-	{tag:"44H",status:O,tno:29,letter:[],label:"Governing Law and/or Place of Jurisdiction"},
+	{tag:"44J",status:O,tno:29,letter:[],label:"Governing Law/Jurisdiction"},
 	{tag:"23F",status:O,tno:30,letter:[],label:"Automatic Extension Period"},
 	{tag:"78",status:O,tno:31,letter:[],label:"Automatic Extension Non-Extension Notification"},
 	{tag:"26E",status:O,tno:32,letter:[],label:"Automatic Extension Notification Period"},
@@ -110,7 +110,7 @@ const Tags = [
 	{tag:"77L",status:O,tno:57,letter:[],label:"Requested Local Undertaking Terms and Conditions"},
 	{tag:"22Y",status:O,tno:58,letter:[],label:"Standard Wording Required"},
 	{tag:"40D",status:O,tno:59,letter:[],label:"Standard Wording Requested Language"},
-	{tag:"44H",status:O,tno:60,letter:[],label:"Governing Law and/or Place of Jurisdiction"},
+	{tag:"44J",status:O,tno:60,letter:[],label:"Governing Law/Jurisdiction"},
 	{tag:"23F",status:O,tno:61,letter:[],label:"Automatic Extension Period"},
 	{tag:"78",status:O,tno:62,letter:[],label:"Automatic Extension Non-Extension Notification"},
 	{tag:"26E",status:O,tno:63,letter:[],label:"Automatic Extension Notification Period"},
@@ -143,7 +143,7 @@ const Tags = [
 	{tag:"77L",status:O,tno:57,letter:[],label:"Requested Local Undertaking Terms and Conditions"},
 	{tag:"22Y",status:O,tno:58,letter:[],label:"Standard Wording Required"},
 	{tag:"40D",status:O,tno:59,letter:[],label:"Standard Wording Requested Language"},
-	{tag:"44H",status:O,tno:60,letter:[],label:"Governing Law and/or Place of Jurisdiction"},
+	{tag:"44J",status:O,tno:60,letter:[],label:"Governing Law/Jurisdiction"},
 	{tag:"23F",status:O,tno:61,letter:[],label:"Automatic Extension Period"},
 	{tag:"78",status:O,tno:62,letter:[],label:"Automatic Extension Non-Extension Notification"},
 	{tag:"26E",status:O,tno:63,letter:[],label:"Automatic Extension Notification Period"},

--- a/src/swift/TagRegMap.js
+++ b/src/swift/TagRegMap.js
@@ -80,7 +80,7 @@ T60M:{"s3":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"a","option
 T72Z:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{0,35}","line":6,"length":35,"fixed":false,"type":"z","option":"M"}},
 T97A:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"M"}},
 T97B:{"s3":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s4":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"M"},"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{1,8}","line":1,"length":8,"fixed":false,"type":"c","option":"O"}},
-T97D:{"s3":{"reg":"[0-9a-zA-Z\\-\\?:\\(\\)\\.,'\\+ ]{0,140}","line":1,"length":140,"fixed":false,"type":"x","option":"M"},"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{1,8}","line":1,"length":8,"fixed":false,"type":"c","option":"O"}},
+T97D:{"s3":{"reg":"[0-9a-zA-Z\\-\\?:\\(\\)\\.,'\\+ ]{1,140}","line":1,"length":140,"fixed":false,"type":"x","option":"M"},"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{1,8}","line":1,"length":8,"fixed":false,"type":"c","option":"O"}},
 T85A:{"s3":{"reg":"[A-Z]{4}[A-Z]{2}[A-Z0-9]{2}([A-Z0-9]{3})?","line":1,"length":8,"fixed":true,"type":"FUNC","content":"SWIFTBIC","option":"M"},"s1":{"reg":"C|D|RC|RD","line":1,"length":2,"fixed":true,"type":"FUNC","content":"DC","option":"O"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,34}","line":1,"length":34,"fixed":false,"type":"x","option":"O"}},
 T97C:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"}},
 T85B:{"s3":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"O"},"s1":{"reg":"C|D|RC|RD","line":1,"length":2,"fixed":true,"type":"FUNC","content":"DC","option":"O"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,34}","line":1,"length":34,"fixed":false,"type":"x","option":"O"}},
@@ -205,21 +205,22 @@ T31X:{"s3":{"reg":"[A-Z]{7}","line":1,"length":7,"fixed":true,"type":"a","option
 T68A:{"s3":{"reg":"\\d{1,6}","line":1,"length":6,"fixed":false,"type":"n","option":"M"},"s4":{"reg":"\\d{1,2}","line":1,"length":2,"fixed":false,"type":"n","option":"M"},"s5":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"AMOUNT","option":"O"},"s6":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,10}","line":1,"length":10,"fixed":false,"type":"x","option":"O"},"s1":{"reg":"\\d{1,6}","line":1,"length":6,"fixed":false,"type":"n","option":"M"},"s2":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"}},
 T56A:{"s3":{"reg":"[A-Z]{4}[A-Z]{2}[A-Z0-9]{2}([A-Z0-9]{3})?","line":1,"length":8,"fixed":true,"type":"FUNC","content":"SWIFTBIC","option":"M"},"s1":{"reg":"C|D|RC|RD","line":1,"length":2,"fixed":true,"type":"FUNC","content":"DC","option":"O"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,34}","line":1,"length":34,"fixed":false,"type":"x","option":"O"}},
 T56B:{"s3":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"O"},"s1":{"reg":"C|D|RC|RD","line":1,"length":2,"fixed":true,"type":"FUNC","content":"DC","option":"O"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,34}","line":1,"length":34,"fixed":false,"type":"x","option":"O"}},
-T44A:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{0,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
+T44A:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{1,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
 T56C:{"s1":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,34}","line":1,"length":34,"fixed":false,"type":"x","option":"M"}},
-T44B:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{0,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
+T44B:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{1,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
 T32A:{"s3":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"AMOUNT","option":"M"},"s1":{"reg":"\\d{6}","line":1,"length":5,"fixed":true,"type":"FUNC","content":"DATE2","option":"M"},"s2":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"}},
 T56D:{"s3":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{0,35}","line":4,"length":35,"fixed":false,"type":"x","option":"M"},"s1":{"reg":"C|D|RC|RD","line":1,"length":2,"fixed":true,"type":"FUNC","content":"DC","option":"O"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,34}","line":1,"length":34,"fixed":false,"type":"x","option":"O"}},
 T44C:{"s1":{"reg":"\\d{6}","line":1,"length":5,"fixed":true,"type":"FUNC","content":"DATE2","option":"M"}},
 T32B:{"s1":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"},"s2":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"AMOUNT","option":"M"}},
 T44D:{"s1":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{0,65}","line":6,"length":65,"fixed":false,"type":"x","option":"M"}},
 T20C:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,16}","line":1,"length":16,"fixed":false,"type":"x","option":"M"}},
-T44E:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{0,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
-T44F:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{0,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
+T44E:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{1,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
+T44F:{"s1":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{1,140}","line":1,"length":140,"fixed":false,"type":"z","option":"M"}},
 T32C:{"s3":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"AMOUNT","option":"M"},"s1":{"reg":"\\d{6}","line":1,"length":5,"fixed":true,"type":"FUNC","content":"DATE2","option":"M"},"s2":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"}},
 T32D:{"s3":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"AMOUNT","option":"M"},"s1":{"reg":"\\d{6}","line":1,"length":5,"fixed":true,"type":"FUNC","content":"DATE2","option":"M"},"s2":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"}},
 T20D:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,25}","line":1,"length":25,"fixed":false,"type":"x","option":"M"}},
 T44H:{"s1":{"reg":"[A-Z]{2}","line":1,"length":2,"fixed":true,"type":"a","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,65}","line":1,"length":65,"fixed":false,"type":"x","option":"O"}},
+T44J:{"s1":{"reg":"[A-Z]{2}","line":1,"length":2,"fixed":true,"type":"a","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"O"},"s3":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,65}","line":1,"length":65,"fixed":false,"type":"x","option":"O"}},
 T32E:{"s1":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"}},
 T32F:{"s1":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"a","option":"M"},"s2":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"NUMBER","option":"M"}},
 T32G:{"s1":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"},"s2":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"AMOUNT","option":"M"}},
@@ -317,7 +318,7 @@ T23A:{"s1":{"reg":"[A-Z]{1,10}","line":1,"length":10,"fixed":false,"type":"a","o
 T35B:{"s3":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{0,35}","line":4,"length":35,"fixed":false,"type":"x","option":"O"},"s1":{"reg":"\\s{1}","line":1,"length":1,"fixed":false,"type":"e","option":"O"},"s2":{"reg":"[A-Z0-9]{12}","line":1,"length":12,"fixed":true,"type":"c","option":"O"}},
 T23B:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"}},
 T11A:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z]{3}","line":1,"length":3,"fixed":true,"type":"FUNC","content":"CUR","option":"M"}},
-T35C:{"s1":{"reg":"[0-9a-zA-Z\\-\\?:\\(\\)\\.,'\\+ ]{1,9}","line":1,"length":9,"fixed":false,"type":"x","option":"O"},"s2":{"reg":"[0-9a-zA-Z\\-\\?:\\(\\)\\.,'\\+ ]{0,30}","line":1,"length":30,"fixed":false,"type":"x","option":"O"}},
+T35C:{"s1":{"reg":"[0-9a-zA-Z\\-\\?:\\(\\)\\.,'\\+ ]{1,9}","line":1,"length":9,"fixed":false,"type":"x","option":"O"},"s2":{"reg":"[0-9a-zA-Z\\-\\?:\\(\\)\\.,'\\+ ]{1,30}","line":1,"length":30,"fixed":false,"type":"x","option":"O"}},
 T12:{"s1":{"reg":"\\d{3}","line":1,"length":3,"fixed":true,"type":"n","option":"M"}},
 T59F:{"s1":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,34}","line":1,"length":34,"fixed":false,"type":"x","option":"O"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{0,35}","line":4,"length":35,"fixed":false,"type":"x","option":"M"}},
 T23C:{"s1":{"reg":"[A-Z]{1,7}","line":1,"length":7,"fixed":false,"type":"a","option":"M"}},

--- a/src/swift/Tags/T44J.js
+++ b/src/swift/Tags/T44J.js
+import React, { Component } from 'react'
+
+import { Form, Input, DatePicker, Row, Col, Button, Icon, Select } from 'antd';
+
+import { InputSize, Currency, FormatAmount ,COUNTRY} from "./Utils"
+
+const FormItem = Form.Item;
+const Option = Select.Option
+
+export default class T44J extends Component {
+
+    name = '44J'
+    desp = "Governing Law/Jurisdiction"
+
+    pattern = ""
+    tno = -1
+
+    keys = [1, 2, 3]
+    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 mval = `${obj.s1}`
+        if (obj.s2)
+            mval = `${mval}/${obj.s2}`
+        if (obj.s3)
+            mval = `${mval}`+'\r\n'+`/${obj.s3}`
+        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 (
+            <div>
+                <Row>
+                    <Col style={{ "minWidth": '100px' }} span={12}>
+                        <FormItem
+                            label="Country Code"
+                            required={this.props.status == 'M' || mval ? 'required' : null}
+                            help={errmsg.s1}
+                            validateStatus={errmsg.s1 ? 'error' : null}
+                        >
+
+                            <Select allowClear={true}
+                                size={InputSize}
+                                defaultValue={''}
+                                style={{ width: "100%" }}
+                                placeholder="Country Code"
+                                value={value.s1}
+                                onChange={(val) => this.onChange(1, val)}>
+                                    {
+                                    COUNTRY.map(item=><Option key={item.code}  value={item.code}>{item.code+'-'+item.name}</Option>)
+                                }
+                            </Select>
+                        </FormItem>
+                    </Col>
+                </Row>
+                <Row>
+                    <Col>
+                        <FormItem
+                            label="Country Sub Division"
+                            help={errmsg.s2}
+                            validateStatus={errmsg.s2 ? 'error' : null}
+                        >
+                            <Input type="text" maxLength={35} style={{ imeMode: 'disabled' }} placeholder="Country Sub Division" value={value.s2} onChange={(e) => this.onChange(2, e.target.value)} />
+                        </FormItem>
+                    </Col>
+                </Row>
+                <Row>
+                    <Col>
+                        <FormItem
+                            label="Narrative"
+                            help={errmsg.s3}
+                            validateStatus={errmsg.s2 ? 'error' : null}
+                        >
+                            <Input type="text" maxLength={65} style={{ imeMode: 'disabled' }} placeholder="Narrative" value={value.s3} onChange={(e) => this.onChange(3, e.target.value)} />
+                        </FormItem>
+
+                    </Col>
+                </Row>
+            </div>
+        )
+    }
+}
--- a/src/swift/Tags/index.js
+++ b/src/swift/Tags/index.js
@@ -167,6 +167,7 @@ import T44D from "./T44D"
 import T44E from "./T44E"
 import T44F from "./T44F"
 import T44H from "./T44H"
+import T44J from "./T44J"
 import T45A from "./T45A"
 import T45B from "./T45B"
 import T45C from "./T45C"
@@ -520,6 +521,7 @@ export default  function(tag,props,onValue){
 		        case "T44E" :return <T44E   {...props}  onValue={onValue}   />;
 		        case "T44F" :return <T44F   {...props}  onValue={onValue}   />;
 		        case "T44H" :return <T44H   {...props}  onValue={onValue}   />;
+				case "T44J" :return <T44J   {...props}  onValue={onValue}   />;
 		        case "T45A" :return <T45A   {...props}  onValue={onValue}   />;
 		        case "T45B" :return <T45B   {...props}  onValue={onValue}   />;
 		        case "T45C" :return <T45C   {...props}  onValue={onValue}   />;