From 4587b07918b19e9724439d773b0ba28f388057df Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:05:40 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/zshare/formconfig.jsx |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 60ea825..750ad13 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -355,6 +355,12 @@
     }, {
       value: 'group',
       text: '鏃ユ湡锛堢粍鍚堬級'
+    }, {
+      value: 'switch',
+      text: '寮�鍏�'
+    }, {
+      value: 'check',
+      text: '鍕鹃�夋'
     }]
   }
 
@@ -834,6 +840,42 @@
         value: 'custom',
         text: '鑷畾涔�'
       }]
+    },
+    {
+      type: 'text',
+      key: 'openVal',
+      label: '寮�鍚��',
+      initVal: card.openVal || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'closeVal',
+      label: '鍏抽棴鍊�',
+      initVal: card.closeVal || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'openText',
+      label: '寮�鍚彁绀�',
+      initVal: card.openText || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'closeText',
+      label: '鍏抽棴鎻愮ず',
+      initVal: card.closeText || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'checkTip',
+      label: '鎻愮ず',
+      initVal: card.checkTip || '',
+      tooltip: '鍕鹃�夋鍚庣殑鎻愮ず鏂囧瓧',
+      required: false
     },
     {
       type: 'color',
@@ -1477,16 +1519,6 @@
         value: 'close',
         text: '鍏抽棴'
       }]
-    },
-    {
-      type: 'text',
-      key: 'preFunc',
-      label: '鍓嶇疆鍑芥暟',
-      initVal: card.preFunc || '',
-      tooltip: usefulFields.length ? `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般�俙 : '',
-      fields: usefulFields,
-      required: false,
-      readonly: false
     },
     {
       type: 'radio',
@@ -2468,6 +2500,9 @@
     value: 'switch',
     text: '寮�鍏�'
   }, {
+    value: 'check',
+    text: '鍕鹃�夋'
+  }, {
     value: 'checkbox',
     text: '澶氶�夋'
   }, {
@@ -2542,6 +2577,9 @@
       value: 'switch',
       text: '寮�鍏�'
     }, {
+      value: 'check',
+      text: '鍕鹃�夋'
+    }, {
       value: 'checkbox',
       text: '澶氶�夋'
     }, {
@@ -2610,7 +2648,7 @@
   }
 
   let initval = card.initval || ''
-  if (card.type === 'switch') {
+  if (card.type === 'switch' || card.type === 'check') {
     initval = card.initval === true
   } else if (card.type === 'number') {
     initval = card.initval || 0
@@ -2687,6 +2725,14 @@
       key: 'closeText',
       label: '鍏抽棴鎻愮ず',
       initVal: card.closeText || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'checkTip',
+      label: '鎻愮ず',
+      initVal: card.checkTip || '',
+      tooltip: '鍕鹃�夋鍚庣殑鎻愮ず鏂囧瓧',
       required: false
     },
     {
@@ -3942,6 +3988,8 @@
       options: [
         {value: 'default', text: '榛樿'},
         {value: 'board', text: '闈㈡澘'},
+        {value: 'board-block', text: '闈㈡澘2'},
+        {value: 'dropdown', text: '涓嬫媺妗�'},
       ],
       forbid: appType !== 'mob'
     },

--
Gitblit v1.8.0