From 2998f413a5e196e99df887787aa4b250cd9f3b78 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 十二月 2024 14:56:23 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/share/actioncomponent/formconfig.jsx | 153 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 122 insertions(+), 31 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index f9105db..3b1815b 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')
@@ -217,6 +220,7 @@
{ value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'shareLink', text: '鍒嗕韩閾炬帴' },
{ value: 'openLocation', text: '鎵撳紑鍦板浘'},
+ { value: 'wxPublicAuth', text: '寰俊鍏紬鍙锋巿鏉�'},
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
@@ -838,6 +842,10 @@
value: 'never',
text: '涓嶅埛鏂�'
}, {
+ value: 'line',
+ text: '鍒锋柊琛�',
+ $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
+ }, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
@@ -1409,21 +1417,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',
@@ -1463,6 +1456,64 @@
{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',
@@ -2268,6 +2319,9 @@
value: 'never',
text: '涓嶅埛鏂�'
}, {
+ value: 'line',
+ text: '鍒锋柊琛�'
+ }, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
@@ -2669,21 +2723,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 +2765,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',
--
Gitblit v1.8.0