From 6d14d39db5b11d33fe195fe10b67d58cfa92473d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 四月 2025 09:41:53 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/index.js | 2 +-
src/utils/utils-custom.js | 24 +++++++++++++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/index.js b/src/index.js
index fc30346..4a7f5ea 100644
--- a/src/index.js
+++ b/src/index.js
@@ -436,7 +436,7 @@
window.GLOB.SyncData = new Map() // 瀛樺偍鍚屾鏌ヨ鏁版嵁
window.GLOB.mkThdMenus = new Map() // 涓夌骇鑿滃崟
- if (lang === 'zh-CN' || !/#\/(login|main|billprint|docprint|tab|iframe|view|ssologin)/.test(window.location.href)) { // 寮�鍙戜娇鐢ㄤ腑鏂�
+ if (lang === 'zh-CN' || !/#\/(login|main|billprint|docprint|tab\/|iframe|view|ssologin)/.test(window.location.href)) { // 寮�鍙戜娇鐢ㄤ腑鏂�
ReactDOM.render(
<ConfigProvider locale={zhCN}>
<Route/>
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 93edd21..d51b230 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -2474,8 +2474,9 @@
let filterSql = (sl) => {
if (!sl) return
+ let _sl = sl.replace(/\/\*[^*/]+\*\//g, '')
let cutreg = /[\u4E00-\u9FA5銆傦紒锛屻�乚+/ig
- let tbs = sl.match(cutreg)
+ let tbs = _sl.match(cutreg)
if (!tbs) return
@@ -2790,13 +2791,34 @@
}
}
+ let getuuid = () => {
+ let uuid = []
+ let _options = '0123456789abcdefghigklmnopqrstuv'
+ for (let i = 0; i < 19; i++) {
+ uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ }
+ return uuid.join('')
+ }
+
let filterSql = (sl) => {
if (!sl) return
+ let arr = []
+
+ sl = sl.replace(/\/\*[^*/]+\*\//g, (word) => {
+ let uuid = getuuid()
+ arr.push({id: `/*${uuid}*/`, value: word})
+ return `/*${uuid}*/`
+ })
+
regs.forEach(item => {
sl = sl.replace(item.reg, item.value)
})
+ arr.forEach(item => {
+ sl = sl.replace(item.id, item.value)
+ })
+
return sl
}
--
Gitblit v1.8.0