From 3f0f0b7e222cf0c159b6f646af7084ed4c29e409 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 26 八月 2023 10:46:52 +0800
Subject: [PATCH] 2023-08-26

---
 src/utils/utils.js |   75 ++++++++++++++++++++++++++++++-------
 1 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index bd64787..7f89611 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,6 +1,5 @@
 import moment from 'moment'
 import md5 from 'md5'
-import options from '@/store/options.js'
 
 const formatKeys = [
   { key: 'select', value: ' msltk ' },
@@ -798,8 +797,8 @@
     
     let baseurl = ''
     
-    if (options.cloudServiceApi) {
-      baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
+    if (window.GLOB.cloudServiceApi) {
+      baseurl = window.GLOB.cloudServiceApi.replace(/webapi(.*)$/, '')
     } else {
       baseurl = window.GLOB.baseurl
     }
@@ -932,14 +931,6 @@
 
       let _sql = script.sql
 
-      _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
-      _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
-      _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
-      _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
-      _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
-      _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
-      _sql = _sql.replace(/@typename@/ig, `'admin'`)
-
       if (script.position === 'init') {
         _initCustomScript += `
       /* 鑷畾涔夎剼鏈� */
@@ -976,7 +967,15 @@
       let _colindex = cols[cindex] || (cindex + 1)
       let _position = (_topline + lindex + 1) + '琛� ' + _colindex + '鍒� '
 
-      if (/^Nvarchar/ig.test(col.type)) {
+      if (col.import === 'init') {
+        if (/^Nvarchar/ig.test(col.type)) {
+          val = ''
+        } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
+          val = 0
+        } else if (col.type === 'date') {
+          val = '1949-10-01'
+        }
+      } else if (/^Nvarchar/ig.test(col.type)) {
         val = val + ''
 
         if (/'/.test(val)) {
@@ -1145,7 +1144,31 @@
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+    _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+    _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+    _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+    _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+    _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+    _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+    _sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+    _sqlBottom = _sqlBottom.replace(/@ID@/ig, `'${primaryId || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+    _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+    if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+      _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+      _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+    } else {
+      _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+      _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+    }
+
+    if (window.GLOB.debugger === true) {
       let fsql = `
       ${_sql}
       ${_sqlInsert}
@@ -1358,7 +1381,29 @@
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+    _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+    _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+    _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+    _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+    _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+    _sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+    _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+    _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+    _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+    if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+      _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+      _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+    } else {
+      _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+      _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+    }
+
+    if (window.GLOB.debugger === true) {
       let fsql = `
       ${_sql}
       ${_sqlInsert}
@@ -2149,7 +2194,7 @@
     _sql = _sql.replace(/@datam@/ig, '\'\'')
   }
 
-  if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+  if (window.GLOB.debugger === true) {
     // _sql = _sql.replace(/\n\s{8}/ig, '\n')
     console.info(_sql)
   }

--
Gitblit v1.8.0