From d1e443953eae3c5bdb0b443b4f5c3b7ced9236d7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十一月 2023 01:38:44 +0800
Subject: [PATCH] Merge branch 'positec' into bms
---
src/utils/utils.js | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 7da4357..3c4adea 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -979,7 +979,11 @@
})
}
} else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
- if (!val && val !== 0) {
+ if (col.required === 'false') {
+ if (!val || isNaN(val)) {
+ val = 0
+ }
+ } else if (!val && val !== 0) {
errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (isNaN(val)) { // 妫�楠屾槸鍚︿负鏁板��
errors.push(_position + '鍐呭搴斾负鏁板��')
@@ -2370,6 +2374,10 @@
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_sql = _sql.replace(/@typename@/ig, `'admin'`)
+ if (window.GLOB.externalDatabase !== null) {
+ _sql = _sql.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
_sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, `'Y'`)
} else {
@@ -2394,9 +2402,8 @@
/**
* @description 鑾峰彇鏍囪淇℃伅
*/
-export function getMark (marks, record, style = {}) {
- let res = {}
- style = JSON.parse(JSON.stringify(style))
+export function getMark (marks, record, style) {
+ let res = {signType: ''}
marks.some(mark => {
let originVal = record[mark.field[0]]
--
Gitblit v1.8.0