From 567cea64c520654876e8c1a7f4ca2baf2c1c773f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 25 十一月 2022 11:16:39 +0800
Subject: [PATCH] 2022-11-25
---
src/utils/utils.js | 85 +++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2ac3152..af68c88 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -59,6 +59,25 @@
}
/**
+ * @description 鑾峰彇鍥捐〃楂樺害
+ */
+ static getHeight (val) {
+ if (typeof(val) === 'string') {
+ if (val.indexOf('px') > -1) {
+ val = parseFloat(val)
+ } else if (val.indexOf('vw') > -1) {
+ val = parseFloat(val)
+ val = document.body.clientWidth * val / 100
+ } else if (val.indexOf('vh') > -1) {
+ val = parseFloat(val)
+ val = document.body.clientHeight * val / 100
+ }
+ }
+
+ return parseInt(val || 400) - 30
+ }
+
+ /**
* @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
* @return {String} name
*/
@@ -158,7 +177,7 @@
let error = ''
- sql = sql.replace(/sys\.fn_sqlvarbasetostr\(HashBytes\('MD5'/ig, '') // 璺宠繃MD5鍔犲瘑
+ sql = sql.replace(/sys\.fn_/ig, '') // 璺宠繃sys.fn_楠岃瘉
chars.forEach(char => {
if (!error && char.reg.test(sql)) {
@@ -789,10 +808,8 @@
arrfield = arrfield.join(',')
if (item.orderBy) {
- // sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
sql = `select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} order by orderfield ${item.orderType}`
} else {
- // sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
sql = `select distinct ${arrfield} from ${_datasource}`
}
@@ -810,10 +827,6 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
-
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
- console.info(sql)
- }
return {
sql: sql,
@@ -1369,17 +1382,16 @@
* @return {Object} param 璇锋眰鍙傛暟
* @return {Array} data 鍒楄〃琛屾暟鎹�
* @return {Array} columns 鏄剧ず鍒�
- * @return {Object} tab 鏍囩淇℃伅
* @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥�
*/
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams, getOptions) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams, getOptions) {
let primaryId = param.ID
- let BID = param.BID
+ let BID = param.BID || ''
let verify = btn.verify || {}
let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
let _actionType = null
let _callbacksql = ''
- let foreignKey = tab && tab.foreignKey ? tab.foreignKey.toLowerCase() : ''
+ let foreignKey = setting.foreignKey ? setting.foreignKey.toLowerCase() : ''
if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
_actionType = btn.sqlType
@@ -1434,14 +1446,11 @@
if (form.type === 'number' || form.type === 'rate') {
let val = form.value
- if (typeof(val) !== 'number') {
- val = parseFloat(val)
- if (isNaN(val)) {
- val = 0
- }
+ if (isNaN(val)) {
+ val = 0
}
_initFormfields.push(`@${_key}=${val}`)
- } else if (['date', 'datemonth', 'datetime'].includes(form.type)) {
+ } else if (['date', 'datemonth'].includes(form.type)) {
_initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
} else {
_initFormfields.push(`@${_key}='${form.value}'`)
@@ -1476,7 +1485,7 @@
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
+ if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce' && columns && columns.length > 0) {
datavars = {...data, ...datavars}
const setField = (col) => {
@@ -1518,17 +1527,15 @@
}
}
- if (columns && columns.length > 0) {
- columns.forEach(col => {
- if (col.type === 'colspan' || col.type === 'old_colspan') {
- col.subcols.forEach(cell => {
- setField(cell)
- })
- } else {
- setField(col)
- }
- })
- }
+ columns.forEach(col => {
+ if (col.type === 'colspan' || col.type === 'old_colspan') {
+ col.subcols.forEach(cell => {
+ setField(cell)
+ })
+ } else {
+ setField(col)
+ }
+ })
}
// 鍙橀噺澹版槑
@@ -1560,7 +1567,7 @@
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
/* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @BillCode='', @ModularDetailCode=''
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @bid='${BID}', @BillCode='', @ModularDetailCode=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -1937,6 +1944,11 @@
values.push('@BID@')
}
+ if (!keys.includes('typename')) {
+ keys.push('typename')
+ values.push('@typename@')
+ }
+
keys = keys.join(',')
values = values.join(',')
_insertsql = `insert into ${btn.sql} (${keys}) select ${values};`
@@ -1994,6 +2006,9 @@
_form.push('FiYear=@FiYear')
}
}
+ if (!_arr.includes('typename')) {
+ _form.push('typename=@typename@')
+ }
_form = _form.join(',')
let _ID = '=@ID@'
@@ -2046,7 +2061,7 @@
_sql += `
/* 榛樿sql */
- insert into snote (remark,createuserid,CreateUser,CreateStaff) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname
+ insert into snote (remark,createuserid,CreateUser,CreateStaff,typename) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname,@typename@
delete ${btn.sql} where ${primaryKey}${_ID};`
} else if (_actionType === 'insertOrUpdate') {
_sql += `
@@ -2078,7 +2093,7 @@
end = /@breakpoint_end_[0-9a-z_]+\$\*\//ig
}
- _sql = _sql.replace(start, '').replace(end, '')
+ _sql = _sql.replace(start, '').replace(end, '').replace(/\$breakpoint_proc@/ig, window.GLOB.breakpoint)
_sql += `
z_debug_end: select @ErrorCode='E',@retmsg='debug_end' goto aaa`
}
@@ -2096,11 +2111,12 @@
}
_sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
- _sql = _sql.replace(/@BID@/ig, `'${BID || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
_sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
_sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@typename@/ig, `'admin'`)
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
// _sql = _sql.replace(/\n\s{8}/ig, '\n')
@@ -2109,7 +2125,7 @@
if (retmsg) {
_callbacksql = _callbacksql.replace(/@ID@/ig, `'${primaryId || ''}'`)
- _callbacksql = _callbacksql.replace(/@BID@/ig, `'${BID || ''}'`)
+ _callbacksql = _callbacksql.replace(/@BID@/ig, `'${BID}'`)
_callbacksql = _callbacksql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
_callbacksql = _callbacksql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_callbacksql = _callbacksql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
@@ -2140,6 +2156,7 @@
if (mark.field[1] === 'static') {
contrastVal = mark.contrastValue
+ originVal = originVal + ''
} else {
contrastVal = record[mark.field[2]]
}
--
Gitblit v1.8.0