From bdb160a8fbc58a585506c8283d33631ddd31e630 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 04 七月 2022 18:44:27 +0800
Subject: [PATCH] 2022-07-04

---
 src/utils/utils-datamanage.js |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 954937d..78e8435 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -763,14 +763,9 @@
     `
   }
 
-  // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
-  if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
-    _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
-    _dataresource && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _dataresource)
-  }
-
   return {
     name: dataName,
+    $name: setting.$name,
     columns: columns,
     par_tablename: '',
     type: format === 'array' ? format : '',
@@ -821,6 +816,12 @@
     _sql = _sql.replace(/@time_id@/ig, `'${time_id}'`)
     _script = _script.replace(/@time_id@/ig, `'${time_id}'`)
 
+    // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
+    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+      _script && console.info(`${item.$name ? `/*${item.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
+      _sql && console.info(`${item.$name ? `/*${item.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _sql)
+    }
+
     item.columns.forEach(cell => {
       LText_field.push(`Select '${item.name}' as tablename,'${cell.field}' as fieldname,'${cell.datatype}' as field_type`)
     })

--
Gitblit v1.8.0