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 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 7da4357..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 = {}) {
+export function getMark (marks, record, style) {
let res = {}
- style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
let originVal = record[mark.field[0]]
--
Gitblit v1.8.0