From 326aa6b3effaccc71cfe0775d47b0f29eb3695a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 25 八月 2024 00:36:40 +0800
Subject: [PATCH] 2024-08-25
---
src/utils/utils-datamanage.js | 103 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 88 insertions(+), 15 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 6210d62..4e96051 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -142,23 +142,24 @@
{ reg: /@orderBy@/ig, value: orderBy },
{ reg: /@pageSize@/ig, value: setting.laypage ? pageSize : '9999' },
{ reg: /@pageIndex@/ig, value: pageIndex},
- { reg: /@select\$|\$select@/ig, value: ''},
- { reg: /\$sum@/ig, value: '/*'},
- { reg: /@sum\$/ig, value: '*/'},
+ // { reg: /@select\$|\$select@/ig, value: ''},
+ // { reg: /\$sum@/ig, value: '/*'},
+ // { reg: /@sum\$/ig, value: '*/'},
{ reg: /@ID@/ig, value: `'${id || ''}'`},
{ reg: /@BID@/ig, value: `'${BID || ''}'`},
{ reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
{ reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{ reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{ reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ { reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{ reg: /@typename@/ig, value: `'admin'`},
)
if (setting.hasExtend) {
- regoptions.push({ reg: /@mk_time@/ig, value: setting.extendTime })
+ regoptions.push({ reg: /@mk_time@/ig, value: `'${setting.extendTime}'` })
}
if (setting.$re_year) {
- regoptions.push({ reg: /@mk_year@/ig, value: year })
+ regoptions.push({ reg: /@mk_year@/ig, value: `'${year}'` })
}
regoptions.forEach(item => {
@@ -279,14 +280,80 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
- DateCount && console.info(`${setting.$name ? `/*${setting.$name} 鎬绘暟鏌ヨ*/\n` : ''}` + DateCount.replace(/\n\s{8}/ig, '\n'))
+ _customScript && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
+ DateCount && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鎬绘暟鏌ヨ*/\n` : ''}` + DateCount.replace(/\n\s{8}/ig, '\n'))
}
if (setting.$name) {
param.menuname = setting.$name
}
+
+ // if (window.backend && window.GLOB.CacheData.has('sql_' + setting.uuid)) {
+ // let item = window.GLOB.CacheData.get('sql_' + setting.uuid)
+
+ // let values = {
+ // userid: sessionStorage.getItem('UserID') || '',
+ // time_id: Utils.getguid(),
+ // username: userName,
+ // fullname: fullName,
+ // roleid: RoleID,
+ // mk_departmentcode: departmentcode,
+ // mk_organization: organization,
+ // mk_user_type: mk_user_type,
+ // mk_nation: nation,
+ // mk_province: province,
+ // mk_city: city,
+ // mk_district: district,
+ // mk_address: address,
+ // orderby: orderBy,
+ // pagesize: setting.laypage ? pageSize : '9999',
+ // pageindex: pageIndex,
+ // id: id || '',
+ // bid: BID || '',
+ // loginuid: sessionStorage.getItem('LoginUID') || '',
+ // sessionuid: localStorage.getItem('SessionUid') || '',
+ // appkey: window.GLOB.appkey || '',
+ // lang: sessionStorage.getItem('lang'),
+ // typename: 'admin',
+ // datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ // datam_begin: sessionStorage.getItem('dataM') === 'true' ? '/*' : '',
+ // datam_end: sessionStorage.getItem('dataM') === 'true' ? '*/' : '',
+ // }
+
+ // if (setting.hasExtend) {
+ // values.mk_time = setting.extendTime
+ // }
+ // if (setting.$re_year) {
+ // values.mk_year = year
+ // }
+ // if (window.GLOB.externalDatabase !== null) {
+ // values.db = window.GLOB.externalDatabase
+ // }
+ // if (item.works_flow_code) {
+ // values.works_flow_code = item.works_flow_code
+ // }
+ // item.urlkeys.forEach(key => {
+ // values[key] = item.urlparam[key]
+ // })
+
+ // let Ltext = item.LText
+ // let DateCount = item.DateCount
+ // let customScript = item.customScript
+
+ // item.reps.forEach(n => {
+ // let key = n.toLowerCase()
+ // if (values.hasOwnProperty(key)) {
+ // Ltext = Ltext.replace(new RegExp('@' + key + '@', 'ig'), values[key])
+ // DateCount = DateCount.replace(new RegExp('@' + key + '@', 'ig'), values[key])
+ // customScript = customScript.replace(new RegExp('@' + key + '@', 'ig'), values[key])
+ // }
+ // })
+
+ // if (search.length) {
+
+ // }
+ // }
param.custom_script = Utils.formatOptions(_customScript, param.exec_type)
param.LText = Utils.formatOptions(LText, param.exec_type)
@@ -320,6 +387,10 @@
}
} else if (window.GLOB.forcedUpdate) {
param.s_version_up = 'true'
+ }
+
+ if (setting.database === 'sso' && window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
}
return param
@@ -370,15 +441,16 @@
{ reg: /@orderBy@/ig, value: orderBy },
{ reg: /@pageSize@/ig, value: 999999 },
{ reg: /@pageIndex@/ig, value: 1},
- { reg: /\$select@/ig, value: '/*'},
- { reg: /@select\$/ig, value: '*/'},
- { reg: /@sum\$|\$sum@/ig, value: ''},
+ // { reg: /\$select@/ig, value: '/*'},
+ // { reg: /@select\$/ig, value: '*/'},
+ // { reg: /@sum\$|\$sum@/ig, value: ''},
{ reg: /@ID@/ig, value: `''`},
{ reg: /@BID@/ig, value: `'${BID || ''}'`},
{ reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
{ reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{ reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{ reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ { reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{ reg: /@typename@/ig, value: `'admin'`},
)
@@ -413,8 +485,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
+ _customScript && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
}
if (setting.$name) {
@@ -578,6 +650,7 @@
{ reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{ reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{ reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ { reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{ reg: /@typename@/ig, value: `'admin'`},
]
@@ -599,8 +672,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _script && console.info(`${item.$name ? `/*${item.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
- _sql && console.info(`${item.$name ? `/*${item.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _sql)
+ _script && window.mkInfo(`${item.$name ? `/*${item.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
+ _sql && window.mkInfo(`${item.$name ? `/*${item.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _sql)
}
item.columns.forEach(cell => {
--
Gitblit v1.8.0