From 0844cf7a0de1b38ff9649e7958adbfffe1b3532d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 九月 2023 10:09:48 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/share/normalTable/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index b286f49..90c6088 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -337,7 +337,7 @@
let func = new Function('data', col.formula)
content = func([record])
} catch (e) {
- if (window.debugger) {
+ if (window.GLOB.debugger === true) {
console.warn(e)
}
content = ''
@@ -352,7 +352,7 @@
// eslint-disable-next-line
content = eval(content)
} catch (e) {
- if (window.debugger) {
+ if (window.GLOB.debugger === true) {
console.info(content)
console.warn(e)
}
@@ -445,7 +445,7 @@
let rowspans = []
let orderfields = {}
- if (window.GLOB.dataFormat && !window.GLOB.mkHS) {
+ if (window.GLOB.dataFormat) {
_format = true
if (window.GLOB.memberLevel >= 30) {
--
Gitblit v1.8.0