From eee991f412fc8250ffe9ba8dd074fc4d0cf6eaa2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 十月 2023 09:09:14 +0800
Subject: [PATCH] 2023-10-31

---
 src/utils/utils.js |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2062f1d..2861db2 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2370,6 +2370,10 @@
   _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
   _sql = _sql.replace(/@typename@/ig, `'admin'`)
 
+  if (window.GLOB.externalDatabase !== null) {
+    _sql = _sql.replace(/@db@/ig, window.GLOB.externalDatabase)
+  }
+
   if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
     _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, `'Y'`)
   } else {
@@ -2394,9 +2398,8 @@
 /**
  * @description 鑾峰彇鏍囪淇℃伅
  */
-export function getMark (marks, record, style = {}) {
-  style = JSON.parse(JSON.stringify(style))
-  let res = {style}
+export function getMark (marks, record, style) {
+  let res = {}
 
   marks.some(mark => {
     let originVal = record[mark.field[0]]
@@ -2431,22 +2434,22 @@
     let type = mark.signType[0]
 
     if (type === 'font') {
-      res.style.color = mark.color
+      style.color = mark.color
       res.innerStyle = {color: mark.color}
       res.signType = ' sign-font'
     } else if (type === 'background') {
-      res.style.backgroundColor = mark.color
+      style.backgroundColor = mark.color
       if (mark.fontColor) {
-        res.style.color = mark.fontColor
+        style.color = mark.fontColor
         res.innerStyle = {color: mark.fontColor}
       }
     } else if (type === 'underline') {
-      res.style.textDecoration = 'underline'
-      res.style.color = mark.color
+      style.textDecoration = 'underline'
+      style.color = mark.color
       res.innerStyle = {color: mark.color, textDecoration: 'underline'}
     } else if (type === 'line-through') {
-      res.style.textDecoration = 'line-through'
-      res.style.color = mark.color
+      style.textDecoration = 'line-through'
+      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 +2460,7 @@
         res.position = 'back'
       }
     } else if (type === 'indent') {
-      res.style.color = mark.color
+      style.color = mark.color
       res.space = Array(mark.signType[1] + 1).join('&nbsp;')
     } else if (type === 'pointfront') {
       res.position = 'front'

--
Gitblit v1.8.0