From 2aa5ab63b4bbce5c36dbb3511b205b3b5f6af9bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 五月 2024 11:34:20 +0800
Subject: [PATCH] 2024-05-07

---
 src/tabviews/zshare/mutilform/index.jsx |   66 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 9ab8e55..309cff6 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -80,7 +80,18 @@
     }
 
     formlist = formlist.filter(item => {
+      if (item.type === 'hint') {
+        if (item.field && data[item.field.toLowerCase()]) {
+          item.message = data[item.field.toLowerCase()]
+        }
+        delete item.field
+      }
+
       if (item.supField) { // 澶氬眰琛ㄥ崟鎺у埗
+        if (['hint', 'split', 'formula'].includes(item.type)) {
+          item.field = item.uuid
+          fieldMap.set(item.field, item)
+        }
         let supvals = []
         if (item.supvalue) {
           item.supvalue.split(',').forEach(val => {
@@ -115,14 +126,8 @@
         }
       }
 
-      if (item.type === 'split' || item.type === 'formula') return true
-      if (item.type === 'hint') {
-        if (item.field && data[item.field.toLowerCase()]) {
-          item.message = data[item.field.toLowerCase()]
-        }
-        delete item.field
-        return true
-      } else if (item.type === 'date') {
+      if (['hint', 'split', 'formula'].includes(item.type)) return true
+      if (item.type === 'date') {
         item.precision = item.precision || 'day'
       } else if (item.type === 'datetime') {
         item.type = 'date'
@@ -143,6 +148,7 @@
       item.readin = item.readin !== 'false' && item.readin !== 'top'
       item.readonly = check || item.readonly === 'true'
       item.writein = item.writein !== 'false'
+      item.defHidden = item.hidden === 'true'
       item.hidden = item.hidden === 'true'
       item.fieldlength = item.fieldlength || 50
 
@@ -261,6 +267,12 @@
           newval = item.openVal
         } else {
           newval = item.closeVal
+        }
+      } else if (item.type === 'popSelect') {
+        if (newval && newval !== '$empty') {
+          item.showValue = data[item.showField.toLowerCase()] || ''
+        } else {
+          item.showValue = ''
         }
       }
 
@@ -486,7 +498,7 @@
 
         let _hidden = false
 
-        if (supItem.hidden) {
+        if (supItem.hidden && !supItem.defHidden) {
           _hidden = true
         } else {
           let box = [...item.values]
@@ -524,7 +536,7 @@
         cell.labelCol = {style: {width: cell.labelwidth + '%'}}
         cell.wrapperCol = {style: {width: (100 - cell.labelwidth) + '%'}}
       }
-      if (!cell.field || !fieldMap.has(cell.field)) return cell
+      if (!cell.field || !fieldMap.has(cell.field) || ['hint', 'split', 'formula'].includes(cell.type)) return cell
       let item = fieldMap.get(cell.field)
 
       // 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆
@@ -1217,11 +1229,17 @@
       if (item.hidden) return
 
       if (item.type === 'split') {
-        fields.push(
-          <Col span={24} key={index}>
-            <p className="mk-form-split-line" style={item.style}>{item.label}</p>
-          </Col>
-        )
+        if (item.opacity === 'false') {
+          fields.push(
+            <div key={index}></div>
+          )
+        } else {
+          fields.push(
+            <Col span={24} key={index}>
+              <p className="mk-form-split-line" style={item.style}>{item.label}</p>
+            </Col>
+          )
+        }
       } else if (item.type === 'hint') {
         fields.push(
           <Col span={item.span || 24} key={index}>
@@ -1269,7 +1287,7 @@
         } else if (item.type === 'radio') {
           content = (<MKRadio config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
         } else if (item.type === 'date' || item.type === 'datemonth') {
-          content = (<MKDatePicker config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
+          content = (<MKDatePicker config={item} onChange={(val) => this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit}/>)
         } else if (item.type === 'fileupload') {
           className = item.readonly ? 'readonly' : ''
           className += item.fileType === 'picture-card' ? ' file-upload' : ''
@@ -1324,7 +1342,7 @@
         let record = {...this.record, ...values}
 
         formlist.forEach(item => {
-          if (!item.field) return
+          if (!item.field || ['hint', 'split', 'formula'].includes(item.type)) return
     
           let _item = {
             type: item.type,
@@ -1357,6 +1375,20 @@
                   console.warn(e)
                   _item.value = ''
                 }
+              } else if (item.interception === 'charTure') {
+                let str = _item.value.replace(/(^\s*|\s*$)/g, '')
+                let result = ''
+                for (let i = 0 ; i < str.length; i++) {
+                  let code = str.charCodeAt(i)
+                  if (code >= 65281 && code <= 65373) {
+                    result += String.fromCharCode(str.charCodeAt(i) - 65248)
+                  } else if (code === 12288) {
+                    result += String.fromCharCode(str.charCodeAt(i) - 12288 + 32)
+                  } else {
+                    result += str.charAt(i)
+                  }
+                }
+                _item.value = result
               } else {
                 _item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
               }

--
Gitblit v1.8.0