From 0844cf7a0de1b38ff9649e7958adbfffe1b3532d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 九月 2023 10:09:48 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/card/double-data-card/options.jsx |   26 +++++---------------------
 1 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index dac4c9e..3bdc566 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -60,22 +60,6 @@
       precision: 0,
       required: true
     },
-    // {
-    //   type: 'radio',
-    //   field: 'layout',
-    //   label: '鍗$墖甯冨眬',
-    //   initval: wrap.layout || 'grid',
-    //   tooltip: appType === 'mob' ? '寮规�у竷灞�鏃讹紝婊戝姩鍔犺浇鏃犳晥' : '',
-    //   required: false,
-    //   options: [
-    //     {value: 'grid', label: '鏍呮牸甯冨眬'},
-    //     {value: 'flex', label: '寮规�у竷灞�'},
-    //   ],
-    //   controlFields: [
-    //     {field: 'printHeight', values: ['flex']},
-    //     {field: 'cardFloat', values: ['grid']},
-    //   ]
-    // },
     {
       type: 'radio',
       field: 'pagestyle',
@@ -127,14 +111,14 @@
       type: 'select',
       field: 'selStyle',
       label: '閫変腑椋庢牸',
-      initval: wrap.selStyle || 'active',
-      tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
+      initval: wrap.selStyle || 'check',
+      // tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
       required: false,
       options: [
         {value: 'none', label: '鏃�'},
-        {value: 'active', label: '澶栭槾褰�'},
-        {value: 'backFont', label: '鑳屾櫙+鏂囧瓧'},
-        {value: 'font', label: '鏂囧瓧'},
+        // {value: 'active', label: '澶栭槾褰�'},
+        // {value: 'backFont', label: '鑳屾櫙+鏂囧瓧'},
+        // {value: 'font', label: '鏂囧瓧'},
         {value: 'check', label: '鍕鹃�夛紙鍦嗘锛�'},
         {value: 'check square', label: '鍕鹃�夛紙鏂规锛�'}
       ]

--
Gitblit v1.8.0