From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/templates/zshare/formconfig.jsx | 187 ++++++++++++++++++++++++++++++++++------------
1 files changed, 136 insertions(+), 51 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index bd96bbb..2dea436 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -386,6 +386,30 @@
})
}
+ let muloptions = [{
+ value: 'false',
+ text: '鍗曢��'
+ }, {
+ value: 'true',
+ text: '澶氶��'
+ }, {
+ value: 'dropdown',
+ text: '涓嬫媺鑿滃崟'
+ }]
+
+ if (appType !== '') {
+ muloptions = [{
+ value: 'false',
+ text: '鍗曢��'
+ }, {
+ value: 'true',
+ text: '澶氶��'
+ }]
+ if (card.multiple === 'dropdown') {
+ card.multiple = 'false'
+ }
+ }
+
return [
{
type: 'text',
@@ -472,12 +496,12 @@
{
type: 'number',
key: 'width',
- min: 1,
+ min: 0,
max: 24,
precision: 0,
label: '鍏冪礌瀹藉害',
- initVal: card.width || 4,
- tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+ initVal: card.width === 0 ? 0 : (card.width || 4),
+ tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼�傛敞锛氬綋瀹藉害涓�0鏃讹紝鍏冪礌鏍规嵁鍐呭鑷�傚簲',
required: true
},
{
@@ -573,14 +597,9 @@
key: 'multiple',
label: '閫夋嫨褰㈠紡',
initVal: card.multiple || 'false',
+ tooltip: appType === '' ? '浣跨敤涓嬫媺鑿滃崟鏃讹紝閫夐」浼氫緷鎹� pid 缁勭粐鏁版嵁鐨勪笂涓嬬骇鍏崇郴锛屼簩绾ч�夐」浼氫笅鎷夊睍绀恒�傛敞锛�1銆佹樉绀轰负鏂囨湰鏃舵湁鏁堬紱2銆佷娇鐢ㄦ暟鎹簮璇疯繑鍥� pid 瀛楁銆�' : '',
required: true,
- options: [{
- value: 'false',
- text: '鍗曢��'
- }, {
- value: 'true',
- text: '澶氶��'
- }]
+ options: muloptions
},
{
type: 'select',
@@ -826,6 +845,20 @@
},
{
type: 'radio',
+ key: 'border',
+ label: '杈规',
+ initVal: card.border || 'show',
+ required: false,
+ options: [{
+ value: 'show',
+ text: '鏄剧ず'
+ }, {
+ value: 'hide',
+ text: '闅愯棌'
+ }]
+ },
+ {
+ type: 'radio',
key: 'selectStyle',
label: '閫変腑鏁堟灉',
tooltip: '鑳屾櫙鍙婃枃瀛楀彉鍖栨椂浼氫娇鐢ㄧ郴缁熻壊銆�',
@@ -884,6 +917,14 @@
initVal: card.backgroundColor || '',
tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
required: true
+ },
+ {
+ type: 'text',
+ key: 'mark',
+ label: '椤剁骇鏍囪瘑',
+ initVal: card.mark || '',
+ tooltip: 'pid涓庨《绾ф爣璇嗙浉鍚屾椂锛岃涓洪《绾ц妭鐐广��',
+ required: false
},
{
type: 'multiselect',
@@ -1204,35 +1245,6 @@
},
{
type: 'radio',
- key: 'method',
- label: '璇锋眰鏂瑰紡',
- initVal: card.method || 'post',
- required: true,
- options: [{
- value: 'get',
- text: 'GET'
- }, {
- value: 'post',
- text: 'POST'
- }]
- },
- {
- type: 'radio',
- key: 'cross',
- label: '璺ㄥ煙璇锋眰',
- initVal: card.cross || 'true',
- tooltip: '濡傛灉鑷畾涔夋帴鍙ｄ笉鏀寔璺ㄥ煙璇锋眰锛屼細閫氳繃褰撳墠绯荤粺杞彂銆�',
- required: false,
- options: [{
- value: 'true',
- text: '鏀寔'
- }, {
- value: 'false',
- text: '涓嶆敮鎸�'
- }]
- },
- {
- type: 'radio',
key: 'callbackType',
label: '鍥炶皟鏂瑰紡',
initVal: card.callbackType || (card.callbackFunc ? 'func' : 'none'),
@@ -1266,6 +1278,52 @@
initVal: card.callbackFunc || '',
required: true,
readonly: false
+ },
+ {
+ type: 'radio',
+ key: 'method',
+ label: '璇锋眰鏂瑰紡',
+ initVal: card.method || 'post',
+ required: true,
+ options: [{
+ value: 'get',
+ text: 'GET'
+ }, {
+ value: 'post',
+ text: 'POST'
+ }]
+ },
+ {
+ type: 'radio',
+ key: 'cross',
+ label: '鎺ュ彛璺ㄥ煙',
+ initVal: card.cross || 'true',
+ tooltip: '濡傛灉鑷畾涔夋帴鍙ｄ笉鏀寔璺ㄥ煙璇锋眰锛屼細閫氳繃褰撳墠绯荤粺杞彂銆�',
+ required: false,
+ options: [{
+ value: 'true',
+ text: '鏀寔'
+ }, {
+ value: 'false',
+ text: '涓嶆敮鎸�'
+ }]
+ },
+ {
+ type: 'radio',
+ key: 'stringify',
+ label: '搴忓垪鍖�',
+ initVal: card.stringify || 'text',
+ required: false,
+ options: [{
+ value: 'text',
+ text: 'Text'
+ }, {
+ value: 'JSON',
+ text: 'JSON'
+ }, {
+ value: 'qs',
+ text: 'qs'
+ }]
},
{
type: 'radio',
@@ -2769,12 +2827,12 @@
{
type: 'number',
key: 'width',
- min: 1,
+ min: 0,
max: 24,
precision: 0,
label: '鍏冪礌瀹藉害',
- initVal: card.width || 4,
- tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+ initVal: card.width === 0 ? 0 : (card.width || 4),
+ tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼�傛敞锛氬綋瀹藉害涓�0鏃讹紝鍏冪礌鏍规嵁鍐呭鑷�傚簲',
required: true
},
{
@@ -2854,6 +2912,7 @@
key: 'dataSource',
label: '鏁版嵁婧�',
initVal: card.dataSource || '',
+ placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆�',
required: true,
readonly: false
},
@@ -3399,6 +3458,36 @@
}, {
value: 'adaptive',
text: '鑷�傚簲'
+ }]
+ },
+ {
+ type: 'radio',
+ key: 'border',
+ label: '杈规',
+ initVal: card.border || 'show',
+ required: false,
+ options: [{
+ value: 'show',
+ text: '鏄剧ず'
+ }, {
+ value: 'hide',
+ text: '闅愯棌'
+ }]
+ },
+ {
+ type: 'radio',
+ key: 'checkAll',
+ label: '鍏ㄩ��',
+ initVal: card.checkAll || 'hide',
+ tooltip: '鍙閫夌殑閫夐」鍗℃槸鍚︽樉绀哄叏閫夊紑鍏筹紝娉細褰撻�夐」澶т簬3涓椂鏈夋晥銆�',
+ required: false,
+ forbid: appType !== '',
+ options: [{
+ value: 'hide',
+ text: '闅愯棌'
+ }, {
+ value: 'show',
+ text: '鏄剧ず'
}]
},
{
@@ -4062,8 +4151,7 @@
key: 'icon',
label: '鍥炬爣',
initVal: card.icon || '',
- required: false,
- forbid: type === 'CalendarPage'
+ required: false
},
{
type: 'select',
@@ -4071,8 +4159,7 @@
label: '涓婄骇鏍囩',
initVal: supMenu,
required: false,
- options: menus,
- forbid: type === 'CalendarPage'
+ options: menus
},
{
type: 'mutilselect',
@@ -4081,8 +4168,7 @@
tooltip: '濡傛灉瀛愭爣绛句腑鍚湁鍒锋柊鍚岀骇鏍囩鐨勬寜閽紝鍦ㄦ澶勬坊鍔犻渶瑕佸埛鏂扮殑鏍囩銆�',
initVal: equalTab,
required: false,
- options: equalTabs,
- forbid: type === 'CalendarPage'
+ options: equalTabs
},
{
type: 'text',
@@ -4090,8 +4176,7 @@
label: '澶栭敭',
tooltip: '澶栭敭鏃ㄥ湪鏍囩椤典腑鎵ц榛樿鍑芥暟锛堟坊鍔狅級鏃讹紝鏇挎崲BID瀛楁',
initVal: card.foreignKey || '',
- required: false,
- forbid: type === 'CalendarPage'
+ required: false
},
{
type: 'number',
@@ -4111,7 +4196,7 @@
initVal: card.searchPass || 'false',
tooltip: '浣跨敤涓昏〃鎼滅储鏉′欢鏃讹紝涓昏〃鐨勬悳绱㈡潯浠朵細浼犲叆瀛愯〃涓��',
required: false,
- forbid: type !== 'CommonTable' && type !== 'CalendarPage',
+ forbid: type !== 'CommonTable',
options: [{
value: 'true',
text: '浣跨敤'
--
Gitblit v1.8.0