From 2f3b614bb34f5e2865e91c949712f5ee5e8a18f2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 21:43:52 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/double-data-card/options.jsx | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index 1334c99..1941d17 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -91,6 +91,7 @@
controlFields: [
{field: 'selected', values: ['radio', 'checkbox']},
{field: 'selStyle', values: ['radio', 'checkbox']},
+ {field: 'pickup', values: ['radio', 'checkbox']},
],
},
{
@@ -111,20 +112,33 @@
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: '鍕鹃�夛紙鏂规锛�'}
]
},
{
type: 'radio',
+ field: 'pickup',
+ label: '鏀惰捣寮�鍏�',
+ initval: wrap.pickup || 'false',
+ tooltip: '鏁版嵁鍗″彸涓婅浼氭樉绀烘敹璧峰紑鍏炽��',
+ required: false,
+ options: [
+ {value: 'false', label: '鏃�'},
+ {value: 'true', label: '鏈�'},
+ ],
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'radio',
field: 'parity',
label: '濂囧伓鑳屾櫙',
initval: wrap.parity || 'false',
--
Gitblit v1.8.0