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/share/actioncomponent/formconfig.jsx | 216 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 183 insertions(+), 33 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index e1544de..9213a97 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1,5 +1,5 @@
import React from 'react'
-import { btnClasses } from '@/utils/option.js'
+import { btnClasses, modalClasses } from '@/utils/option.js'
/**
* @description 鑾峰彇鎸夐挳琛ㄥ崟閰嶇疆淇℃伅
@@ -187,6 +187,9 @@
} else {
appMenus = []
}
+ // if (appType === 'mob') {
+ // appMenus.push({value: 'sign', text: '绛惧悕锛堢郴缁熼〉锛�'})
+ // }
appMenus.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
} else {
menulist = sessionStorage.getItem('fstMenuList')
@@ -211,12 +214,14 @@
{ value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
- { value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
+ { value: 'reAuth', text: '鍒囨崲鎺堟潈鐮� / 灏忕▼搴忔竻绌虹紦瀛�' },
+ { value: 'reSystem', text: '鍒囨崲绯荤粺' },
{ value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'shareLink', text: '鍒嗕韩閾炬帴' },
{ value: 'openLocation', text: '鎵撳紑鍦板浘'},
+ { value: 'wxPublicAuth', text: '寰俊鍏紬鍙锋巿鏉�'},
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
@@ -357,6 +362,16 @@
if (typeof(card.openmenu) !== 'string') {
card.openmenu = ''
}
+ }
+
+ if (card.syncComponents && card.syncComponents[0] && Array.isArray(card.syncComponents[0])) {
+ card.syncComponents = card.syncComponents.map((item, i) => {
+ return {
+ syncComId: item,
+ label: '',
+ uuid: 'fixed' + i
+ }
+ })
}
let forms = [
@@ -838,6 +853,10 @@
value: 'never',
text: '涓嶅埛鏂�'
}, {
+ value: 'line',
+ text: '鍒锋柊琛�',
+ $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
+ }, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
@@ -1068,6 +1087,22 @@
required: false,
forbid: isApp || viewType === 'popview',
options: menulist
+ },
+ {
+ type: 'radio',
+ key: 'urlPar',
+ label: 'URL鍙橀噺',
+ initVal: card.urlPar || 'false',
+ tooltip: '鍒锋柊鑿滃崟鏃舵槸鍚︽竻闄RL鍙橀噺銆�',
+ required: false,
+ options: [{
+ value: 'true',
+ text: '娓呯┖'
+ }, {
+ value: 'false',
+ text: '涓嶆竻绌�'
+ }],
+ forbid: isApp || viewType === 'popview',
},
{
type: !appType ? 'cascader' : 'select',
@@ -1409,21 +1444,6 @@
initVal: card.reason || '',
required: false
},
- // {
- // type: 'radio',
- // key: 'formCache',
- // label: '琛ㄥ崟缂撳瓨',
- // initVal: card.formCache || 'false',
- // tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
- // required: false,
- // options: [{
- // value: 'false',
- // text: '涓嶆竻绌�'
- // }, {
- // value: 'clear',
- // text: '娓呯┖'
- // }]
- // },
{
type: 'radio',
key: 'hidden',
@@ -1459,10 +1479,68 @@
initVal: card.permission || 'true',
required: false,
options: [
- {value: 'true', text: '缁ф壙鑿滃崟'},
+ {value: 'true', text: '缁ф壙缁勪欢'},
{value: 'false', text: '绂佺敤'},
],
forbid: viewType === 'popview'
+ },
+ {
+ type: 'radio',
+ key: 'extBtn',
+ label: '鎵╁睍鎸夐挳',
+ initVal: card.extBtn || 'false',
+ tooltip: '鐐瑰嚮鎵╁睍鎸夐挳鏃讹紝鍙橀噺 mk_submit_type 灏嗚璧嬪�笺��',
+ required: false,
+ options: [
+ {value: 'true', text: '鍚敤'},
+ {value: 'false', text: '绂佺敤'},
+ ],
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'text',
+ key: 'extValue',
+ label: '鎵╁睍鍊�',
+ initVal: card.extValue || '',
+ required: true,
+ readonly: false,
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'text',
+ key: 'extLabel',
+ label: '鎵╁睍鍚嶇О',
+ initVal: card.extLabel || '',
+ required: true,
+ readonly: false,
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'select',
+ key: 'extStyle',
+ label: '鎵╁睍鏍峰紡',
+ initVal: card.extStyle || '',
+ required: false,
+ options: modalClasses,
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'text',
+ key: 'confLabel',
+ label: '纭畾鍚嶇О',
+ initVal: card.confLabel || '',
+ required: false,
+ readonly: false,
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'select',
+ key: 'confStyle',
+ label: '纭畾鏍峰紡',
+ initVal: card.confStyle || '',
+ required: false,
+ options: modalClasses,
+ forbid: appType === 'mob'
},
{
type: 'splitLine',
@@ -1572,6 +1650,14 @@
value: 'single',
text: '閫愭潯璇锋眰'
}]
+ },
+ {
+ type: 'number',
+ key: 'execInterval',
+ label: '鎵ц闂撮殧',
+ initVal: card.execInterval || 0,
+ tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+ required: false
},
{
type: 'radio',
@@ -2268,6 +2354,9 @@
value: 'never',
text: '涓嶅埛鏂�'
}, {
+ value: 'line',
+ text: '鍒锋柊琛�'
+ }, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
@@ -2432,6 +2521,22 @@
required: false,
forbid: viewType === 'popview',
options: menulist
+ },
+ {
+ type: 'radio',
+ key: 'urlPar',
+ label: 'URL鍙橀噺',
+ initVal: card.urlPar || 'false',
+ tooltip: '鍒锋柊鑿滃崟鏃舵槸鍚︽竻闄RL鍙橀噺銆�',
+ required: false,
+ options: [{
+ value: 'true',
+ text: '娓呯┖'
+ }, {
+ value: 'false',
+ text: '涓嶆竻绌�'
+ }],
+ forbid: viewType === 'popview',
},
{
type: 'cascader',
@@ -2669,21 +2774,6 @@
initVal: card.reason || '',
required: false
},
- // {
- // type: 'radio',
- // key: 'formCache',
- // label: '琛ㄥ崟缂撳瓨',
- // initVal: card.formCache || 'false',
- // tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
- // required: false,
- // options: [{
- // value: 'false',
- // text: '涓嶆竻绌�'
- // }, {
- // value: 'clear',
- // text: '娓呯┖'
- // }]
- // },
{
type: 'radio',
key: 'hidden',
@@ -2726,6 +2816,58 @@
},
{
type: 'radio',
+ key: 'extBtn',
+ label: '鎵╁睍鎸夐挳',
+ initVal: card.extBtn || 'false',
+ tooltip: '鐐瑰嚮鎵╁睍鎸夐挳鏃讹紝鍙橀噺 mk_submit_type 灏嗚璧嬪�笺��',
+ required: false,
+ options: [
+ {value: 'true', text: '鍚敤'},
+ {value: 'false', text: '绂佺敤'},
+ ],
+ },
+ {
+ type: 'text',
+ key: 'extValue',
+ label: '鎵╁睍鍊�',
+ initVal: card.extValue || '',
+ required: true,
+ readonly: false
+ },
+ {
+ type: 'text',
+ key: 'extLabel',
+ label: '鎵╁睍鍚嶇О',
+ initVal: card.extLabel || '',
+ required: true,
+ readonly: false
+ },
+ {
+ type: 'select',
+ key: 'extStyle',
+ label: '鎵╁睍鏍峰紡',
+ initVal: card.extStyle || '',
+ required: false,
+ options: modalClasses
+ },
+ {
+ type: 'text',
+ key: 'confLabel',
+ label: '纭畾鍚嶇О',
+ initVal: card.confLabel || '',
+ required: false,
+ readonly: false
+ },
+ {
+ type: 'select',
+ key: 'confStyle',
+ label: '纭畾鏍峰紡',
+ initVal: card.confStyle || '',
+ required: false,
+ options: modalClasses
+ },
+ {
+ type: 'radio',
key: 'execType',
label: '璇锋眰鏂瑰紡',
initVal: card.execType || 'multi',
@@ -2740,6 +2882,14 @@
}]
},
{
+ type: 'number',
+ key: 'execInterval',
+ label: '鎵ц闂撮殧',
+ initVal: card.execInterval || 0,
+ tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+ required: false
+ },
+ {
type: 'radio',
key: 'progress',
label: '杩涘害鎻愮ず',
--
Gitblit v1.8.0