From bf772e586c29b4858366dbad143b1eaeca3c46ed Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 四月 2020 10:18:09 +0800
Subject: [PATCH] 2020-04-17

---
 src/tabviews/formtab/formgroup/index.jsx |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/formtab/formgroup/index.jsx b/src/tabviews/formtab/formgroup/index.jsx
index 3d9d77d..fd323ae 100644
--- a/src/tabviews/formtab/formgroup/index.jsx
+++ b/src/tabviews/formtab/formgroup/index.jsx
@@ -121,7 +121,10 @@
         let _readin = item.readin !== 'false'
         if (item.type === 'funcvar') {
           _readin = false
+          item.initval = '' // 鍒濆鍖栦负绌�
         }
+
+        item.initVal = item.initval ? JSON.parse(JSON.stringify(item.initval)) : ''
 
         let _fieldlen = item.fieldlength || 50
         if (item.type === 'textarea' || item.type === 'fileupload' || item.type === 'multiselect') {
@@ -567,19 +570,26 @@
             if (!item.field) return
 
             if (item.type === 'funcvar') {
+              let _val = item.initval
+              if (values.hasOwnProperty(item.field)) {
+                _val = values[item.field] === '绯荤粺鑷姩鐢熸垚' ? '' : values[item.field]
+              } else if (record.hasOwnProperty(item.field)) {
+                _val = record[item.field]
+              }
               search.push({
                 type: 'funcvar',
                 readonly: 'true',
                 readin: false,
                 fieldlen: this.state.fieldlen[item.field],
                 key: item.field,
-                value: ''
+                value: _val
               })
             } else if (item.hidden === 'true' && item.field !== this.props.setting.primaryKey) {
               let _val = item.initval
               if (record.hasOwnProperty(item.field)) {
                 _val = record[item.field]
               }
+
               search.push({
                 type: this.state.datatype[item.field],
                 readonly: this.state.readtype[item.field],
@@ -587,6 +597,15 @@
                 fieldlen: this.state.fieldlen[item.field],
                 key: item.field,
                 value: _val
+              })
+            } else if (item.supField && !item.supvalue.includes(this.props.form.getFieldValue(item.supField))) {
+              search.push({
+                type: this.state.datatype[item.field],
+                readonly: this.state.readtype[item.field],
+                readin: this.state.readin[item.field],
+                fieldlen: this.state.fieldlen[item.field],
+                key: item.field,
+                value: item.initVal
               })
             }
           })
@@ -644,7 +663,7 @@
               value: _value
             })
           })
-          resolve(search)
+          // resolve(search)
         } else {
           reject(err)
         }

--
Gitblit v1.8.0