From d6ae7fa6b223fd93b57e3eb178e1bcf644308039 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 九月 2024 23:15:58 +0800
Subject: [PATCH] 2024-09-13
---
src/tabviews/zshare/mutilform/index.jsx | 2 +-
src/tabviews/zshare/actionList/normalbutton/index.jsx | 2 +-
src/utils/utils-custom.js | 31 ++++++++++++++++++++-----------
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 6918303..930e5db 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -836,7 +836,7 @@
let formkeys = []
formdata && formdata.forEach(form => {
- if (!ex.reps.includes(form.key)) return
+ // if (!ex.reps.includes(form.key)) return
formkeys.push(form.key)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index d12682c..1ef2156 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -772,7 +772,7 @@
resetFocus = (id, field) => {
const { action } = this.props
- if (id !== action.uuid) return
+ if (id !== action.uuid.replace(/_pop$/, '')) return
let focusId = ''
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 734009d..968cc1c 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3797,7 +3797,11 @@
let _key = item.key.toLowerCase()
keys.push(_key)
- values.push('@mk_' + _key + '_mk@')
+ if (item.type === 'number' || item.type === 'rate') {
+ values.push('@mk_' + _key + '_mk@')
+ } else {
+ values.push(`'@mk_${_key}_mk@'`)
+ }
})
if (!keys.includes(primaryKey.toLowerCase())) {
@@ -3841,7 +3845,11 @@
let _key = item.key.toLowerCase()
_arr.push(_key)
- _form.push(_key + '=@mk_' + _key + '_mk@')
+ if (item.type === 'number' || item.type === 'rate') {
+ _form.push(`${_key}=@mk_${_key}_mk@`)
+ } else {
+ _form.push(`${_key}='@mk_${_key}_mk@'`)
+ }
})
if (_actionType === 'audit') {
@@ -4190,8 +4198,8 @@
columns.forEach(col => {
let _key = col.field.toLowerCase()
- if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return
- if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
+ if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return
+ // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
colreps.push(col.field)
@@ -4301,6 +4309,7 @@
return true
})
+ colreps = Array.from(new Set(colreps))
reps = [...reps, ...colreps]
return { LText: _sql, md5: md5(_sql), reps }
@@ -4447,7 +4456,7 @@
`
}
- let testSql = _prev + _back
+ let testSql = _prev + _back + (btn.output || '')
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
if (btn.Ot !== 'notRequired' && columns.length > 0) {
@@ -4455,8 +4464,8 @@
columns.forEach(col => {
let _key = col.field.toLowerCase()
- if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(testSql)) return
- if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return
+ if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(testSql)) return
+ // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return
colreps.push(col.field)
@@ -5544,8 +5553,8 @@
component.columns.forEach(col => {
let _key = col.field.toLowerCase()
- if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(msg.LText)) return
- if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return
+ if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(msg.LText)) return
+ // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return
colreps.push(col.field)
@@ -5631,8 +5640,8 @@
component.columns.forEach(col => {
let _key = col.field.toLowerCase()
- if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return
- if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
+ if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return
+ // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
colreps.push(col.field)
--
Gitblit v1.8.0