From 930a74e9fb7bd74e7fb0875b13d16657c1163c58 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 一月 2023 10:17:41 +0800
Subject: [PATCH] 2023-01-13
---
src/utils/utils.js | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index e92cda2..2a82699 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)
}
}
@@ -1485,7 +1487,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 +2042,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++
})
}
@@ -2147,6 +2148,7 @@
let icon = null
let innerStyle = null
let position = null
+ let signType = ''
style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
@@ -2184,6 +2186,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 +2218,8 @@
style,
icon,
innerStyle,
- position
+ position,
+ signType
}
}
@@ -2566,9 +2570,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 +2711,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