From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/card/data-card/options.jsx | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index e532cdc..4b010f9 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -161,7 +161,7 @@
{value: 'public', label: '鍏叡鏁版嵁婧�', priKeyType: 'static'},
],
linkFields: ['priKeyType'],
- controlFields: [
+ controlFields: subtype === 'propcard' ? [
{field: 'goback', values: ['dynamic', 'public']},
{field: 'empty', values: ['dynamic', 'public']},
{field: 'jump', values: ['dynamic', 'public']},
@@ -169,7 +169,7 @@
{field: 'supModule', values: ['static']},
{field: 'publicId', values: ['public']},
{field: 'emptyExec', values: ['dynamic', 'public']},
- ],
+ ] : null,
forbid: subtype !== 'propcard'
},
{
@@ -218,8 +218,8 @@
field: 'zHeight',
label: '鏈�澶ч珮搴�',
initval: wrap.zHeight || '',
- tooltip: '鍗＄墖鍐呭鍖虹殑鏈�澶ч珮搴︼紙涓嶅寘鍚爣棰樸�佺炕椤电瓑鍏冪礌锛夛紝娣诲姞楂樺害鍚庣粍浠朵腑绗竴涓睘鎬у崱灏嗗浐瀹氫簬澶撮儴銆傛敞锛氬皬浜庣瓑浜�100鏃朵负楂樺害鐨勭櫨鍒嗘瘮銆�',
- min: 10,
+ tooltip: '鍗＄墖鍐呭鍖虹殑鏈�澶ч珮搴︼紙涓嶅寘鍚爣棰樸�佺炕椤电瓑鍏冪礌锛夛紝娣诲姞楂樺害鍚庣粍浠朵腑绗竴涓睘鎬у崱灏嗗浐瀹氫簬澶撮儴銆傛敞锛氬皬浜庣瓑浜�100澶т簬0鏃朵负楂樺害鐨勭櫨鍒嗘瘮锛屽皬浜�0鏃朵负绐楀彛楂樺害鍑忓幓姝ゅ�笺��',
+ min: -1000,
max: 3000,
precision: 0,
required: false,
@@ -273,10 +273,10 @@
required: false,
linkField: 'datatype',
options: [
- {ParentID: '', value: 'static', label: '闈欐�佸��'},
{ParentID: 'dynamic', value: 'dynamic', label: '鍔ㄦ�佸��'},
- {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
{ParentID: 'public', value: 'dynamic', label: '鍔ㄦ�佸��'},
+ {ParentID: '', value: 'static', label: '闈欐�佸��'},
+ {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
{ParentID: 'public', value: 'joint', label: '鎷兼帴鍊�'},
],
forbid: subtype !== 'propcard'
@@ -314,7 +314,7 @@
type: 'select',
field: 'selStyle',
label: '閫変腑椋庢牸',
- initval: wrap.selStyle || 'active',
+ initval: wrap.selStyle || 'none',
tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
required: false,
options: [
@@ -440,9 +440,9 @@
{value: 'normal', label: '姝ｅ父鏄剧ず'},
{value: 'hidden', label: '涓嶅彲瑙�'},
],
- controlFields: [
+ controlFields: subtype === 'propcard' ? [
{field: 'empty', values: ['normal']},
- ],
+ ] : null,
forbid: subtype !== 'propcard'
},
{
@@ -452,11 +452,26 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
],
+ controlFields: [
+ {field: 'empSign', values: ['show']},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'empSign',
+ label: '绌哄�煎浘鏍�',
+ initval: wrap.empSign || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛屾槸鍚︽樉绀虹┖鍊兼彁绀哄浘鏍囥��',
+ required: false,
+ options: [
+ {value: 'show', label: '鏄剧ず'},
+ {value: 'hidden', label: '闅愯棌'},
+ ],
+ forbid: subtype === 'propcard'
},
{
type: 'select',
@@ -578,6 +593,7 @@
tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns,
controlFields: [
{field: 'controlVal', notNull: true},
@@ -644,20 +660,19 @@
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !!appType || isprint
+ forbid: !!appType || subtype === 'propcard' || isprint
},
{
type: 'radio',
field: 'searchBtn',
label: '鎼滅储鎸夐挳',
initval: wrap.searchBtn || 'hidden',
- // tooltip: '鍚敤鎼滅储鏉′欢缂撳瓨鍚庯紝鍦ㄨ彍鍗曞埛鏂版椂鎼滅储鏉′欢涓嶅彉銆�',
required: false,
options: [
{value: 'hidden', label: '闅愯棌'},
{value: 'show', label: '鏄剧ず'},
],
- forbid: appType === 'mob' || isprint,
+ forbid: appType === 'mob' || subtype === 'propcard' || isprint,
},
{
type: 'radio',
--
Gitblit v1.8.0