From 26d0fa42ea8c63a87e8ef93d0915f75f46fb1f9c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 三月 2022 11:09:53 +0800
Subject: [PATCH] 2022-03-24
---
src/utils/utils-datamanage.js | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index d024e99..6c428a5 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -200,9 +200,9 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
}
if (setting.$name) {
@@ -212,6 +212,25 @@
param.custom_script = Utils.formatOptions(_customScript)
param.LText = Utils.formatOptions(LText)
param.DateCount = Utils.formatOptions(DateCount)
+
+ // 澶氬眰缁撴瀯鏁版嵁
+ // LText = `SELECT a.id as bid,a.ID,a.workerCode,a.workerName,a.jobName,a.Initials,case when isnull(m.friend_id ,'') ='' then ''
+ // when isnull(m.status,0)=10 then '宸叉坊鍔�' else '寰呴�氳繃' end as friend_text
+ // ,case when images='' then 'http://epc.mk9h.cn/Content/images/upload/img/kane.jpg' else images end as icon FROM
+ // (select friend_id,status from oa_mail_list where userid='sso202004100959326131C0805998B6745F886F9' and Initials=case when right('0',1)='0' then Initials else '0' end
+ // and status=10 and deleted=0) m
+ // inner join (select * from BD_workers where
+ // Initials=case when right('0',1)='0' then Initials else '0' end and deleted=0 ) a
+ // on a.id=m.friend_id `
+ // param.custom_script = ''
+ // param.LText = Utils.formatOptions(LText)
+ // param.DateCount = ''
+ // param.prm_field = 'workerCode'
+ // param.arr_field = 'workerName,jobName'
+ // param.tabid = 'ID'
+ // param.parid = 'BID'
+ // param.sub_name = 'sub_data'
+ // param.sub_field = 'BID,friend_text,icon,Initials'
// exec_type: 'y' 瑙ｇ爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
@@ -320,7 +339,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
_customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText)
}
@@ -443,7 +462,7 @@
})
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
}
@@ -518,7 +537,7 @@
sql = _prevCustomScript + sql
sql = sql + _backCustomScript
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
@@ -676,7 +695,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ 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)
}
--
Gitblit v1.8.0