From 9a47acddeb1e6c8a22538a6f12d525106a6f6e5a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 四月 2025 11:17:42 +0800
Subject: [PATCH] 2025-04-30
---
src/menu/lowerField/index.jsx | 9 +++-
src/tabviews/basetable/index.jsx | 4 ++
src/views/systemfunc/index.jsx | 1
src/tabviews/custom/index.jsx | 4 ++
src/utils/utils-custom.js | 66 ++++++++++++++++-----------------
src/menu/replaceField/index.jsx | 9 +++-
6 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/src/menu/lowerField/index.jsx b/src/menu/lowerField/index.jsx
index 3b0516c..e99f2af 100644
--- a/src/menu/lowerField/index.jsx
+++ b/src/menu/lowerField/index.jsx
@@ -79,8 +79,13 @@
m.linkurl = m.linkurl.toLowerCase()
}
if (m.modal && m.modal.fields) {
- if (m.modal.setting && m.modal.setting.focus) {
- m.modal.setting.focus = m.modal.setting.focus.toLowerCase()
+ if (m.modal.setting) {
+ if (m.modal.setting.focus) {
+ m.modal.setting.focus = m.modal.setting.focus.toLowerCase()
+ }
+ if (m.modal.setting.errFocus) {
+ m.modal.setting.errFocus = m.modal.setting.errFocus.toLowerCase()
+ }
}
m.modal.fields = m.modal.fields.map(col => {
resetForm(col)
diff --git a/src/menu/replaceField/index.jsx b/src/menu/replaceField/index.jsx
index 22bbc54..1250ac4 100644
--- a/src/menu/replaceField/index.jsx
+++ b/src/menu/replaceField/index.jsx
@@ -220,8 +220,13 @@
m.linkurl = getVal(m.linkurl)
}
if (m.modal && m.modal.fields) {
- if (m.modal.setting && m.modal.setting.focus) {
- m.modal.setting.focus = getVal(m.modal.setting.focus)
+ if (m.modal.setting) {
+ if (m.modal.setting.focus) {
+ m.modal.setting.focus = getVal(m.modal.setting.focus)
+ }
+ if (m.modal.setting.errFocus) {
+ m.modal.setting.errFocus = getVal(m.modal.setting.errFocus)
+ }
}
m.modal.fields = m.modal.fields.map(col => {
resetForm(col)
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index 05e30ac..c8e8c76 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -55,6 +55,10 @@
func: 'sPC_Get_LongParam',
MenuID: MenuID
}
+
+ if (window.GLOB.mkHS) {
+ _param.lang = 'zh_CN'
+ }
let result = await Api.getCacheConfig(_param)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 8234d4a..b6f0957 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -88,6 +88,10 @@
MenuID: MenuID
}
+ if (window.GLOB.mkHS) {
+ _param.lang = 'zh_CN'
+ }
+
let result = await Api.getCacheConfig(_param)
if (result.status) {
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index be55f36..81c7381 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -2288,40 +2288,6 @@
duration: 5
})
return false
- } else if (/,\./ig.test(sql)) {
- let lines = []
- sql.split(/\n/).forEach((s, i) => {
- if (/,\./ig.test(s)) {
- lines.push(i + 1)
- }
- })
-
- lines = lines.join('銆�')
- lines = lines ? '(绗�' + lines + '琛�)' : ''
-
- notification.warning({
- top: 92,
- message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿,.`,
- duration: 5
- })
- return false
- } else if (/\.,/ig.test(sql)) {
- let lines = []
- sql.split(/\n/).forEach((s, i) => {
- if (/\.,/ig.test(s)) {
- lines.push(i + 1)
- }
- })
-
- lines = lines.join('銆�')
- lines = lines ? '(绗�' + lines + '琛�)' : ''
-
- notification.warning({
- top: 92,
- message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿.,`,
- duration: 5
- })
- return false
} else if (/鈥榺鈥�/ig.test(sql)) {
let lines = []
sql.split(/\n/).forEach((s, i) => {
@@ -2424,6 +2390,38 @@
duration: 5
})
return false
+ } else if (/,\./ig.test(sql)) {
+ let lines = []
+ sql.split(/\n/).forEach((s, i) => {
+ if (/,\./ig.test(s)) {
+ lines.push(i + 1)
+ }
+ })
+
+ lines = lines.join('銆�')
+ lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+ notification.warning({
+ top: 92,
+ message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿,.`,
+ duration: 5
+ })
+ } else if (/\.,/ig.test(sql)) {
+ let lines = []
+ sql.split(/\n/).forEach((s, i) => {
+ if (/\.,/ig.test(s)) {
+ lines.push(i + 1)
+ }
+ })
+
+ lines = lines.join('銆�')
+ lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+ notification.warning({
+ top: 92,
+ message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿.,`,
+ duration: 5
+ })
}
return true
diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index 0e28ca3..bf2d296 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -30,6 +30,7 @@
document.body.className = 'mk-blue-black'
window.GLOB.dataFormat = false // 鍘婚櫎姘村嵃
window.GLOB.mkHS = true
+ window.GLOB.dict = {}
// HS涓嬩笉鍙紑鍚柇鐐硅皟璇�
window.GLOB.breakpoint = false
--
Gitblit v1.8.0