From 4b3eecf7ac7eaa4c86e018ffb09785c66449bbea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 22:11:30 +0800
Subject: [PATCH] 2023-08-27

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.jsx |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 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 4df974a..10f41bf 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
 
@@ -1674,20 +1674,12 @@
     if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
       param.func = 'sPC_TableData_InUpDe'
       
-      if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-        result.sql = result.sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
-        result.bottom = result.bottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
-      } else {
-        result.sql = result.sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
-        result.bottom = result.bottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
-      }
-      
-      param.excel_in_type = 'true'
-      param.LText1 = Utils.formatOptions(result.insert)
-      param.LText2 = Utils.formatOptions(result.bottom)
+      delete param.excel_in
+
+      param.exec_type = 'y'
       param.LText = Utils.formatOptions(result.sql)
       param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-      param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+      param.secretkey = Utils.encrypt('', param.timestamp)
 
       param.menuname = submit.logLabel
 
@@ -1709,6 +1701,11 @@
     } else if (submit.intertype === 'inner' && submit.innerFunc) { // 鑷畾涔夊瓨鍌ㄨ繃绋�
       param.func = submit.innerFunc
 
+      if (submit.recordUser === 'true') {
+        param.username = sessionStorage.getItem('User_Name') || ''
+        param.fullname = sessionStorage.getItem('Full_Name') || ''
+      }
+
       Api.genericInterface(param).then((res) => {
         if (res.status) {
           this.execSuccess(res)

--
Gitblit v1.8.0