From 7737571dc2106e2eec4daad6b03c1f70d0faf038 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 八月 2023 10:22:11 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils.js | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4633e68..0c250c8 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -39,26 +39,6 @@
export default class Utils {
/**
- * @description 鑾峰彇浼氬憳绛夌骇
- * @return {String} level
- */
- static getMemberLevel () {
- let _level = 10
- let _Mlevel = sessionStorage.getItem('Member_Level')
-
- if (_Mlevel) {
- if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
- _level = 10
- } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
- _level = 20
- } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
- _level = 30
- }
- }
- return _level
- }
-
- /**
* @description 鑾峰彇鍥捐〃楂樺害
*/
static getHeight (val) {
@@ -1018,9 +998,9 @@
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
let isDM = sessionStorage.getItem('dataM') === 'true'
let regs = [
- {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: `#${sheet} `},
- {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: `#${sheet}(`},
- {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: `#${sheet})`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
{reg: /@ID@/ig, value: `'${primaryId || ''}'`},
{reg: /@BID@/ig, value: `'${BID}'`},
{reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
@@ -1225,9 +1205,9 @@
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
let isDM = sessionStorage.getItem('dataM') === 'true'
let regs = [
- {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: `#${sheet} `},
- {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: `#${sheet}(`},
- {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: `#${sheet})`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
{reg: /@BID@/ig, value: `'${BID}'`},
{reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
@@ -1461,7 +1441,7 @@
if (!_vars.includes(_key)) {
_vars.push(_key)
- if (form.fieldlen && form.fieldlen > 2048) {
+ if (form.fieldlen && form.fieldlen > 4000) {
form.fieldlen = 'max'
}
@@ -1515,7 +1495,7 @@
if (col.datatype) {
_declarefields.push(`@${_key} ${col.datatype}`)
} else {
- if (col.fieldlength && col.fieldlength > 2048) {
+ if (col.fieldlength && col.fieldlength > 4000) {
col.fieldlength = 'max'
}
--
Gitblit v1.8.0