From 15c509d6e85b60a495c2a92fbe41e98a0d0716be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 16 九月 2024 19:42:56 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-custom.js | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 0ab2b6b..b95f217 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3455,7 +3455,7 @@
type: item.type,
isconst: item.constant === 'true'
}
-
+
if (_item.type === 'datemonth') {
_item.type = 'text'
} else if (_item.type === 'number' || _item.type === 'rate') {
@@ -3832,11 +3832,7 @@
let _key = item.key.toLowerCase()
keys.push(_key)
- if (item.type === 'number' || item.type === 'rate') {
- values.push('@mk_' + _key + '_mk@')
- } else {
- values.push(`'@mk_${_key}_mk@'`)
- }
+ values.push('@' + _key)
})
if (!keys.includes(primaryKey.toLowerCase())) {
@@ -3880,11 +3876,7 @@
let _key = item.key.toLowerCase()
_arr.push(_key)
- if (item.type === 'number' || item.type === 'rate') {
- _form.push(`${_key}=@mk_${_key}_mk@`)
- } else {
- _form.push(`${_key}='@mk_${_key}_mk@'`)
- }
+ _form.push(_key + '=@' + _key)
})
if (_actionType === 'audit') {
@@ -4827,7 +4819,8 @@
`
_tailScript = `${_tailScript}
- select @ErrorCode as ErrorCode,@retmsg as retmsg
+ aaa:
+ select @ErrorCode as ErrorCode,@retmsg as retmsg
`
}
--
Gitblit v1.8.0