From 432b788acf901b0720184b8ee8bc81a2e6fa47e0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 九月 2021 18:22:02 +0800
Subject: [PATCH] 2021-09-28

---
 src/tabviews/zshare/mutilform/index.jsx |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index eda166d..184bddf 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -52,6 +52,7 @@
     let record = {}
     let formlist = fromJS(action.fields).toJS()
     let fieldMap = new Map()
+    let check = action.setting.formType === 'check'
 
     formlist = formlist.filter(item => {
       if (item.supField && item.supvalue) { // 澶氬眰琛ㄥ崟鎺у埗
@@ -75,13 +76,15 @@
       if (!item.field || !['text', 'number', 'switch', 'select', 'link', 'linkMain', 'funcvar', 'date', 'datemonth', 'datetime', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color'].includes(item.type)) return false
 
       // 鏁版嵁鑷姩濉厖
-      item.readin = item.readin !== 'false'
-      item.readonly = item.readonly === 'true'
+      let readin = item.readin !== 'false'
+      item.readin = item.readin !== 'false' && item.readin !== 'top'
+      item.readonly = check || item.readonly === 'true'
       item.writein = item.writein !== 'false'
       item.hidden = item.hidden === 'true'
       item.fieldlength = item.fieldlength || 50
 
       if (item.type === 'funcvar') {
+        readin = false
         item.readin = false
         item.hidden = true
       } else if (item.type === 'number') {
@@ -110,7 +113,7 @@
 
       let newval = '$empty'
 
-      if (item.readin && data && data.hasOwnProperty(item.field)) {
+      if (readin && data && data.hasOwnProperty(item.field)) {
         newval = data[item.field]
       }
       if (item.type === 'linkMain') {
@@ -160,6 +163,9 @@
       }
 
       if (item.type === 'text') {
+        if (typeof(item.initval) === 'number') {
+          item.initval = item.initval + ''
+        }
         let _rules = [{
           pattern: /^[^']*$/ig,
           message: formRule.input.quotemsg
@@ -321,7 +327,7 @@
       }
 
       // 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆
-      if ((['select', 'radio'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true')) && item.linkSubField) {
+      if ((['select', 'radio', 'link'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true')) && item.linkSubField) {
         item.subFields = []
         item.linkSubField.forEach(m => {
           let n = fieldMap.get(m)
@@ -529,7 +535,7 @@
   }
 
   resetFormList = (result) => {
-    let _formlist = this.state.formlist.map(item => {
+    let _formlist = fromJS(this.state.formlist).toJS().map(item => {
       if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
         let options = []
         result[item.field].forEach(cell => {
@@ -546,10 +552,15 @@
   
           if (item.type === 'link') {
             _cell.ParentID = cell[item.linkField] === undefined ? '' : cell[item.linkField]
-          } else if (item.subFields) {
+          }
+          if (item.subFields) {
             item.subFields.forEach(m => {
-              _cell[m.field] = (cell[m.field] || cell[m.field] === 0) ? cell[m.field] : ''
+              _cell[m.field] = cell[m.field] === undefined ? '' : cell[m.field]
             })
+          }
+
+          if (item.disableField && cell[item.disableField] && /^true$/ig.test(cell[item.disableField])) {
+            _cell.$disabled = true
           }
   
           options.push(_cell)
@@ -669,7 +680,7 @@
         } else if (item.type === 'color') {
           content = (<MKColor config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
         } else if (item.type === 'checkcard') {
-          className = "checkcard"
+          className = 'checkcard'
           content = (<MKCheckCard config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
         } else if (item.type === 'switch') {
           content = (<MKSwitch config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
@@ -680,6 +691,8 @@
         } else if (item.type === 'date' || item.type === 'datemonth' || item.type === 'datetime') {
           content = (<MKDatePicker config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
         } else if (item.type === 'fileupload') {
+          className = item.readonly ? 'readonly' : ''
+          className += item.fileType === 'picture-card' ? ' file-upload' : ''
           content = (<MKFileUpload config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
         } else if (item.type === 'textarea') {
           content = (<MKTextArea config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})}/>)
@@ -775,7 +788,7 @@
     }
 
     return (
-      <Form className={'main-form-field ' + _align} id="main-form-box">
+      <Form className={'main-form-field ' + _align}>
         <Row gutter={24}>{this.getFields()}</Row>
       </Form>
     )

--
Gitblit v1.8.0