From fbe91f6f07f6296bbf6c30029c7f36014fe66e79 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 八月 2023 14:40:01 +0800
Subject: [PATCH] 2023-08-11
---
src/tabviews/basetable/index.jsx | 1
src/api/index.js | 26 ++++++------
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 8 ++--
src/tabviews/zshare/actionList/popupbutton/index.jsx | 7 ---
src/tabviews/subtabtable/index.jsx | 2 +
src/tabviews/commontable/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 8 ----
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 8 ----
src/tabviews/zshare/actionList/printbutton/index.jsx | 15 -------
9 files changed, 21 insertions(+), 56 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 6d70710..23a9315 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -61,7 +61,7 @@
}, (error) => {
let response = error.response || ''
- if (response && (!response.data || !response.data.errors)) { // 杩囨护鏃疯鎶ラ敊淇℃伅
+ if (response && response.status) {
notification.error({
className: 'notification-custom-error',
bottom: 0,
@@ -507,18 +507,18 @@
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = param.appkey || window.GLOB.appkey
- let url = '/webapi/dostars'
- if (window.GLOB.mkHS && options.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
- url = options.cloudServiceApi
- param.userid = sessionStorage.getItem('CloudUserID') || ''
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- } else if (window.GLOB.mainSystemApi) {
- if (!window.GLOB.transfer) {
- url = window.GLOB.mainSystemApi
- } else {
- param.rduri = window.GLOB.mainSystemApi
- }
- }
+ let url = '/webapi/dostarst'
+ // if (window.GLOB.mkHS && options.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
+ // url = options.cloudServiceApi
+ // param.userid = sessionStorage.getItem('CloudUserID') || ''
+ // param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ // } else if (window.GLOB.mainSystemApi) {
+ // if (!window.GLOB.transfer) {
+ // url = window.GLOB.mainSystemApi
+ // } else {
+ // param.rduri = window.GLOB.mainSystemApi
+ // }
+ // }
param = this.encryptParam(param)
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index c2422f3..0540563 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -428,6 +428,7 @@
if (cell.hidden === 'true') return false
cell.logLabel = item.$menuname + '-' + cell.label
+ cell.Ot = cell.Ot || 'requiredSgl'
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 793193c..b4da9d1 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -114,7 +114,7 @@
}
// HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
- if (result.LongParamUser && !window.GLOB.mkHS) {
+ if (result.LongParamUser) {
try { // 閰嶇疆淇℃伅瑙ｆ瀽
let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
if (userConfig && !userConfig.version) {
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 8e47675..878eeba 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -199,6 +199,8 @@
item.$menuId = this.props.MenuID
item.$old = true
+ if (item.OpenType === 'popview') return
+
if (item.controlField) {
if (/,/ig.test(item.controlVal)) {
item.controlVals = item.controlVal.split(',')
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index 323c29c..8ceb5db 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -130,14 +130,6 @@
duration: 5
})
return
- } else if (!setting.primaryKey) {
- // 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾槸鍚﹁缃富閿�
- notification.warning({
- top: 92,
- message: '鏈缃富閿紒',
- duration: 5
- })
- return
}
let primaryId = data[0][setting.primaryKey] || ''
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 1d3ae5e..373ea78 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -112,7 +112,7 @@
let data = record || selectedData || []
- if (btn.Ot && btn.Ot !== 'notRequired' && data.length === 0) {
+ if (btn.Ot !== 'notRequired' && data.length === 0) {
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
notification.warning({
top: 92,
@@ -152,13 +152,13 @@
if (btn.pageTemplate === 'billprint') {
_name = '鍗曟嵁鎵撳嵃'
- if (btn.Ot === 'required' && data && data.length > 0) {
- data.forEach((item, i) => {
+ if (btn.Ot === 'required') {
+ data.forEach(item => {
let _id = item.$$uuid || ''
let url = '#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: _id, tempId: btn.printTemp, dataM: sessionStorage.getItem('dataM') })))
window.open(url)
})
- } else if (btn.Ot === 'requiredOnce' && data && data.length > 0) {
+ } else if (btn.Ot === 'requiredOnce') {
Id = data.map(item => item.$$uuid).filter(Boolean).join(',')
window.open('#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: Id, tempId: btn.printTemp, dataM: sessionStorage.getItem('dataM') }))))
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 7ab6d6e..0d0807c 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -269,14 +269,6 @@
duration: 5
})
return
- } else if (!['requiredSgl', 'notRequired', 'requiredOnce', 'required'].includes(btn.Ot)) {
- // 鏁版嵁閫夋嫨绫诲瀷鏍￠獙
- notification.warning({
- top: 92,
- message: '鎸夐挳琛岃缃敊璇紒',
- duration: 5
- })
- return
} else if (btn.intertype === 'system') {
// 浣跨敤鍐呴儴鎺ュ彛鏃讹紝鎿嶄綔绫诲瀷鍜屾暟鎹簮涓嶅彲涓虹┖
if (!btn.sql || !btn.sqlType) {
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index 24fbe8c..747af96 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -169,13 +169,6 @@
duration: 5
})
return
- } else if (setting.tabType === 'subtab') {
- notification.warning({
- top: 92,
- message: '寮圭獥椤甸潰涓嶆敮鎸佹璁剧疆锛�',
- duration: 5
- })
- return
}
let _data = null
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index f89c377..ed5002f 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -170,10 +170,6 @@
duration: 5
})
return
- } else if (!['requiredSgl', 'notRequired', 'requiredOnce', 'required'].includes(btn.Ot)) {
- // 鏁版嵁閫夋嫨绫诲瀷鏍￠獙
- this.actionSettingError()
- return
} else if (!btn.verify || !btn.verify.printMode) {
notification.warning({
top: 92,
@@ -1960,17 +1956,6 @@
if (btn.execError !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', this.state.selines)
}
- }
-
- /**
- * @description 鎸夐挳閰嶇疆淇℃伅閿欒鎻愮ず
- */
- actionSettingError = () => {
- notification.warning({
- top: 92,
- message: '鎸夐挳璁剧疆閿欒锛�',
- duration: 5
- })
}
handleModelConfig = (config) => {
--
Gitblit v1.8.0