From 523cec6c87d88b43954a4409a8dfde6aade095a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 五月 2020 11:02:10 +0800
Subject: [PATCH] 2020-05-22

---
 src/templates/zshare/formconfig.jsx |   93 +++++++++++++++++++++++++++++++---------------
 1 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 9d5a4b2..de59543 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1267,17 +1267,6 @@
       required: true
     },
     {
-      type: 'number',
-      key: 'width',
-      min: 1,
-      max: 24,
-      decimal: 0,
-      label: '瀹藉害',
-      tooltip: '姣忚绛夊垎涓�24鍒楋紝24鍗充负100%銆�',
-      initVal: card.width || 24,
-      required: true
-    },
-    {
       type: 'radio',
       key: 'Hide',
       label: Formdict['header.form.Hide'],
@@ -1292,12 +1281,39 @@
       }]
     },
     {
+      type: 'number',
+      key: 'width',
+      min: 1,
+      max: 24,
+      decimal: 0,
+      label: '鍥捐〃瀹藉害',
+      tooltip: '姣忚绛夊垎涓�24鍒楋紝24鍗充负100%銆�',
+      initVal: card.width || 24,
+      required: true
+    },
+    {
       type: 'radio',
-      key: 'widthType',
-      label: '瀹藉害绫诲瀷',
-      initVal: card.widthType || 'ratio',
+      key: 'over',
+      label: '瓒呭嚭鏃�',
+      initVal: card.over || 'whole',
       required: true,
       hidden: true,
+      options: [{
+        value: 'whole',
+        text: '灞曠ず鍏ㄩ儴'
+      }, {
+        value: 'roll',
+        text: '婊氬姩'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'widthType',
+      label: '瀹藉害璁剧疆',
+      initVal: card.over === 'roll' ? 'absolute' : card.widthType || 'ratio',
+      required: true,
+      hidden: true,
+      readonly: card.over === 'roll',
       options: [{
         value: 'ratio',
         text: '姣斾緥'
@@ -1319,21 +1335,6 @@
       required: true
     },
     {
-      type: 'radio',
-      key: 'over',
-      label: '瓒呭嚭鏃�',
-      initVal: card.over || 'roll',
-      required: true,
-      hidden: true,
-      options: [{
-        value: 'whole',
-        text: '灞曠ず鍏ㄩ儴'
-      }, {
-        value: 'roll',
-        text: '婊氬姩'
-      }]
-    },
-    {
       type: 'select',
       key: 'bgfield',
       label: '鑳屾櫙鎺у埗',
@@ -1342,6 +1343,36 @@
       readonly: false,
       hidden: true,
       options: _columns
+    },
+    {
+      type: 'radio',
+      key: 'border',
+      label: '杈规',
+      initVal: card.border || 'show',
+      required: false,
+      hidden: true,
+      options: [{
+        value: 'show',
+        text: '鏄剧ず'
+      }, {
+        value: 'hidden',
+        text: '闅愯棌'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'switch',
+      label: '鏁版嵁鍒囨崲',
+      initVal: card.switch || 'true',
+      required: false,
+      hidden: true,
+      options: [{
+        value: 'true',
+        text: '鏄�'
+      }, {
+        value: 'false',
+        text: '鍚�'
+      }]
     },
     {
       type: 'multiselect',
@@ -2236,9 +2267,9 @@
       type: 'radio',
       key: 'show',
       label: '鏄剧ず',
-      initVal: card.show || '',
+      initVal: card.show || 'icon',
       required: false,
-      forbid: !['bottom'].includes(_type),
+      forbid: !['bottom', 'header'].includes(_type),
       options: [{
         value: 'icon',
         text: '鍥炬爣'

--
Gitblit v1.8.0