From 32b84012bb8e2f05295c4237d17224700b149c8f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 16:33:27 +0800
Subject: [PATCH] merge 2020-12-31

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

diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 2571aef..fe4286e 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -93,15 +93,18 @@
     let deForms = []    // 闇�瑕佸姩鎬佽幏鍙栦笅鎷夎彍鍗曠殑琛ㄥ崟
 
     formlist.forEach(item => {
-      if (item.type === 'text' || item.type === 'number') {                // 鐢ㄤ簬杩囨护涓嬫媺鑿滃崟鍏宠仈琛ㄥ崟
+      if (item.type === 'text' || item.type === 'number') {              // 鐢ㄤ簬杩囨护涓嬫媺鑿滃崟鍏宠仈琛ㄥ崟
         _inputfields.push(item.field)
-      } else if (item.type === 'textarea' && item.encryption === 'true') { // 鍔犲瘑瀛楁
-        encrypts.push(item.field)
+      } else if (item.type === 'textarea') {
+        _inputfields.push(item.field)
+        if (item.encryption === 'true') {                                // 鍔犲瘑瀛楁
+          encrypts.push(item.field)
+        }
       } else if (item.type === 'link') {
         linkFields[item.linkField] = linkFields[item.linkField] || []
         linkFields[item.linkField].push(item.field)
       }
-      if (item.interception === 'true') {                                  // 瀛楃鎴彇瀛楁
+      if (item.interception === 'true') {                                // 瀛楃鎴彇瀛楁
         intercepts.push(item.field)
       }
     })
@@ -120,6 +123,7 @@
         _fieldlen = item.fieldlength || 512
       } else if (item.type === 'number') {
         _fieldlen = item.decimal ? item.decimal : 0
+        item.initval = item.initval || 0
       }
 
       datatype[item.field] = item.type
@@ -800,7 +804,6 @@
           </Col>
         )
       } else if (item.type === 'number') { // 鏁板瓧
-        let _initval = item.initval
         let precision = (item.decimal || item.decimal === 0) ? item.decimal : null
 
         fields.push(
@@ -812,7 +815,7 @@
               </Tooltip> : item.label
             }>
               {getFieldDecorator(item.field, {
-                initialValue: _initval,
+                initialValue: item.initval,
                 rules: [
                   {
                     required: true,

--
Gitblit v1.8.0