From 7cfd25aebe5869244e40dbbcd6384f115f35e66e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:37:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/formconfig.jsx | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index a5a42e4..9d6f7b7 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -112,6 +112,7 @@
} else {
appMenus = []
}
+ appMenus.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
} else {
menulist = sessionStorage.getItem('fstMenuList')
if (menulist) {
@@ -748,7 +749,7 @@
initVal: card.syncComponent || [],
tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堬紝鍒锋柊涓婄骇缁勪欢璇烽�夋嫨鎴愬姛鍚庘�滃埛鏂颁笂绾х粍浠� - 琛屸�濄��',
required: false,
- options: modules
+ options: modules.length ? [...modules, {value: 'multiComponent', label: '澶氱粍浠�'}] : []
},
{
type: 'radio',
@@ -819,7 +820,7 @@
extendName: 'MenuNo',
required: false,
allowClear: true,
- options: appType === 'mob' || appType === 'pc' ? [...appMenus, {value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'}] : menulist,
+ options: appType === 'mob' || appType === 'pc' ? appMenus : menulist,
forbid: viewType === 'popview'
},
{
@@ -972,6 +973,15 @@
value: 'bottom',
text: '搴曢儴'
}]
+ },
+ {
+ type: 'text',
+ key: 'preFunc',
+ label: '鍓嶇疆鍑芥暟',
+ initVal: card.preFunc || '',
+ tooltip: '鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般��',
+ required: false,
+ forbid: appType === 'mob'
},
{
type: 'radio',
@@ -1158,6 +1168,27 @@
value: 'progressbar',
text: '杩涘害鏉�'
}]
+ },
+ {
+ type: 'table',
+ key: 'syncComponents',
+ label: '缁勪欢鍒楄〃',
+ initVal: card.syncComponents || [],
+ required: true,
+ actions: [],
+ columns: [
+ {
+ title: '缁勪欢',
+ dataIndex: 'syncComId',
+ inputType: 'cascader',
+ editable: true,
+ required: true,
+ extends: [{key: 'label', value: 'label'}],
+ width: '70%',
+ render: (text, record) => record.label,
+ options: modules
+ }
+ ]
}
]
@@ -1694,7 +1725,7 @@
initVal: card.syncComponent || [],
tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堬紝鍒锋柊涓婄骇缁勪欢璇烽�夋嫨鎴愬姛鍚庘�滃埛鏂颁笂绾х粍浠� - 琛屸�濄��',
required: false,
- options: modules
+ options: modules.length ? [...modules, {value: 'multiComponent', label: '澶氱粍浠�'}] : []
},
{
type: 'radio',
@@ -1824,6 +1855,14 @@
}]
},
{
+ type: 'text',
+ key: 'preFunc',
+ label: '鍓嶇疆鍑芥暟',
+ initVal: card.preFunc || '',
+ tooltip: '鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般��',
+ required: false
+ },
+ {
type: 'radio',
key: 'control',
label: '鎸夐挳鎺у埗',
@@ -1913,6 +1952,27 @@
value: 'progressbar',
text: '杩涘害鏉�'
}]
+ },
+ {
+ type: 'table',
+ key: 'syncComponents',
+ label: '缁勪欢鍒楄〃',
+ initVal: card.syncComponents || [],
+ required: true,
+ actions: [],
+ columns: [
+ {
+ title: '缁勪欢',
+ dataIndex: 'syncComId',
+ inputType: 'cascader',
+ editable: true,
+ required: true,
+ extends: [{key: 'label', value: 'label'}],
+ width: '70%',
+ render: (text, record) => record.label,
+ options: modules
+ }
+ ]
}
]
--
Gitblit v1.8.0