From 051981a2211bb86f88a6d68f2e29816f8caeac20 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 八月 2023 09:18:10 +0800
Subject: [PATCH] 2023-08-04
---
src/utils/utils.js | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index bd37d3d..b9878c6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -216,12 +216,6 @@
// value = window.atob(value)
// value = value.replace('minKe', '')
// value = window.decodeURIComponent(window.atob(value))
-
- // // 澶栬仈鏁版嵁搴撴浛鎹�
- // if (window.GLOB.externalDatabase !== null && window.GLOB.externalDatabase) {
- // value = value.replace(window.GLOB.externalDatabase, '@db@')
- // }
-
// value = value.replace(/ mpercent /ig, '%')
// // 鏇挎崲鍏抽敭瀛�
@@ -230,7 +224,7 @@
// value = value.replace(reg, ' ' + item.key + ' ')
// })
- // // value = value.replace(/\n/ig, ' \n ')
+ // value = value.replace(/ \n /ig, '\n')
// return value
// }
@@ -341,6 +335,8 @@
item.initval = [moment().startOf('week').format(format), moment().endOf('week').format(format)].join(',')
} else if (item.initval === 'month') {
item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
+ } else if (item.initval === 'lastMonth') {
+ item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
} else if (item.initval) {
try {
let _initval = JSON.parse(item.initval)
@@ -902,7 +898,7 @@
let address = sessionStorage.getItem('address') || ''
let _sheet = item.sheet
- if (sessionStorage.getItem('isEditState') === 'true') {
+ if (window.GLOB.mkHS) {
userName = sessionStorage.getItem('CloudUserName') || ''
fullName = sessionStorage.getItem('CloudFullName') || ''
}
@@ -1212,7 +1208,7 @@
let _sheet = btn.sheet
let BID = data[0].$$BID || ''
- if (sessionStorage.getItem('isEditState') === 'true') {
+ if (window.GLOB.mkHS) {
userName = sessionStorage.getItem('CloudUserName') || ''
fullName = sessionStorage.getItem('CloudFullName') || ''
}
@@ -1604,7 +1600,7 @@
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
- if (sessionStorage.getItem('isEditState') === 'true') {
+ if (window.GLOB.mkHS) {
userName = sessionStorage.getItem('CloudUserName') || ''
fullName = sessionStorage.getItem('CloudFullName') || ''
}
@@ -2162,6 +2158,12 @@
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_sql = _sql.replace(/@typename@/ig, `'admin'`)
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@datam@/ig, '\'\'')
+ }
+
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
// _sql = _sql.replace(/\n\s{8}/ig, '\n')
console.info(_sql)
@@ -2175,6 +2177,12 @@
_callbacksql = _callbacksql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_callbacksql = _callbacksql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_callbacksql = _callbacksql.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _callbacksql = _callbacksql.replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _callbacksql = _callbacksql.replace(/@datam@/ig, '\'\'')
+ }
return {
sql: _sql,
--
Gitblit v1.8.0