From 48db4d4b22331f32bf6c6a0956a7cd4245ad6fde Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 六月 2023 09:30:34 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/formconfig.jsx | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 31b4a64..550b969 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -245,7 +245,7 @@
{
type: 'select',
key: 'OpenType',
- label: '鎵撳紑鏂瑰紡',
+ label: '鎸夐挳绫诲瀷',
initVal: card.OpenType,
required: true,
options: opentypes
@@ -340,7 +340,7 @@
key: 'procMode',
label: '鍙傛暟澶勭悊',
initVal: card.procMode || (card.innerFunc ? 'inner' : 'system'),
- tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛銆�',
+ tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛銆傛敞锛氬綋閫夆�滄棤鈥濇椂锛屾寜閽�夎鏃朵細浼犻�掍富閿紝瀛樺湪琛ㄥ崟鏃朵細浼犻�掕〃鍗曞瓧娈碉紝瀛樺湪BID鏃朵細浼燘ID瀛楁銆�',
required: true,
options: [{
value: 'system',
@@ -424,7 +424,16 @@
key: 'url',
label: '椤甸潰鍦板潃',
initVal: card.url || '',
+ tooltip: appType === '' ? '鍦板潃鏍煎紡涓猴細http://******/admin/index.html#/iframe/menuId/loginuid/BID 浼氭墦寮�鏍囩椤点�傛敞锛氫娇鐢ˊloginuid@鏃惰嚜鍔ㄦ浛鎹负褰撳墠绯荤粺鐨刲oginuid锛涢�夋嫨鍗曡涓旀嫾鎺ュ弬鏁版椂浼氭嫾鎺ID銆�' : '',
required: true
+ },
+ {
+ type: 'textarea',
+ key: 'proUrl',
+ label: '姝ｅ紡鍦板潃',
+ initVal: card.proUrl || '',
+ tooltip: appType === '' ? '鍦板潃鏍煎紡涓猴細http://******/admin/index.html#/iframe/menuId/loginuid/BID 浼氭墦寮�鏍囩椤点�傛敞锛氫娇鐢ˊloginuid@鏃惰嚜鍔ㄦ浛鎹负褰撳墠绯荤粺鐨刲oginuid锛涢�夋嫨鍗曡涓旀嫾鎺ュ弬鏁版椂浼氭嫾鎺ID銆�' : '',
+ required: false
},
{
type: 'radio',
@@ -875,6 +884,19 @@
},
{
type: 'radio',
+ key: 'openTab',
+ label: '鎵撳紑鏂瑰紡',
+ initVal: card.openTab || 'newtab',
+ tooltip: '鑿滃崟鎵撳紑鏂瑰紡銆�',
+ forbid: appType !== '',
+ options: [
+ {value: 'newtab', text: '鏍囩椤�'},
+ // {value: 'newpage', text: '鏂伴〉闈紙鏍囩椤碉級'},
+ {value: 'view', text: '鏂伴〉闈紙鍏ㄥ睆锛�'}
+ ]
+ },
+ {
+ type: 'radio',
key: 'display',
label: '鏄剧ず鏂瑰紡',
initVal: card.display || 'modal',
@@ -1317,7 +1339,7 @@
{
type: 'select',
key: 'OpenType',
- label: '鎵撳紑鏂瑰紡',
+ label: '鎸夐挳绫诲瀷',
initVal: card.OpenType,
required: true,
options: opentypes
@@ -1391,7 +1413,7 @@
key: 'procMode',
label: '鍙傛暟澶勭悊',
initVal: card.procMode || (card.innerFunc ? 'inner' : 'system'),
- tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛銆�',
+ tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛銆傛敞锛氬綋閫夆�滄棤鈥濇椂锛屾寜閽�夎鏃朵細浼犻�掍富閿紝瀛樺湪琛ㄥ崟鏃朵細浼犻�掕〃鍗曞瓧娈碉紝瀛樺湪BID鏃朵細浼燘ID瀛楁銆�',
required: true,
options: [{
value: 'system',
@@ -1467,7 +1489,16 @@
key: 'url',
label: '椤甸潰鍦板潃',
initVal: card.url || '',
+ tooltip: '鍦板潃鏍煎紡涓猴細http://******/admin/index.html#/iframe/menuId/loginuid/BID 浼氭墦寮�鏍囩椤点�傛敞锛氫娇鐢ˊloginuid@鏃惰嚜鍔ㄦ浛鎹负褰撳墠绯荤粺鐨刲oginuid锛涢�夋嫨鍗曡涓旀嫾鎺ュ弬鏁版椂浼氭嫾鎺ID銆�',
required: true
+ },
+ {
+ type: 'textarea',
+ key: 'proUrl',
+ label: '姝ｅ紡鍦板潃',
+ initVal: card.proUrl || '',
+ tooltip: '鍦板潃鏍煎紡涓猴細http://******/admin/index.html#/iframe/menuId/loginuid/BID 浼氭墦寮�鏍囩椤点�傛敞锛氫娇鐢ˊloginuid@鏃惰嚜鍔ㄦ浛鎹负褰撳墠绯荤粺鐨刲oginuid锛涢�夋嫨鍗曡涓旀嫾鎺ュ弬鏁版椂浼氭嫾鎺ID銆�',
+ required: false
},
{
type: 'radio',
@@ -1834,6 +1865,18 @@
},
{
type: 'radio',
+ key: 'openTab',
+ label: '鎵撳紑鏂瑰紡',
+ initVal: card.openTab || 'newtab',
+ tooltip: '鑿滃崟鎵撳紑鏂瑰紡銆�',
+ options: [
+ {value: 'newtab', text: '鏍囩椤�'},
+ // {value: 'newpage', text: '鏂伴〉闈紙鏍囩椤碉級'},
+ {value: 'view', text: '鏂伴〉闈紙鍏ㄥ睆锛�'}
+ ]
+ },
+ {
+ type: 'radio',
key: 'display',
label: '鏄剧ず鏂瑰紡',
initVal: card.display || 'modal',
--
Gitblit v1.8.0