From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 15 八月 2023 14:22:03 +0800 Subject: [PATCH] 2023-08-15 --- src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 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 f8bfcf3..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 @@ -1673,16 +1673,6 @@ if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼ param.func = 'sPC_TableData_InUpDe' - - if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺 - result.sql = result.sql.replace(/\$@/ig, '/*') - result.sql = result.sql.replace(/@\$/ig, '*/') - result.bottom = result.bottom.replace(/\$@/ig, '/*') - result.bottom = result.bottom.replace(/@\$/ig, '*/') - } else { - result.sql = result.sql.replace(/@\$|\$@/ig, '') - result.bottom = result.bottom.replace(/@\$|\$@/ig, '') - } param.excel_in_type = 'true' param.LText1 = Utils.formatOptions(result.insert) -- Gitblit v1.8.0