From 64b4a25f578dbe459002d356e60a1a3657cb4595 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 一月 2023 00:57:23 +0800
Subject: [PATCH] 2023-01-12
---
src/utils/utils.js | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index e92cda2..0cfe180 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -783,6 +783,8 @@
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
+ } else if (item.colorField) {
+ arrfield.push(item.colorField)
}
}
@@ -2040,7 +2042,7 @@
_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 = ''
@@ -2147,6 +2149,7 @@
let icon = null
let innerStyle = null
let position = null
+ let signType = ''
style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
@@ -2184,6 +2187,7 @@
if (type === 'font') {
style.color = mark.color
innerStyle = {color: mark.color}
+ signType = ' sign-font'
} else if (type === 'background') {
style.backgroundColor = mark.color
if (mark.fontColor) {
@@ -2215,7 +2219,8 @@
style,
icon,
innerStyle,
- position
+ position,
+ signType
}
}
@@ -2566,9 +2571,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
@@ -2707,9 +2712,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