From 159940642620c547bb020b5cdf4bf16a3dfae15f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 九月 2020 23:37:17 +0800
Subject: [PATCH] 2020-09-10
---
src/templates/sharecomponent/actioncomponent/index.jsx | 6 +++---
src/templates/zshare/createinterface/index.jsx | 2 +-
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 12 +++++++++---
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 2 ++
src/menu/actioncomponent/actionform/index.jsx | 16 +++++++---------
src/templates/comtableconfig/index.jsx | 2 +-
src/menu/actioncomponent/index.jsx | 4 ++--
src/templates/subtableconfig/index.jsx | 2 +-
8 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/menu/actioncomponent/actionform/index.jsx b/src/menu/actioncomponent/actionform/index.jsx
index a3e887b..6a579a9 100644
--- a/src/menu/actioncomponent/actionform/index.jsx
+++ b/src/menu/actioncomponent/actionform/index.jsx
@@ -673,15 +673,13 @@
if (values.OpenType === 'excelIn') {
values.position = 'toolbar'
} else if (values.OpenType === 'excelOut') {
- if (values.intertype === 'inner' && !values.innerFunc) {
- if ((setting.interType === 'inner' && setting.innerFunc) || setting.interType === 'outer') {
- notification.warning({
- top: 92,
- message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄦ暟鎹簮锛屽鍑篍xcel浣跨敤鍐呴儴鎺ュ彛鏃讹紝闇�鑷畾涔夊唴閮ㄥ嚱鏁帮紒',
- duration: 5
- })
- return
- }
+ if (values.intertype === 'system' && setting.interType !== 'system') {
+ notification.warning({
+ top: 92,
+ message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄦ暟鎹簮锛屽鍑篍xcel浣跨敤鍐呴儴鎺ュ彛鏃讹紝闇�鑷畾涔夊唴閮ㄥ嚱鏁帮紒',
+ duration: 5
+ })
+ return
}
values.position = 'toolbar'
diff --git a/src/menu/actioncomponent/index.jsx b/src/menu/actioncomponent/index.jsx
index e5de539..761400c 100644
--- a/src/menu/actioncomponent/index.jsx
+++ b/src/menu/actioncomponent/index.jsx
@@ -733,10 +733,10 @@
}
// 鍒涘缓瀛樺偍杩囩▼锛屽繀椤诲～鍐欏唴閮ㄥ嚱鏁板悕
- if (!btn.innerFunc) {
+ if (btn.intertype !== 'inner') {
notification.warning({
top: 92,
- message: '璇峰～鍐欏唴閮ㄥ嚱鏁帮紒',
+ message: '浣跨敤鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
duration: 5
})
return
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 8dbcaf1..c506d7b 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -107,12 +107,18 @@
window.open(url)
} else if (btn.pageTemplate === 'custom') {
let url = btn.url
+ let con = '?'
+
+ if (/\?/ig.test(url)) {
+ con = '&'
+ }
+
if (btn.Ot === 'requiredSgl' && btn.joint !== 'false') {
- url = url + `?id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
+ url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
} else if (btn.Ot === 'requiredSgl' && btn.joint === 'false') {
- url = url + `?id=${Id}`
+ url = url + `${con}id=${Id}`
} else if (btn.joint !== 'false') {
- url = url + `?appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
+ url = url + `${con}appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
}
window.open(url)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index e173344..a42ba69 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -1091,7 +1091,7 @@
})
- if (((config.setting.interType === 'inner' && !config.setting.innerFunc) || config.setting.interType === 'system') && config.setting.default !== 'false' && !config.setting.dataresource) {
+ if (config.setting.interType === 'system' && config.setting.default !== 'false' && !config.setting.dataresource) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
} else if (!config.setting.primaryKey) {
return '鑿滃崟灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒'
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index aa499a5..f529276 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -89,6 +89,8 @@
} else if (_opentype === 'outerpage') {
card.pageTemplate = 'custom'
_opentype = 'innerpage'
+ } else if (_opentype === 'blank') {
+ _opentype = 'tab'
}
let _tabs = this.props.tabs.filter(tab => tab.type === _tabType)
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index 32319d3..4e979b3 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -721,10 +721,10 @@
}
// 鍒涘缓瀛樺偍杩囩▼锛屽繀椤诲～鍐欏唴閮ㄥ嚱鏁板悕
- if (!btn.innerFunc) {
+ if (btn.intertype !== 'inner') {
notification.warning({
top: 92,
- message: '璇峰～鍐欏唴閮ㄥ嚱鏁帮紒',
+ message: '浣跨敤鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
duration: 5
})
return
@@ -908,7 +908,7 @@
const { actionlist, visible, card, dict, copying, profVisible } = this.state
let hasbtncrtinter = false
- if (card && !card.copyType && config.setting.interType === 'inner' && !config.setting.innerFunc && config.setting.dataresource) {
+ if (card && !card.copyType && config.setting.interType === 'system' && config.setting.dataresource) {
hasbtncrtinter = true
}
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index a63de25..2c7da89 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -918,7 +918,7 @@
}
})
- if (config.setting.interType === 'inner' && !config.setting.innerFunc && config.setting.default !== 'false' && !config.setting.dataresource) {
+ if (config.setting.interType === 'system' && config.setting.default !== 'false' && !config.setting.dataresource) {
return '灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
} else if (!config.setting.primaryKey) {
return '灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒'
diff --git a/src/templates/zshare/createinterface/index.jsx b/src/templates/zshare/createinterface/index.jsx
index fb2458b..12e7012 100644
--- a/src/templates/zshare/createinterface/index.jsx
+++ b/src/templates/zshare/createinterface/index.jsx
@@ -311,7 +311,7 @@
* @description 瑙﹀彂鍒涘缓鍐欏叆鎺ュ彛锛堟寜閽級
*/
triggerInInterface = (btn, config, menu) => {
- if (!['pop', 'exec', 'prompt'].includes(btn.OpenType) || btn.funcType || btn.intertype !== 'inner' || btn.innerFunc ) {
+ if (!['pop', 'exec', 'prompt'].includes(btn.OpenType) || btn.funcType || btn.intertype !== 'system') {
notification.warning({
top: 92,
message: '鎵撳紑鏂瑰紡涓� 寮圭獥锛堣〃鍗曪級銆佹彁绀烘鎴栫洿鎺ユ墽琛岋紝涓斾娇鐢ㄧ郴缁熷嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
--
Gitblit v1.8.0