From c5b6f6cb5bba7268aaa2496bbf21bf2965277f8b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 01 七月 2022 13:29:03 +0800
Subject: [PATCH] 2022-07-01

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

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 9eb47d7..343c0b7 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -461,6 +461,9 @@
       }, {
         value: 'picture',
         text: '鍥剧墖'
+      }, {
+        value: 'color',
+        text: '鑹插潡'
       }]
     },
     {
@@ -827,19 +830,29 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'selectStyle',
+      label: '閫変腑鏁堟灉',
+      tooltip: '鑳屾櫙鍙婃枃瀛楀彉鍖栨椂浼氫娇鐢ㄧ郴缁熻壊銆�',
+      initVal: card.selectStyle || (card.backgroundColor ? 'custom' : 'background'),
+      options: [{
+        value: 'background',
+        text: '鑳屾櫙鍙樺寲'
+      }, {
+        value: 'font',
+        text: '鏂囧瓧鍙樺寲'
+      }, {
+        value: 'custom',
+        text: '鑷畾涔�'
+      }]
+    },
+    {
       type: 'color',
       key: 'backgroundColor',
       label: '鑳屾櫙鑹�',
       initVal: card.backgroundColor || '',
       tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
-      required: false
-    },
-    {
-      type: 'color',
-      key: 'borderColor',
-      label: '杈规棰滆壊',
-      initVal: card.borderColor || '',
-      required: false
+      required: true
     },
     {
       type: 'multiselect',
@@ -2579,6 +2592,9 @@
       }, {
         value: 'picture',
         text: '鍥剧墖'
+      }, {
+        value: 'color',
+        text: '鑹插潡'
       }]
     },
     {
@@ -2610,9 +2626,9 @@
     },
     {
       type: 'radio',
-      key: 'ratio',
+      key: 'picratio',
       label: '鍥剧墖姣斾緥',
-      initVal: card.ratio || '1:1',
+      initVal: card.picratio || card.ratio || '1:1',
       required: true,
       options: [{
         value: '1:1',
@@ -3142,19 +3158,29 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'selectStyle',
+      label: '閫変腑鏁堟灉',
+      tooltip: '鑳屾櫙鍙婃枃瀛楀彉鍖栨椂浼氫娇鐢ㄧ郴缁熻壊銆�',
+      initVal: card.selectStyle || (card.backgroundColor ? 'custom' : 'background'),
+      options: [{
+        value: 'background',
+        text: '鑳屾櫙鍙樺寲'
+      }, {
+        value: 'font',
+        text: '鏂囧瓧鍙樺寲'
+      }, {
+        value: 'custom',
+        text: '鑷畾涔�'
+      }]
+    },
+    {
       type: 'color',
       key: 'backgroundColor',
       label: '鑳屾櫙鑹�',
       initVal: card.backgroundColor || '',
       tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
-      required: false
-    },
-    {
-      type: 'color',
-      key: 'borderColor',
-      label: '杈规棰滆壊',
-      initVal: card.borderColor || '',
-      required: false
+      required: true
     },
     {
       type: 'radio',

--
Gitblit v1.8.0