From 530e033f9fdba1dfd02848d5839fd348ca6eeed1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 00:09:45 +0800
Subject: [PATCH] 2022-09-16
---
src/utils/utils.js | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 06f55ca..82fedc6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -730,14 +730,7 @@
static getrealurl (url) {
if (!url) return ''
- let baseurl = ''
- if (process.env.NODE_ENV === 'production') {
- baseurl = document.location.origin + '/' + window.GLOB.service
- } else {
- baseurl = window.GLOB.location + '/' + window.GLOB.service
- }
-
- let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
+ let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : window.GLOB.baseurl + url
return realurl
}
@@ -753,7 +746,7 @@
if (options.cloudServiceApi) {
baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
} else {
- baseurl = document.location.origin + '/' + window.GLOB.service
+ baseurl = window.GLOB.baseurl
}
return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
@@ -1966,11 +1959,14 @@
if (!_arr.includes('submitdate')) {
_form.push('submitdate=getdate()')
}
- if (!_arr.includes('submituserid')) {
- _form.push('submituserid=@userid@')
- }
if (!_arr.includes('submituser')) {
_form.push('submituser=@username')
+ }
+ if (!_arr.includes('submitstaff')) {
+ _form.push('submitstaff=@fullname')
+ }
+ if (!_arr.includes('submituserid')) {
+ _form.push('submituserid=@userid@')
}
} else {
if (!_arr.includes('modifydate')) {
@@ -1979,6 +1975,9 @@
if (!_arr.includes('modifyuser')) {
_form.push('modifyuser=@username')
}
+ if (!_arr.includes('modifystaff')) {
+ _form.push('modifystaff=@fullname')
+ }
if (!_arr.includes('modifyuserid')) {
_form.push('modifyuserid=@userid@')
}
--
Gitblit v1.8.0