From 43b14af93c44ff89cf9f24a45b0451e04e6b473a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十月 2023 10:00:50 +0800
Subject: [PATCH] 2023-10-23

---
 src/utils/utils.js |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 7da4357..2062f1d 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2395,8 +2395,8 @@
  * @description 鑾峰彇鏍囪淇℃伅
  */
 export function getMark (marks, record, style = {}) {
-  let res = {}
   style = JSON.parse(JSON.stringify(style))
+  let res = {style}
 
   marks.some(mark => {
     let originVal = record[mark.field[0]]
@@ -2431,22 +2431,22 @@
     let type = mark.signType[0]
 
     if (type === 'font') {
-      style.color = mark.color
+      res.style.color = mark.color
       res.innerStyle = {color: mark.color}
       res.signType = ' sign-font'
     } else if (type === 'background') {
-      style.backgroundColor = mark.color
+      res.style.backgroundColor = mark.color
       if (mark.fontColor) {
-        style.color = mark.fontColor
+        res.style.color = mark.fontColor
         res.innerStyle = {color: mark.fontColor}
       }
     } else if (type === 'underline') {
-      style.textDecoration = 'underline'
-      style.color = mark.color
+      res.style.textDecoration = 'underline'
+      res.style.color = mark.color
       res.innerStyle = {color: mark.color, textDecoration: 'underline'}
     } else if (type === 'line-through') {
-      style.textDecoration = 'line-through'
-      style.color = mark.color
+      res.style.textDecoration = 'line-through'
+      res.style.color = mark.color
       res.innerStyle = {color: mark.color, textDecoration: 'line-through'}
     } else if (type.indexOf('icon') > -1) {
       res.icon = mark.signType[mark.signType.length - 1]
@@ -2457,7 +2457,7 @@
         res.position = 'back'
       }
     } else if (type === 'indent') {
-      style.color = mark.color
+      res.style.color = mark.color
       res.space = Array(mark.signType[1] + 1).join('&nbsp;')
     } else if (type === 'pointfront') {
       res.position = 'front'

--
Gitblit v1.8.0