From afb39f8ab004b2607bb718edab02e99c7a010114 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 三月 2023 14:36:44 +0800
Subject: [PATCH] 2023-03-22
---
src/utils/utils.js | 188 +++++++++++++++++++++++++++-------------------
1 files changed, 109 insertions(+), 79 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 15dfac7..1a78fdb 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -59,17 +59,22 @@
}
/**
- * @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
- * @return {String} name
+ * @description 鑾峰彇鍥捐〃楂樺害
*/
- static getdataName () {
- let name = []
- let _options = 'abcdefghigklmnopqrstuvwxyz'
- for (let i = 0; i < 6; i++) {
- name.push(_options.substr(Math.floor(Math.random() * 26), 1))
+ 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
+ }
}
- name.splice(3, 0, new Date().getTime())
- return name.join('')
+
+ return parseInt(val || 400) - 30
}
/**
@@ -200,6 +205,35 @@
return value
}
+
+ // /**
+ // * @description sql瑙ｅ瘑
+ // * @return {String} value
+ // */
+ // static unFormatOptions (value) {
+ // if (!value) return ''
+
+ // value = window.atob(value)
+ // value = value.replace('minKe', '')
+ // value = window.decodeURIComponent(window.atob(value))
+
+ // // 澶栬仈鏁版嵁搴撴浛鎹�
+ // if (window.GLOB.externalDatabase !== null && window.GLOB.externalDatabase) {
+ // value = value.replace(window.GLOB.externalDatabase, '@db@')
+ // }
+
+ // value = value.replace(/ mpercent /ig, '%')
+
+ // // 鏇挎崲鍏抽敭瀛�
+ // formatKeys.forEach(item => {
+ // let reg = new RegExp('(\\s)?' + item.value.replace(/\s/g, '') + '(\\s)?', 'ig')
+ // value = value.replace(reg, ' ' + item.key + ' ')
+ // })
+
+ // // value = value.replace(/\n/ig, ' \n ')
+
+ // return value
+ // }
/**
* @description sPC_TableData_InUpDe sql鍔犲瘑
@@ -764,6 +798,8 @@
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
+ } else if (item.colorField) {
+ arrfield.push(item.colorField)
}
}
@@ -809,10 +845,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,
field: arrfield
@@ -824,10 +856,9 @@
* @description 鑾峰彇excel瀵煎叆鍙傛暟
* @return {Object} item 鎸夐挳淇℃伅
* @return {Array} data excel鏁版嵁
- * @return {Object} dict 瀛楀吀椤�
* @return {String} BID 涓婄骇Id
*/
-export function getExcelInSql (item, data, dict, BID) {
+export function getExcelInSql (item, data, BID, primaryId) {
let btn = item.verify
let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
let userName = sessionStorage.getItem('User_Name') || ''
@@ -880,20 +911,30 @@
btn.scripts.forEach(script => {
if (script.status === 'false') return
+ let _sql = script.sql
+
+ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _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 (script.position === 'init') {
_initCustomScript += `
/* 鑷畾涔夎剼鏈� */
- ${script.sql}
+ ${_sql}
`
} else if (script.position === 'front') {
_prevCustomScript += `
/* 鑷畾涔夎剼鏈� */
- ${script.sql}
+ ${_sql}
`
} else {
_backCustomScript += `
/* 鑷畾涔夎剼鏈� */
- ${script.sql}
+ ${_sql}
`
}
})
@@ -914,7 +955,7 @@
let val = item[col.Column] !== undefined ? item[col.Column] : ''
let _colindex = cols[cindex] || (cindex + 1)
- let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + _colindex + dict['main.excel.column'] + ' '
+ let _position = (_topline + lindex + 1) + '琛� ' + _colindex + '鍒� '
if (/^Nvarchar/ig.test(col.type)) {
if (typeof(val) === 'number') {
@@ -924,54 +965,54 @@
val = val.replace(/(^\s*$)|\t*|\v*|'*/ig, '')
if (!val && col.required === 'true') { // 蹇呭～鏍￠獙
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (col.limit && val.length > col.limit) { // 闀垮害鏍￠獙
- errors.push(_position + dict['main.excel.content.maxlimit'])
+ errors.push(_position + '鍐呭瓒呴暱')
} else { // 鍏抽敭瀛楁牎楠�
keys.forEach(key => {
let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
if (_patten.test(val)) {
- errors.push(_position + dict['main.excel.includekey'] + key)
+ errors.push(_position + '鍚湁鍏抽敭瀛�' + key)
}
})
}
} else if (/^int/ig.test(col.type)) {
if (!val && val !== 0) {
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else {
let _val = val + ''
if (!/^(([^0][0-9]+|0)$)|^(([1-9]+)$)/.test(_val)) { // 妫�楠屾槸鍚︿负鏁存暟
- errors.push(_position + dict['main.excel.content.interror'])
+ errors.push(_position + '鍐呭搴斾负鏁存暟')
} else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.limitmin'])
+ errors.push(_position + '灏忎簬鏈�灏忓��')
} else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
- errors.push(_position + dict['main.excel.content.limitmax'])
+ errors.push(_position + '澶т簬鏈�澶у��')
}
}
} else if (/^Decimal/ig.test(col.type)) {
if (!val && val !== 0) {
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else {
let _val = val + ''
let _vals = _val.split('.')
if (!/^(([^0][0-9]+|0)\.([0-9]+)$)|^(([^0][0-9]+|0)$)|^(([1-9]+)\.([0-9]+)$)|^(([1-9]+)$)/.test(_val)) { // 妫�楠屾槸鍚︿负娴偣鏁�
- errors.push(_position + dict['main.excel.content.floaterror'])
+ errors.push(_position + '鍐呭搴斾负娴偣鏁�')
} else if (_vals[0].length > 18) { // 妫�楠屾暣鏁颁綅
- errors.push(_position + dict['main.excel.content.floatIntover'])
+ errors.push(_position + '鏁存暟浣嶈秴鍑鸿寖鍥�')
} else if (_vals[1] && _vals[1].length > col.limit) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.floatPointover'])
+ errors.push(_position + '灏忔暟浣嶈秴鍑鸿寖鍥�')
} else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.limitmin'])
+ errors.push(_position + '灏忎簬鏈�灏忓��')
} else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
- errors.push(_position + dict['main.excel.content.limitmax'])
+ errors.push(_position + '澶т簬鏈�澶у��')
}
}
} else if (col.type === 'date') {
if (typeof(val) === 'number') {
if (val > 2958465 || val <= 0) { // 鏃堕棿杩囧ぇ鎴栧皬浜庣瓑浜�0
- errors.push(_position + dict['main.excel.content.date.over'])
+ errors.push(_position + '鏃堕棿涓鸿礋鍊兼垨澶ぇ')
} else { // 鏃堕棿鏍煎紡鍖�
if (val < 60) { // 1900-2-29锛宔xcel涓瓨鍦紝瀹為檯涓嶅瓨鍦�
val++
@@ -981,12 +1022,12 @@
} else if (typeof(val) === 'string') {
val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
if (!val && col.required === 'true') { // 鏃堕棿蹇呭～鏍￠獙
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (val && !/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝ｅ垯鏍￠獙
- errors.push(_position + dict['main.excel.content.date.formatError'])
+ errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
} else { // 鏃堕棿鏍煎紡閿欒
- errors.push(_position + dict['main.excel.content.date.formatError'])
+ errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
}
@@ -1470,7 +1511,7 @@
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce' && columns && columns.length > 0) {
+ if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
datavars = {...data, ...datavars}
const setField = (col) => {
@@ -2025,17 +2066,16 @@
_sql += `
/* 榛樿sql */
- update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifyuserid=@userid@ where ${primaryKey}${_ID};`
+ update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@ where ${primaryKey}${_ID};`
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
- if (data && columns && columns.length > 0) {
+ if (data && columns && columns.length > 0 && btn.Ot !== 'notRequired') {
let _index = 0
columns.forEach(col => {
- if (col.Hide !== 'true' && col.type !== 'colspan' && col.type !== 'old_colspan' && _index < 4) {
- _msg += col.label + '=' + data[col.field] + ','
- _index++
- }
+ if (!col.field || col.Hide === 'true' || _index >= 4) return
+ _msg += col.label + '=' + data[col.field] + ','
+ _index++
})
}
@@ -2115,6 +2155,7 @@
_callbacksql = _callbacksql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_callbacksql = _callbacksql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_callbacksql = _callbacksql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _callbacksql = _callbacksql.replace(/@typename@/ig, `'admin'`)
return {
sql: _sql,
@@ -2132,6 +2173,7 @@
let icon = null
let innerStyle = null
let position = null
+ let signType = ''
style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
@@ -2169,8 +2211,9 @@
if (type === 'font') {
style.color = mark.color
innerStyle = {color: mark.color}
+ signType = ' sign-font'
} else if (type === 'background') {
- style.background = mark.color
+ style.backgroundColor = mark.color
if (mark.fontColor) {
style.color = mark.fontColor
innerStyle = {color: mark.fontColor}
@@ -2200,7 +2243,8 @@
style,
icon,
innerStyle,
- position
+ position,
+ signType
}
}
@@ -2209,36 +2253,21 @@
*/
export function setGLOBFuncs () {
window.GLOB.funcs = []
- if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+ if (!window.GLOB.IndexDB) {
return
}
- if (window.GLOB.WebSql) {
- window.GLOB.WebSql.transaction(tx => {
- tx.executeSql("SELECT * FROM FUNCS", [], (tx, results) => {
- let rows = results.rows
- if (!rows || rows.length === 0) return
- for (let i = 0; i < rows.length; i++) {
- window.GLOB.funcs.push({
- func_code: rows[i].func_code,
- key_sql: window.decodeURIComponent(window.atob(rows[i].key_sql))
- })
- }
+ let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
+
+ objectStore.openCursor().onsuccess = (event) => {
+ let cursor = event.target.result
+
+ if (cursor) {
+ window.GLOB.funcs.push({
+ func_code: cursor.value.func_code,
+ key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
})
- })
- } else {
- let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
-
- objectStore.openCursor().onsuccess = (event) => {
- let cursor = event.target.result
-
- if (cursor) {
- window.GLOB.funcs.push({
- func_code: cursor.value.func_code,
- key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
- })
- cursor.continue()
- }
+ cursor.continue()
}
}
}
@@ -2259,7 +2288,7 @@
* @description 鍒涘缓椤甸潰瀛樺偍杩囩▼
* @return {String}
*/
- static getTableFunc (param, menu, config) {
+ static getTableFunc (func = 'func', menu, config) {
let form = ''
let formParam = ''
let _vars = ['bid', 'pageindex', 'pagesize', 'ordercol', 'ordertype', 'exceltype', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
@@ -2314,7 +2343,7 @@
`
}
- let Ltext = `create proc ${param.innerFunc}
+ let Ltext = `create proc ${func}
( /*${menu.MenuName}*/
@appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@@ -2329,6 +2358,7 @@
@LoginUID nvarchar(50)='',
@SessionUid nvarchar(50)='',
@UserID nvarchar(50),
+ @dataM nvarchar(50),
@ErrorCode nvarchar(50) out,
@retmsg nvarchar(4000) out
)
@@ -2550,9 +2580,9 @@
@ErrorSeverity=ERROR_SEVERITY(),
@ErrorState=ERROR_STATE();
- RAISERROR(@ErrorMessage, /*-- Message text.*/
- @ErrorSeverity, /*-- Severity.*/
- @ErrorState /*-- State.*/
+ RAISERROR(@ErrorMessage, /* Message text.*/
+ @ErrorSeverity, /* Severity.*/
+ @ErrorState /* State.*/
);
END CATCH
@@ -2691,9 +2721,9 @@
@ErrorSeverity=ERROR_SEVERITY(),
@ErrorState=ERROR_STATE();
- RAISERROR(@ErrorMessage, /*-- Message text.*/
- @ErrorSeverity, /*-- Severity.*/
- @ErrorState /*-- State.*/
+ RAISERROR(@ErrorMessage, /* Message text.*/
+ @ErrorSeverity, /* Severity.*/
+ @ErrorState /* State.*/
);
END CATCH
--
Gitblit v1.8.0