From 43008f1240d6568a3364721bb01fc7e31b33d147 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:39:51 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/data-card/options.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 0140681..3d2fa34 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -413,10 +413,10 @@
field: 'autoExec',
label: '鑷姩鎵ц',
initval: wrap.autoExec || '',
- tooltip: '鏁版嵁鏇存柊鏃惰嚜鍔ㄦ墽琛屾寜閽�傛敞锛氭鎸夐挳鎵ц鎴愬姛鍚庤皑鎱庨�夋嫨鍒锋柊椤癸紝閬垮厤閫犳垚寰幆鎵ц銆�',
+ tooltip: subtype === 'propcard' ? '鏁版嵁鏇存柊鏃惰嚜鍔ㄦ墽琛屾寜閽�傛敞锛氭鎸夐挳鎵ц鎴愬姛鍚庤皑鎱庨�夋嫨鍒锋柊椤癸紝閬垮厤閫犳垚寰幆鎵ц銆�' : '鍒濆鍖栬嚜鍔ㄦ墽琛屾寜閽��',
required: false,
options: buttons,
- forbid: subtype !== 'propcard',
+ forbid: subtype !== 'propcard' && subtype !== 'datacard',
controlFields: [
{field: 'emptyExec', notNull: true},
]
@@ -646,6 +646,7 @@
required: true,
forbid: subtype !== 'datacard' || appType === 'mob' || isprint,
span: 24,
+ actions: ['edit', 'del', 'add', 'move'],
columns: [
{
title: '搴忓彿',
--
Gitblit v1.8.0