From dbc911dbb044895f98a49ef69ef5a5800a4aba3e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 15 九月 2024 20:26:39 +0800
Subject: [PATCH] 2024-09-15
---
src/utils/utils-custom.js | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index b2de0d7..156e414 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1950,6 +1950,33 @@
}
if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
+ if (cell.Ot !== 'requiredOnce' && ['pop', 'form'].includes(cell.OpenType) && cell.verify && cell.verify.uniques && cell.verify.uniques.length > 0) {
+ let forms = ['BID']
+
+ if (cell.OpenType === 'form') {
+ forms.push(cell.field)
+ } else if (cell.modal && cell.modal.fields.length > 0) {
+ cell.modal.fields.forEach(n => {
+ if (!n.field) return
+ forms.push(n.field)
+ })
+ }
+ let emptys = []
+ cell.verify.uniques.forEach(m => {
+ if (m.status === 'false') return
+
+ m.field.split(',').forEach(n => {
+ if (!forms.includes(n)) {
+ emptys.push(n)
+ }
+ })
+ })
+
+ if (emptys.length) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓笉瀛樺湪锛乣})
+ }
+ }
+
if (cell.OpenType === 'form' && cell.formType === 'count_line') return
if (cell.intertype === 'system') {
@@ -3428,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') {
@@ -3805,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())) {
@@ -3853,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') {
--
Gitblit v1.8.0