From 742f7d11557526038d332e60a8c8ca18177bc4e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:58 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/data-card/options.jsx | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index adc2931..818913d 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -106,6 +106,7 @@
{field: 'broadcast', values: ['dynamic', 'public']},
{field: 'supModule', values: ['static']},
{field: 'publicId', values: ['public']},
+ {field: 'emptyExec', values: ['dynamic', 'public']},
],
forbid: subtype !== 'propcard'
},
@@ -204,7 +205,7 @@
{field: 'checkAll', values: ['checkbox']},
{field: 'selected', values: ['radio', 'checkbox']},
{field: 'selStyle', values: ['radio', 'checkbox']},
- // {field: 'priKeyType', values: ['radio', 'checkbox']},
+ {field: 'pickup', values: ['radio', 'checkbox']},
],
forbid: subtype === 'tablecard'
},
@@ -289,6 +290,19 @@
{value: 'right', label: '鍙冲榻�'},
],
forbid: subtype === 'tablecard'
+ },
+ {
+ type: 'radio',
+ field: 'pickup',
+ label: '鏀惰捣寮�鍏�',
+ initval: wrap.pickup || 'false',
+ tooltip: '鏁版嵁鍗″彸涓婅浼氭樉绀烘敹璧峰紑鍏炽��',
+ required: false,
+ options: [
+ {value: 'false', label: '鏃�'},
+ {value: 'true', label: '鏈�'},
+ ],
+ forbid: subtype !== 'datacard' || appType === 'mob'
},
{
type: 'radio',
@@ -401,7 +415,23 @@
tooltip: '鏁版嵁鏇存柊鏃惰嚜鍔ㄦ墽琛屾寜閽�傛敞锛氭鎸夐挳鎵ц鎴愬姛鍚庤皑鎱庨�夋嫨鍒锋柊椤癸紝閬垮厤閫犳垚寰幆鎵ц銆�',
required: false,
options: buttons,
- forbid: subtype !== 'propcard'
+ forbid: subtype !== 'propcard',
+ controlFields: [
+ {field: 'emptyExec', notNull: true},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'emptyExec',
+ label: '绌哄�兼墽琛�',
+ initval: wrap.emptyExec || 'true',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岃嚜鍔ㄦ墽琛屾寜閽槸鍚︽墽琛屻��',
+ required: false,
+ forbid: subtype !== 'propcard',
+ options: [
+ {value: 'true', label: '鏄�'},
+ {value: 'false', label: '鍚�'},
+ ],
},
{
type: 'radio',
--
Gitblit v1.8.0