From a8507cc8c42d17d4fb854594dbf1e084d61912ac Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 18 十月 2022 12:44:22 +0800
Subject: [PATCH] 2022-10-18

---
 src/templates/zshare/modalform/index.jsx |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 9be8093..7b0eb1f 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -46,7 +46,6 @@
 
 class MainSearch extends Component {
   static propTpyes = {
-    dict: PropTypes.object,    // 瀛楀吀椤�
     formlist: PropTypes.any,
     standardform: PropTypes.any,
     card: PropTypes.object,
@@ -142,6 +141,9 @@
       }
       if (this.record.regular !== '') {
         shows.push('regularText')
+        if (this.record.regular !== 'phone' && this.record.regular !== 'email') {
+          shows.push('regularExtra')
+        }
       }
     } else if (type === 'number') {
       reTypes.initval = 'number'
@@ -565,7 +567,6 @@
 
   getFields() {
     const { getFieldDecorator } = this.props.form
-    const { dict } = this.props
     const { transfield } = this.state
     const fields = []
 
@@ -581,7 +582,7 @@
 
       if (item.type === 'text') {
         rules = [
-          { required: item.required, message: dict['form.required.input'] + item.label + '!' },
+          { required: item.required, message: '璇疯緭鍏�' + item.label + '!' },
           {
             pattern: /^[^']*$/ig,
             message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
@@ -594,6 +595,11 @@
           }, {
             max: formRule.field.max,
             message: formRule.field.maxMessage
+          })
+        } else if (item.key === 'regularExtra') {
+          rules.push({
+            pattern: /^[~!@#$%^&*()_+:;{}<>,.-]*$/,
+            message: '鎵╁睍绗﹀寘鎷瑍!@#$%^&*()_+:;{}<>,.-'
           })
         } else if (item.max) {
           rules.push({
@@ -610,7 +616,7 @@
         content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
       } else if (item.type === 'number') {
         rules = [
-          { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+          { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
         ]
         initVal = item.initVal
 
@@ -621,7 +627,7 @@
         }
       } else if (item.type === 'select') {
         rules = [
-          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+          { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
         ]
         content = <Select
           showSearch
@@ -649,7 +655,7 @@
         </Select>
       } else if (item.type === 'radio') {
         rules = [
-          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+          { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
         ]
         initVal = item.initVal
 
@@ -662,7 +668,7 @@
         </Radio.Group>
       } else if (item.type === 'checkbox') {
         rules = [
-          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+          { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
         ]
         initVal = item.initVal
 
@@ -671,7 +677,7 @@
         </Checkbox.Group>
       } else if (item.type === 'codemirror') {
         rules = [
-          { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+          { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
         ]
         span = 24
         className = 'text-area'
@@ -685,7 +691,7 @@
         span = 24
         className = 'text-msg'
         rules = [
-          { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+          { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
         ]
 
         content = <TextArea rows={item.rows || 4}/>
@@ -716,7 +722,7 @@
           if (this.record.linkField) {
             type = 'link'
           }
-          content = <DataTable dict={this.props.dict} type={type} display={this.record.display} linkSubFields={linkSubFields} transfield={transfield} fields={this.record.fields || []} onChange={this.changeOptions}/>
+          content = <DataTable type={type} display={this.record.display} linkSubFields={linkSubFields} transfield={transfield} fields={this.record.fields || []} onChange={this.changeOptions}/>
         }
       } else if (item.type === 'fields') {
         span = 24
@@ -729,13 +735,13 @@
       } else if (item.type === 'color') {
         className = 'color-form-item'
         rules = [
-          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+          { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
         ]
 
         content = <ColorSketch allowClear={true}/>
       } else if (item.type === 'icon') {
         rules = [
-          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+          { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
         ]
 
         content = <MkEditIcon allowClear />
@@ -877,6 +883,10 @@
             values.initval = ''
           } else if (values.type === 'split') {
             values.span = 24
+          } else if (values.type === 'text') {
+            if (values.regularExtra) {
+              values.regularExtra = Array.from(new Set(values.regularExtra.split(''))).join('')
+            }
           }
 
           ['linkField', 'valueField', 'valueText', 'orderBy'].forEach(item => {

--
Gitblit v1.8.0