From f2f059007551e01399f4df1afc82ec0abc489a43 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 21:44:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/formconfig.jsx | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 0169f0f..7456bc4 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -7,7 +7,6 @@
* @param {*} functip 鐢熸垚瀛樺偍杩囩▼鎻愮ず
* @param {*} setting 缁勪欢閰嶇疆
* @param {*} usefulFields 瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
- * @param {*} type 鎸夐挳绫诲瀷锛岀敤浜庡尯鍒嗗彲閫夌殑鎵撳紑鏂瑰紡
*/
export function getActionForm (card, functip, config, usefulFields, modules = [], anchors = [], side) {
let appType = sessionStorage.getItem('appType')
@@ -17,6 +16,7 @@
let appMenus = []
let menulist = []
let type = ''
+ let alltype = config.type + '_' + config.subtype
if (card.eleType === 'button') {
type = 'card'
@@ -82,7 +82,73 @@
return _list
}
- let tabs = getTabs(JSON.parse(JSON.stringify(window.GLOB.customMenu.components)))
+ let tabs = getTabs(window.GLOB.customMenu.components)
+
+ let linkButtons = []
+ let filterComponent = (components) => {
+ components.forEach(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ filterComponent(tab.components)
+ })
+ } else if (item.type === 'group') {
+ filterComponent(item.components)
+ } else {
+ item.action && item.action.forEach(cell => {
+ if (cell.hidden === 'true' || cell.uuid === card.uuid) return
+ if (!['exec', 'prompt', 'pop'].includes(cell.OpenType)) return
+
+ linkButtons.push({
+ value: cell.uuid,
+ label: cell.label + '锛�' + item.name + '锛�'
+ })
+ })
+
+ if (item.type === 'card' && item.subcards) {
+ item.subcards.forEach(m => {
+ if ((item.subtype === 'datacard' || item.subtype === 'dualdatacard') && m.$cardType !== 'extendCard') return
+ m.elements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.uuid === card.uuid) return
+ if (!['exec', 'prompt', 'pop'].includes(cell.OpenType)) return
+
+ linkButtons.push({
+ value: cell.uuid,
+ label: cell.label + '锛�' + item.name + '锛�'
+ })
+ })
+ })
+ } else if (item.type === 'balcony') {
+ item.elements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.uuid === card.uuid) return
+ if (!['exec', 'prompt', 'pop'].includes(cell.OpenType)) return
+
+ linkButtons.push({
+ value: cell.uuid,
+ label: cell.label + '锛�' + item.name + '锛�'
+ })
+ })
+ } else if (item.type === 'form') {
+ item.subcards.forEach(group => {
+ if(group.uuid === card.uuid) return
+
+ if (item.subcards.length > 1) {
+ linkButtons.push({
+ value: group.uuid,
+ label: group.subButton.label + '锛�' + item.name + '-' + group.setting.title + '锛�'
+ })
+ } else {
+ linkButtons.push({
+ value: group.uuid,
+ label: group.subButton.label + '锛�' + item.name + '锛�'
+ })
+ }
+ })
+ }
+ }
+ })
+ }
+
+ filterComponent(window.GLOB.customMenu.components)
let pageTemps = [
{ value: 'billprint', text: '鍗曟嵁鎵撳嵃' },
@@ -610,10 +676,15 @@
text: '涓嶅埛鏂�'
}, {
value: 'line',
- text: '鍒锋柊琛�'
+ text: '鍒锋柊琛�',
+ $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
}, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
+ }, {
+ value: 'line_grid',
+ text: '鍒锋柊琛� / 缁勪欢',
+ $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
@@ -633,10 +704,15 @@
text: '涓嶅埛鏂�'
}, {
value: 'line',
- text: '鍒锋柊琛�'
+ text: '鍒锋柊琛�',
+ $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
}, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
+ }, {
+ value: 'line_grid',
+ text: '鍒锋柊琛� / 缁勪欢',
+ $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
@@ -712,9 +788,6 @@
required: false,
forbid: (type !== 'datacard' || appType !== 'mob'),
options: [{
- // value: 'false',
- // text: '鍚�'
- // }, {
value: 'left',
text: '宸︽粦'
}, {
@@ -869,6 +942,16 @@
allowClear: true,
options: appType === 'mob' || appType === 'pc' ? appMenus : menulist,
forbid: viewType === 'popview'
+ },
+ {
+ type: 'select',
+ key: 'preButton',
+ label: '鍓嶇疆鎸夐挳',
+ tooltip: '褰撳墠鎸夐挳鎵ц鍓嶏紝闇�瑕佹墽琛岀殑鎸夐挳銆�',
+ initVal: card.preButton || '',
+ required: false,
+ allowClear: true,
+ options: linkButtons
},
{
type: 'text',
@@ -1725,6 +1808,9 @@
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
+ value: 'line_grid',
+ text: '鍒锋柊琛� / 缁勪欢',
+ }, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
},
@@ -1747,6 +1833,9 @@
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
+ value: 'line_grid',
+ text: '鍒锋柊琛� / 缁勪欢',
+ }, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
},
--
Gitblit v1.8.0