From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/data-card/options.jsx | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 29de319..6a799d2 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -209,8 +209,21 @@
controlFields: subtype !== 'propcard' ? [
{field: 'printHeight', values: ['flex']},
{field: 'cardFloat', values: ['grid']},
+ {field: 'zHeight', values: ['grid']},
] : [{field: 'cardFloat', values: ['grid']}],
forbid: subtype === 'tablecard'
+ },
+ {
+ type: 'number',
+ field: 'zHeight',
+ label: '鏈�澶ч珮搴�',
+ initval: wrap.zHeight || '',
+ tooltip: '鍗＄墖鍐呭鍖虹殑鏈�澶ч珮搴︼紙涓嶅寘鍚爣棰樸�佺炕椤电瓑鍏冪礌锛夛紝娣诲姞楂樺害鍚庣粍浠朵腑绗竴涓睘鎬у崱灏嗗浐瀹氫簬澶撮儴銆傛敞锛氬皬浜庣瓑浜�100澶т簬0鏃朵负楂樺害鐨勭櫨鍒嗘瘮锛屽皬浜�0鏃朵负绐楀彛楂樺害鍑忓幓姝ゅ�笺��',
+ min: -1000,
+ max: 3000,
+ precision: 0,
+ required: false,
+ forbid: subtype !== 'datacard' || appType === 'mob'
},
{
type: 'radio',
@@ -565,6 +578,7 @@
tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns,
controlFields: [
{field: 'controlVal', notNull: true},
--
Gitblit v1.8.0