From 2f3b614bb34f5e2865e91c949712f5ee5e8a18f2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 21:43:52 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 144 ++++++++++++-----------------------------------
1 files changed, 37 insertions(+), 107 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index a3f7acc..f2d3e00 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,3 +1,4 @@
+import React from 'react'
import moment from 'moment'
import md5 from 'md5'
@@ -112,46 +113,6 @@
let _str = salt + timestamp + secretkey
return md5(_str)
- }
-
- /**
- * @description sql璇硶楠岃瘉
- * @return {String} sql sql璇彞
- * @return {String} type 楠岃瘉绫诲瀷
- */
- static verifySql (sql, type) {
- if (!sql) return ''
- let chars = [
- {key: 'create', reg: /(^|\s|\(|\))create\s/ig},
- {key: 'insert', reg: /(^|\s|\(|\))insert\s/ig},
- {key: 'delete', reg: /(^|\s|\(|\))delete\s/ig},
- {key: 'update', reg: /(^|\s|\(|\))update\s/ig},
- {key: 'set', reg: /(^|\s|\(|\))set\s/ig},
- {key: 'drop', reg: /(^|\s|\(|\))drop\s/ig},
- {key: 'alter', reg: /(^|\s|\(|\))alter\s/ig},
- {key: 'truncate', reg: /(^|\s|\(|\))truncate\s/ig},
- {key: 'if', reg: /(^|\s|\(|\))if\s/ig},
- {key: 'exec', reg: /(^|\s|\(|\))exec(\s|\()/ig},
- {key: 'OBJECT', reg: /(^|\s|\(|\))object(\s|\()/ig},
- {key: 'sys.', reg: /(^|\s|\(|\))sys\./ig},
- {key: 'kill', reg: /(^|\s|\(|\))kill\s/ig}
- ]
-
- if (type === 'customscript') {
- chars = chars.filter(char => !['create', 'insert', 'delete', 'update', 'set', 'drop', 'if', 'exec'].includes(char.key))
- }
-
- let error = ''
-
- sql = sql.replace(/sys\.fn_/ig, '') // 璺宠繃sys.fn_楠岃瘉
-
- chars.forEach(char => {
- if (!error && char.reg.test(sql)) {
- error = char.key
- }
- })
-
- return error
}
/**
@@ -978,7 +939,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 + '鍐呭搴斾负鏁板��')
@@ -1407,7 +1372,7 @@
* @return {Array} columns 鏄剧ず鍒�
* @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥�
*/
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams, getOptions) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams) {
let primaryId = param.ID
let BID = param.BID || ''
let verify = btn.verify || {}
@@ -1657,47 +1622,9 @@
}
// 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- if (btn.sqlType !== 'insert' && btn.Ot !== 'notRequired' && verify.invalid === 'true' && setting.dataresource) {
- let datasource = setting.dataresource
- let customScript = setting.customScript || ''
- let search = moduleParams ? moduleParams.search : null
- let orderBy = moduleParams ? moduleParams.orderBy : setting.order
-
- if (/\s/.test(datasource) && !/tb$/.test(datasource)) { // 鎷兼帴鍒悕
- datasource = '(' + datasource + ') tb'
- }
-
- if (getOptions && (setting.queryType === 'statistics' || customScript)) {
- let allSearch = getOptions(search)
-
- let regoptions = allSearch.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
- regoptions.push({
- reg: new RegExp('@userName@', 'ig'),
- value: `'${userName}'`
- }, {
- reg: new RegExp('@fullName@', 'ig'),
- value: `'${fullName}'`
- }, {
- reg: new RegExp('@orderBy@', 'ig'),
- value: orderBy
- }, {
- reg: new RegExp('@pageSize@', 'ig'),
- value: 999999
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- value: 1
- })
-
- regoptions.forEach(item => {
- datasource = datasource.replace(item.reg, item.value)
- customScript = customScript.replace(item.reg, item.value)
- })
- }
+ if (verify.invalid === 'true' && moduleParams && moduleParams.dataresource) {
+ let datasource = moduleParams.dataresource
+ let customScript = moduleParams.customScript || ''
if (customScript) {
_sql += `
@@ -1907,7 +1834,7 @@
let hasvoucher = false
// 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
- if (verify.voucher && verify.voucher.enabled && data) {
+ if (verify.voucher && verify.voucher.enabled) {
let _voucher = verify.voucher
hasvoucher = true
@@ -1915,7 +1842,7 @@
_sql += `
/* 鍒涘缓鍑瘉 */
exec s_BVoucher_Create
- @Bill ='${_data[_voucher.linkField.toLowerCase()]}',
+ @Bill ='${_data[_voucher.linkField.toLowerCase()] || ''}',
@BVoucherType ='${_voucher.BVoucherType}',
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -2369,6 +2296,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 {
@@ -2393,12 +2324,8 @@
/**
* @description 鑾峰彇鏍囪淇℃伅
*/
-export function getMark (marks, record, style = {}) {
- let icon = null
- let innerStyle = null
- let position = null
- let signType = ''
- style = JSON.parse(JSON.stringify(style))
+export function getMark (marks, record, style) {
+ let res = {signType: ''}
marks.some(mark => {
let originVal = record[mark.field[0]]
@@ -2434,42 +2361,45 @@
if (type === 'font') {
style.color = mark.color
- innerStyle = {color: mark.color}
- signType = ' sign-font'
+ res.innerStyle = {color: mark.color}
+ res.signType = ' sign-font'
} else if (type === 'background') {
style.backgroundColor = mark.color
if (mark.fontColor) {
style.color = mark.fontColor
- innerStyle = {color: mark.fontColor}
+ res.innerStyle = {color: mark.fontColor}
}
} else if (type === 'underline') {
style.textDecoration = 'underline'
style.color = mark.color
- innerStyle = {color: mark.color, textDecoration: 'underline'}
+ res.innerStyle = {color: mark.color, textDecoration: 'underline'}
} else if (type === 'line-through') {
style.textDecoration = 'line-through'
style.color = mark.color
- innerStyle = {color: mark.color, textDecoration: 'line-through'}
+ res.innerStyle = {color: mark.color, textDecoration: 'line-through'}
} else if (type.indexOf('icon') > -1) {
- icon = mark.signType[mark.signType.length - 1]
- innerStyle = {color: mark.color}
+ res.icon = mark.signType[mark.signType.length - 1]
+ res.innerStyle = {color: mark.color}
if (type === 'iconfront' || mark.signType[1] === 'front') {
- position = 'front'
+ res.position = 'front'
} else {
- position = 'back'
+ res.position = 'back'
}
+ } else if (type === 'indent') {
+ style.color = mark.color
+ res.space = Array(mark.signType[1] + 1).join(' ')
+ } else if (type === 'pointfront') {
+ res.position = 'front'
+ res.point = <span style={{display: 'inline-block', marginRight: '3px', width: '8px', height: '8px', borderRadius: '14px', background: mark.color, verticalAlign: 'middle'}}></span>
+ } else if (type === 'pointback') {
+ res.position = 'back'
+ res.point = <span style={{display: 'inline-block', marginLeft: '3px', width: '8px', height: '8px', borderRadius: '14px', background: mark.color, verticalAlign: 'middle'}}></span>
}
return true
})
- return {
- style,
- icon,
- innerStyle,
- position,
- signType
- }
+ return res
}
/**
--
Gitblit v1.8.0