From 66fe0749db196f66021e09c6e6f83400f13f7412 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 24 十二月 2021 23:51:56 +0800
Subject: [PATCH] 2021-12-24
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 2 +
src/menu/components/share/actioncomponent/formconfig.jsx | 81 +++++++++++++++-------------------------
2 files changed, 33 insertions(+), 50 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 69cb16f..03d5814 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -420,6 +420,8 @@
} else if (value === 'excelOut') {
_fieldval.label = this.props.dict['model.form.excelOut']
_fieldval.class = 'dgreen'
+ _fieldval.control = ''
+ this.record.control = ''
}
if (appType !== 'mob' && _fieldval.Ot === 'notRequired') {
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index a5e48dd..248d1f0 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -15,7 +15,8 @@
export function getActionForm (card, functip, config, usefulFields, type, menulist = [], modules = []) {
let appType = sessionStorage.getItem('appType')
let viewType = sessionStorage.getItem('editMenuType') // 寮圭獥 popview
- let printTemps = sessionStorage.getItem('printTemps') || []
+ let printTemps = sessionStorage.getItem('printTemps')
+ printTemps = printTemps ? JSON.parse(printTemps) : []
let setting = config.setting || {}
let columns = config.columns || []
let appMenus = []
@@ -100,33 +101,32 @@
} else {
appMenus = []
}
-
- if (appType === 'mob') {
- opentypes = opentypes.filter(item => ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton'].includes(item.value))
- funTypes = [
- { value: 'scan', text: '鎵爜' },
- { value: 'logout', text: '閫�鍑�' },
- { value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
- { value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
- { value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
- { value: 'goBack', text: '杩斿洖' },
- ]
- pageTemps = [
- { value: 'linkpage', text: '鍏宠仈鑿滃崟' },
- { value: 'custom', text: '閾炬帴' }
- ]
- } else {
- pageTemps = [
- { value: 'linkpage', text: '鍏宠仈鑿滃崟' },
- { value: 'billprint', text: '鍗曟嵁鎵撳嵃' },
- { value: 'pay', text: Formdict['model.pay'] },
- { value: 'custom', text: '閾炬帴' }
- ]
- funTypes = [
- { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
- ]
- opentypes = opentypes.filter(item => item.value !== 'tab')
- }
+ }
+ if (appType === 'mob') {
+ opentypes = opentypes.filter(item => ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton'].includes(item.value))
+ funTypes = [
+ { value: 'scan', text: '鎵爜' },
+ { value: 'logout', text: '閫�鍑�' },
+ { value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
+ { value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
+ { value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
+ { value: 'goBack', text: '杩斿洖' },
+ ]
+ pageTemps = [
+ { value: 'linkpage', text: '鍏宠仈鑿滃崟' },
+ { value: 'custom', text: '閾炬帴' }
+ ]
+ } else if (appType === 'pc') {
+ opentypes = opentypes.filter(item => item.value !== 'tab')
+ funTypes = [
+ { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
+ ]
+ pageTemps = [
+ { value: 'linkpage', text: '鍏宠仈鑿滃崟' },
+ { value: 'billprint', text: '鍗曟嵁鎵撳嵃' },
+ { value: 'pay', text: Formdict['model.pay'] },
+ { value: 'custom', text: '閾炬帴' }
+ ]
}
if (type === 'chart' && appType !== 'mob') {
@@ -257,13 +257,12 @@
options: printTemps
},
{
- type: 'select',
+ type: isApp ? 'select' : 'cascader',
key: 'linkmenu',
label: '鍏宠仈鑿滃崟',
- initVal: card.linkmenu || '',
+ initVal: card.linkmenu || (isApp ? '' : []),
required: true,
- forbid: !isApp,
- options: appMenus
+ options: isApp ? appMenus : menulist
},
{
type: 'textarea',
@@ -374,15 +373,6 @@
initVal: card.Ot || (card.sqlType === 'insert' ? 'notRequired' : 'requiredSgl'),
required: true,
options: []
- },
- {
- type: 'cascader',
- key: 'linkmenu',
- label: Formdict['model.form.linkmenu'],
- initVal: card.linkmenu || [],
- required: true,
- forbid: isApp,
- options: menulist
},
{
type: 'select',
@@ -628,15 +618,6 @@
tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧姛鑳芥寜閽腑鏍囩鍏抽棴绫诲瀷锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑鑿滃崟',
required: false,
forbid: isApp || viewType === 'popview',
- options: menulist
- },
- {
- type: 'cascader',
- key: 'linkmenu',
- label: Formdict['model.form.linkmenu'],
- initVal: card.linkmenu || [],
- required: true,
- forbid: isApp,
options: menulist
},
{
--
Gitblit v1.8.0