From b7175585de65ddaf92c78294b7f2225b81fae2ac Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:40 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 8835f6b..b7e5af0 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -440,7 +440,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 = ''
@@ -456,7 +456,7 @@
// eslint-disable-next-line
content = eval(content)
} catch (e) {
- if (window.debugger) {
+ if (window.GLOB.debugger === true) {
console.info(content)
console.warn(e)
}
@@ -849,7 +849,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 = ''
@@ -865,7 +865,7 @@
// eslint-disable-next-line
content = eval(content)
} catch (e) {
- if (window.debugger) {
+ if (window.GLOB.debugger === true) {
console.info(content)
console.warn(e)
}
@@ -1159,7 +1159,7 @@
let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
let localItems = [] // 鏈湴鏁版嵁
let cache = setting.cache !== 'false'
- let debug = window.GLOB.debugger === true || window.debugger === true
+ let debug = window.GLOB.debugger === true
let _sql = `Declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) select @mk_departmentcode='${sessionStorage.getItem('departmentcode') || ''}',@mk_organization='${sessionStorage.getItem('organization') || ''}',@mk_user_type='${sessionStorage.getItem('mk_user_type') || ''}'\n`
let _sso = _sql
--
Gitblit v1.8.0