From c2629f92132c4761f4415e62d30ee456c6ac23c7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 18:30:26 +0800
Subject: [PATCH] 2023-08-10
---
src/utils/utils.js | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 967ae7e..35d083e 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -335,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)
@@ -896,11 +898,6 @@
let address = sessionStorage.getItem('address') || ''
let _sheet = item.sheet
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
if (window.GLOB.externalDatabase !== null) {
_sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
}
@@ -934,14 +931,6 @@
if (script.status === 'false') return
let _sql = script.sql
-
- _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
- _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
- _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
- _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
- _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
- _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- _sql = _sql.replace(/@typename@/ig, `'admin'`)
if (script.position === 'init') {
_initCustomScript += `
@@ -986,7 +975,7 @@
val = val.replace(/'/ig, '"')
}
- val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
+ val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
if (!val && col.required === 'true') { // 蹇呭～鏍￠獙
errors.push(_position + '鍐呭涓嶅彲涓虹┖')
@@ -1021,7 +1010,7 @@
val = moment('19000101', 'YYYYMMDD').add(Math.floor(val - 2), 'days').format('YYYY-MM-DD')
}
} else if (typeof(val) === 'string') {
- val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
+ val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
if (!val && col.required === 'true') { // 鏃堕棿蹇呭～鏍￠獙
errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (val && !/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝ｅ垯鏍￠獙
@@ -1148,6 +1137,30 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+ _sqlBottom = _sqlBottom.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+ _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
+
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
${_sql}
@@ -1205,11 +1218,6 @@
let _sheet = btn.sheet
let BID = data[0].$$BID || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
if (window.GLOB.externalDatabase !== null) {
_sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
@@ -1365,6 +1373,28 @@
Delete @${sheet}
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+ _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+ _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
@@ -1597,11 +1627,6 @@
let city = sessionStorage.getItem('city') || ''
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
--
Gitblit v1.8.0