From ae170a9d58b4f91a225eada1dc83ed4a116b8d50 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 25 八月 2024 00:57:37 +0800
Subject: [PATCH] 2024-08-25
---
src/utils/utils-datamanage.js | 82 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 8 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 26f08c9..4e96051 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -142,9 +142,9 @@
{ 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') || ''}'`},
@@ -156,10 +156,10 @@
)
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 => {
@@ -289,6 +289,72 @@
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)
param.DateCount = Utils.formatOptions(DateCount, param.exec_type)
@@ -375,9 +441,9 @@
{ 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') || ''}'`},
--
Gitblit v1.8.0