From d1f19b794216b37417e114b71c1cd7a2ac3d7748 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 01:14:29 +0800
Subject: [PATCH] 2023-03-02
---
src/utils/utils.js | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 66 insertions(+), 35 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index af68c88..09aede5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -78,20 +78,6 @@
}
/**
- * @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
- * @return {String} name
- */
- static getdataName () {
- let name = []
- let _options = 'abcdefghigklmnopqrstuvwxyz'
- for (let i = 0; i < 6; i++) {
- name.push(_options.substr(Math.floor(Math.random() * 26), 1))
- }
- name.splice(3, 0, new Date().getTime())
- return name.join('')
- }
-
- /**
* @description 鐢熸垚32浣島uid string + 鏃堕棿
* @return {String} uuid
*/
@@ -219,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鍔犲瘑
@@ -783,6 +798,8 @@
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
+ } else if (item.colorField) {
+ arrfield.push(item.colorField)
}
}
@@ -842,7 +859,7 @@
* @return {Object} dict 瀛楀吀椤�
* @return {String} BID 涓婄骇Id
*/
-export function getExcelInSql (item, data, dict, BID) {
+export function getExcelInSql (item, data, dict, BID, primaryId) {
let btn = item.verify
let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
let userName = sessionStorage.getItem('User_Name') || ''
@@ -895,20 +912,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}
`
}
})
@@ -1485,7 +1512,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) => {
@@ -2040,17 +2067,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++
})
}
@@ -2130,6 +2156,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,
@@ -2147,6 +2174,7 @@
let icon = null
let innerStyle = null
let position = null
+ let signType = ''
style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
@@ -2184,8 +2212,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}
@@ -2215,7 +2244,8 @@
style,
icon,
innerStyle,
- position
+ position,
+ signType
}
}
@@ -2274,7 +2304,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']
@@ -2329,7 +2359,7 @@
`
}
- let Ltext = `create proc ${param.innerFunc}
+ let Ltext = `create proc ${func}
( /*${menu.MenuName}*/
@appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@@ -2344,6 +2374,7 @@
@LoginUID nvarchar(50)='',
@SessionUid nvarchar(50)='',
@UserID nvarchar(50),
+ @dataM nvarchar(50),
@ErrorCode nvarchar(50) out,
@retmsg nvarchar(4000) out
)
@@ -2565,9 +2596,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
@@ -2706,9 +2737,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