From 0bbaa727cdfc65622e33e91c4bf694c83f184535 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 04 二月 2024 23:12:14 +0800
Subject: [PATCH] 2024-02-04
---
src/views/systemproc/proc/index.jsx | 10
src/utils/utils-datamanage.js | 20 -
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 8
src/views/basedesign/updateFormTab/index.jsx | 6
src/components/resetPassword/index.jsx | 20 +
src/templates/comtableconfig/updatetable/index.jsx | 6
src/views/design/header/editfirstmenu/index.jsx | 9
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 6
public/options.json | 1
src/menu/components/table/edit-table/options.jsx | 1
src/templates/sharecomponent/tablecomponent/index.jsx | 7
src/views/billprint/index.jsx | 6
src/views/design/sidemenu/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 40 ++--
public/README.txt | 1
src/views/design/sidemenu/editthdmenu/index.jsx | 11
src/views/mobdesign/index.jsx | 16
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 7
src/views/menudesign/index.jsx | 11
src/menu/datasource/verifycard/index.jsx | 8
src/menu/components/card/double-data-card/options.jsx | 1
src/views/design/sidemenu/editsecmenu/index.jsx | 9
src/menu/components/card/data-card/options.jsx | 1
src/menu/modalconfig/tablecomponent/index.jsx | 7
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 10
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 20 +
src/tabviews/zshare/mutilform/mkPopSelect/index.jsx | 6
src/tabviews/zshare/mutilform/index.jsx | 24 +
src/views/appmanage/index.jsx | 22 +-
src/views/design/header/versions/index.jsx | 9
src/templates/zshare/customscript/index.jsx | 7
src/views/design/sidemenu/thdmenuplus/index.jsx | 2
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 7
src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx | 7
src/views/design/header/index.jsx | 7
src/menu/components/table/normal-table/options.jsx | 1
src/tabviews/custom/components/module/account/index.jsx | 4
src/tabviews/zshare/topSearch/index.jsx | 26 +
src/menu/transfer/index.jsx | 6
src/views/rolemanage/index.jsx | 4
src/views/tabledesign/index.jsx | 11
src/api/index.js | 4
src/utils/utils.js | 51 +---
src/index.js | 1
src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 8
src/menu/components/share/actioncomponent/actionform/mkPrintTemps/index.jsx | 8
src/templates/zshare/createfunc/index.jsx | 10
src/templates/treepageconfig/updatetable/index.jsx | 6
src/views/pcdesign/index.jsx | 16
src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx | 6
src/menu/components/table/base-table/options.jsx | 1
src/templates/zshare/verifycard/index.jsx | 7
src/components/querylog/index.jsx | 4
src/menu/replaceField/index.jsx | 7
src/utils/timer-task.js | 11
src/tabviews/zshare/actionList/printbutton/index.jsx | 6
src/templates/sharecomponent/actioncomponent/index.jsx | 8
57 files changed, 296 insertions(+), 245 deletions(-)
diff --git a/public/README.txt b/public/README.txt
index b28ccd1..fa1cceb 100644
--- a/public/README.txt
+++ b/public/README.txt
@@ -17,6 +17,7 @@
probation -- 璇曠敤鏈燂紙YYYY-MM-DD锛夛紝鍦ㄦ寮忕郴缁熶腑锛岃瘯鐢ㄦ湡鍐呰皟鐢ㄧ郴缁熸帴鍙ｇ殑鑴氭湰浼氳褰曚笅鏉�
transfer -- 鏄惁浣跨敤杞帴鍙ｏ紝浣跨敤杞帴鍙ｆ椂璇疯缃负 true, 浣跨敤杞帴鍙ｆ椂锛屽閮ㄦ帴鍙ｈ皟鐢ㄥ墠涓嶄細鍋氱櫥褰曢獙璇�
keepPassword -- 璁颁綇瀵嗙爜锛岄粯璁ゅ紑鍚紝褰撳�间负 false 鏃剁鐢�
+execType -- 鑴氭湰浼犺緭鏂瑰紡锛屽�间负x鏃讹紝鍚敤AES鍔犲瘑
updateStatus -- 鏄惁鏇存柊寮�鍙戠姸鎬侊紝榛樿寮�鍚紝褰撳�间负 false 鏃剁鐢�
forcedUpdate -- 浼犺緭鍙峰崌绾ф椂锛屾槸鍚﹁嚜鍔ㄩ��鍑猴紝鏍煎紡涓猴紙YYYY-MM-DD锛夛紝鐢ㄤ簬鍗囩骇鍚庡埛鏂扮敤鎴锋湰鍦伴厤缃�
platforms -- 绉诲姩绔彲浣跨敤鐨勫钩鍙扮被鍨嬶紝榛樿涓� ["H5", "wechat", "android", "ios", "wxMiniProgram"] 鍒嗗埆浠ｈ〃H5椤甸潰銆佸井淇″叕浼楀彿銆佸畨鍗揂PP銆佽嫻鏋淎PP銆佸井淇″皬绋嬪簭
\ No newline at end of file
diff --git a/public/options.json b/public/options.json
index 858e91f..33a2f80 100644
--- a/public/options.json
+++ b/public/options.json
@@ -17,6 +17,7 @@
"probation": "",
"transfer": "false",
"keepPassword": "true",
+ "execType": "x",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
"host": "http://qingqiumarket.cn",
"service": "MKWMS/"
diff --git a/src/api/index.js b/src/api/index.js
index cc5223d..f450c51 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1071,7 +1071,7 @@
sDebug (sql, rduri = null) {
let param = {
func: 's_debug_sql',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
userid: sessionStorage.getItem('UserID') || '',
lang: sessionStorage.getItem('lang') || '',
@@ -1090,7 +1090,7 @@
sql = sql.replace(/\n/ig, ' ')
- param.LText = Utils.formatOptions(sql)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
param.secretkey = Utils.encrypt('', param.timestamp)
param = this.encryptParam(param)
diff --git a/src/components/querylog/index.jsx b/src/components/querylog/index.jsx
index 380fc19..5dedf3b 100644
--- a/src/components/querylog/index.jsx
+++ b/src/components/querylog/index.jsx
@@ -69,14 +69,14 @@
let param = {
func: 's_get_users_operation_log',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
LText: LText.join(' union all '),
long_param: res.long_param
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
Api.getSystemConfig(param).then(result => {
if (!result.status) {
diff --git a/src/components/resetPassword/index.jsx b/src/components/resetPassword/index.jsx
index a72283a..39f9726 100644
--- a/src/components/resetPassword/index.jsx
+++ b/src/components/resetPassword/index.jsx
@@ -60,10 +60,14 @@
func: 's_PwdUpt',
LText: `select '${res.originpwd}','${res.password}'`
}
+
+ if (window.GLOB.execType === 'x') {
+ _param.exec_type = 'x'
+ }
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
+ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _param.LText = Utils.formatOptions(_param.LText, _param.exec_type)
+ _param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : _param.LText, _param.timestamp)
Api.getSystemConfig(_param).then(result => {
if (result.status) {
@@ -125,10 +129,14 @@
mob: this.state.mob,
check_code: this.state.code
}
+
+ if (window.GLOB.execType === 'x') {
+ _param.exec_type = 'x'
+ }
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
+ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _param.LText = Utils.formatOptions(_param.LText, _param.exec_type)
+ _param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : _param.LText, _param.timestamp)
Api.getSystemConfig(_param).then(result => {
if (result.status) {
diff --git a/src/index.js b/src/index.js
index 246d3bb..f80e527 100644
--- a/src/index.js
+++ b/src/index.js
@@ -53,6 +53,7 @@
GLOB.WXAppID = config.WXAppID || ''
GLOB.WXminiAppID = config.WXminiAppID || ''
GLOB.WXNotice = config.WXNotice + '' === 'true'
+ GLOB.execType = config.execType === 'x' ? 'x' : ''
GLOB.accessToken = {}
GLOB.mkHS = false
GLOB.debugger = false
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index d220750..22cd055 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -626,6 +626,7 @@
field: 'maxPageSize',
label: '姣忛〉鏈�澶ф暟',
initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
min: 10,
max: 500,
precision: 0,
diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index 91625de..16d9f40 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -278,6 +278,7 @@
field: 'maxPageSize',
label: '姣忛〉鏈�澶ф暟',
initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
min: 10,
max: 500,
precision: 0,
diff --git a/src/menu/components/share/actioncomponent/actionform/mkPrintTemps/index.jsx b/src/menu/components/share/actioncomponent/actionform/mkPrintTemps/index.jsx
index efc3032..4ad9280 100644
--- a/src/menu/components/share/actioncomponent/actionform/mkPrintTemps/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/mkPrintTemps/index.jsx
@@ -30,14 +30,14 @@
getPrintTemp = () => {
let param = {
func: 'sPC_Get_SelectedList',
- LText: Utils.formatOptions(queryPrintSql),
+ LText: Utils.formatOptions(queryPrintSql, 'x'),
obj_name: 'data',
- arr_field: 'PN,ID,Images'
+ arr_field: 'PN,ID,Images',
+ exec_type: 'x'
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(param).then(res => {
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 9da8a3a..85ee2bf 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -214,6 +214,7 @@
field: 'maxPageSize',
label: '姣忛〉鏈�澶ф暟',
initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
min: 10,
max: 500,
precision: 0,
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index 3518c0c..ddfa334 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -225,18 +225,18 @@
let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`
- _scriptSql = Utils.formatOptions(_scriptSql)
+ _scriptSql = Utils.formatOptions(_scriptSql, 'x')
let _sParam = {
func: 'sPC_Get_SelectedList',
LText: _scriptSql,
obj_name: 'data',
- arr_field: 'funcname,longparam'
+ arr_field: 'funcname,longparam',
+ exec_type: 'x'
}
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
-
+ _sParam.secretkey = Utils.encrypt('', _sParam.timestamp)
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(_sParam).then(res => {
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 9ff9cf7..7773bdf 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -225,6 +225,7 @@
field: 'maxPageSize',
label: '姣忛〉鏈�澶ф暟',
initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
min: 10,
max: 500,
precision: 0,
diff --git a/src/menu/components/table/normal-table/options.jsx b/src/menu/components/table/normal-table/options.jsx
index 2d8f748..416258c 100644
--- a/src/menu/components/table/normal-table/options.jsx
+++ b/src/menu/components/table/normal-table/options.jsx
@@ -257,6 +257,7 @@
field: 'maxPageSize',
label: '姣忛〉鏈�澶ф暟',
initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
min: 10,
max: 500,
precision: 0,
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index fd6a079..e103038 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -263,18 +263,18 @@
let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`
- _scriptSql = Utils.formatOptions(_scriptSql)
+ _scriptSql = Utils.formatOptions(_scriptSql, 'x')
let _sParam = {
func: 'sPC_Get_SelectedList',
LText: _scriptSql,
obj_name: 'data',
- arr_field: 'funcname,longparam'
+ arr_field: 'funcname,longparam',
+ exec_type: 'x'
}
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
-
+ _sParam.secretkey = Utils.encrypt('', _sParam.timestamp)
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(_sParam).then(res => {
diff --git a/src/menu/modalconfig/tablecomponent/index.jsx b/src/menu/modalconfig/tablecomponent/index.jsx
index 37e9cba..4d1e307 100644
--- a/src/menu/modalconfig/tablecomponent/index.jsx
+++ b/src/menu/modalconfig/tablecomponent/index.jsx
@@ -40,12 +40,13 @@
func: 'sPC_Get_SelectedList',
LText: queryTableSql,
obj_name: 'data',
- arr_field: 'TbName,Remark'
+ arr_field: 'TbName,Remark',
+ exec_type: 'x'
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
if (window.GLOB.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
diff --git a/src/menu/replaceField/index.jsx b/src/menu/replaceField/index.jsx
index 4e47d3a..822ac40 100644
--- a/src/menu/replaceField/index.jsx
+++ b/src/menu/replaceField/index.jsx
@@ -36,12 +36,13 @@
func: 'sPC_Get_SelectedList',
LText: queryTableSql,
obj_name: 'data',
- arr_field: 'TbName,Remark'
+ arr_field: 'TbName,Remark',
+ exec_type: 'x'
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
if (window.GLOB.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
diff --git a/src/menu/transfer/index.jsx b/src/menu/transfer/index.jsx
index 04223ca..1919b20 100644
--- a/src/menu/transfer/index.jsx
+++ b/src/menu/transfer/index.jsx
@@ -239,12 +239,12 @@
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_config)))
+ LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_config))),
+ LText: ''
}
- param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
Api.getCloudConfig(param).then(res => {
_resolve()
diff --git a/src/tabviews/custom/components/module/account/index.jsx b/src/tabviews/custom/components/module/account/index.jsx
index bdc02be..9d0054d 100644
--- a/src/tabviews/custom/components/module/account/index.jsx
+++ b/src/tabviews/custom/components/module/account/index.jsx
@@ -135,12 +135,12 @@
LText: `delete tmp_session_show_key where createuserid='${userid}' and key_type='fcc_years'
insert into tmp_session_show_key ( key_id,key_type,createuserid,CreateUser,CreateStaff)
select '${item.id}','fcc_years','${userid}','${sid}','${sessionStorage.getItem('Full_Name') || ''}'`,
- exec_type: 'y'
+ exec_type: window.GLOB.execType || 'y'
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
Api.genericInterface(param).then(res => {
if (!res.status) {
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 57dba86..1de493a 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1870,9 +1870,13 @@
}
if (param.LText) {
- param.LText = Utils.formatOptions(param.LText)
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
+
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
deffers.push(
new Promise(resolve => {
@@ -1901,9 +1905,13 @@
}
if (mainparam.LText) {
- mainparam.LText = Utils.formatOptions(mainparam.LText)
+ if (window.GLOB.execType === 'x') {
+ mainparam.exec_type = 'x'
+ }
+
+ mainparam.LText = Utils.formatOptions(mainparam.LText, mainparam.exec_type)
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
+ mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)
if (window.GLOB.mainSystemApi) {
mainparam.rduri = window.GLOB.mainSystemApi
@@ -2328,8 +2336,8 @@
delete param.excel_in
- param.exec_type = 'y'
- param.LText = Utils.formatOptions(result.sql)
+ param.exec_type = window.GLOB.execType || 'y'
+ param.LText = Utils.formatOptions(result.sql, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
index 4428a97..29e7463 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
@@ -44,7 +44,7 @@
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
arr_field: config.arr_field,
default_sql: 'true',
custom_script: '',
@@ -88,8 +88,8 @@
DateCount && console.info(`/*${config.label} 鎬绘暟鏌ヨ*/\n` + DateCount.replace(/\n\s{6}/ig, '\n'))
}
- param.LText = Utils.formatOptions(sql)
- param.DateCount = Utils.formatOptions(DateCount)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
+ param.DateCount = Utils.formatOptions(DateCount, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index ea19291..b4ac4ee 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -347,7 +347,7 @@
delete param.excel_in
// param.excel_in_type = 'true'
- param.exec_type = 'y'
+ param.exec_type = window.GLOB.execType || 'y'
param.LText = result.sql
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -358,7 +358,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.secretkey = Utils.encrypt('', param.timestamp)
if (window.GLOB.mkHS) { // 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -372,7 +372,7 @@
if (unCheckParam) {
unCheckParam.LText = unCheckParam.LText.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
- unCheckParam.LText = Utils.formatOptions(unCheckParam.LText)
+ unCheckParam.LText = Utils.formatOptions(unCheckParam.LText, unCheckParam.exec_type)
unCheckParam.secretkey = Utils.encrypt('', unCheckParam.timestamp)
unCheckParam.menuname = btn.logLabel
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index e826bcf..78adb47 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -149,17 +149,19 @@
getIpList = () => {
let _scriptSql = `select ID,data_code,data_name,Remark,face_ip,face_uname,face_pwd from bd_data where typecharone='face_device' and deleted=0`
- _scriptSql = Utils.formatOptions(_scriptSql)
-
let _sParam = {
func: 'sPC_Get_SelectedList',
- LText: _scriptSql,
obj_name: 'data',
arr_field: 'ID,data_code,data_name,Remark,face_ip,face_uname,face_pwd'
}
+
+ if (window.GLOB.execType === 'x') {
+ _sParam.exec_type = 'x'
+ }
+ _sParam.LText = Utils.formatOptions(_scriptSql, _sParam.exec_type)
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
+ _sParam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : _sParam.LText, _sParam.timestamp)
NApi.getSystemCacheConfig(_sParam).then(res => {
if (res.status) {
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 6c4548b..9bc5cc9 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -497,7 +497,7 @@
}
}
- param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.exec_type = window.GLOB.execType || 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -508,7 +508,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
} else if (btn.OpenType === 'pop' || btn.OpenType === 'formSubmit' || btn.OpenType === 'form') { // 琛ㄥ崟
if (btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
primaryId = ''
@@ -533,7 +533,7 @@
}
}
- param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.exec_type = window.GLOB.execType || 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -544,7 +544,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
} else {
param.ID = primaryId
@@ -559,7 +559,7 @@
}
}
- param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.exec_type = window.GLOB.execType || 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -570,7 +570,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
}
}
@@ -590,7 +590,7 @@
if (param.$unCheckParam) {
param.$unCheckParam.LText = param.$unCheckParam.LText.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
- param.$unCheckParam.LText = Utils.formatOptions(param.$unCheckParam.LText)
+ param.$unCheckParam.LText = Utils.formatOptions(param.$unCheckParam.LText, param.exec_type)
param.$unCheckParam.menuname = btn.logLabel
if (window.GLOB.probation) {
@@ -625,7 +625,7 @@
}
}
- param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.exec_type = window.GLOB.execType || 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -636,7 +636,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
} else if (btn.OpenType === 'pop') { // 琛ㄥ崟
if (index !== 0) {
let _cell = {}
@@ -665,7 +665,7 @@
}
}
- param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.exec_type = window.GLOB.execType || 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -676,7 +676,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
} else {
param.ID = primaryId
@@ -691,7 +691,7 @@
}
}
- param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.exec_type = window.GLOB.execType || 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -702,7 +702,7 @@
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
}
}
@@ -721,7 +721,7 @@
if (param.$unCheckParam) {
param.$unCheckParam.LText = param.$unCheckParam.LText.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
- param.$unCheckParam.LText = Utils.formatOptions(param.$unCheckParam.LText)
+ param.$unCheckParam.LText = Utils.formatOptions(param.$unCheckParam.LText, param.exec_type)
param.$unCheckParam.menuname = btn.logLabel
if (window.GLOB.probation) {
@@ -1732,10 +1732,10 @@
}
param.LText = sql
- param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.exec_type = window.GLOB.execType || 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.menuname = btn.logLabel
if (window.GLOB.probation) {
@@ -2494,7 +2494,7 @@
upid: id
}
- param.LText = Utils.formatOptions(Utils.getuuid())
+ param.LText = Utils.getuuid()
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -2588,7 +2588,7 @@
msg_result: msg
}
- _p.LText = Utils.formatOptions(Utils.getuuid())
+ _p.LText = Utils.getuuid()
_p.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_p.secretkey = Utils.encrypt(_p.LText, _p.timestamp)
@@ -2636,7 +2636,7 @@
upid: id
}
- param.LText = Utils.formatOptions(Utils.getuuid())
+ param.LText = Utils.getuuid()
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -2767,7 +2767,7 @@
upid: id
}
- param.LText = Utils.formatOptions(Utils.getuuid())
+ param.LText = Utils.getuuid()
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 68bc347..da72ac9 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -962,7 +962,7 @@
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
arr_field: arrFields,
default_sql: btn.verify.setting.defaultSql
}
@@ -1168,8 +1168,8 @@
param.menuname = btn.logLabel
}
- param.custom_script = Utils.formatOptions(_customScript)
- param.LText = Utils.formatOptions(LText)
+ param.custom_script = Utils.formatOptions(_customScript, param.exec_type)
+ param.LText = Utils.formatOptions(LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 8a3b8e9..9ab8e55 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -851,9 +851,13 @@
}
if (param.LText) {
- param.LText = Utils.formatOptions(param.LText)
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
+
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -886,9 +890,13 @@
}
if (mainparam.LText) {
- mainparam.LText = Utils.formatOptions(mainparam.LText)
+ if (window.GLOB.execType === 'x') {
+ mainparam.exec_type = 'x'
+ }
+
+ mainparam.LText = Utils.formatOptions(mainparam.LText, mainparam.exec_type)
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
+ mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)
if (window.GLOB.mainSystemApi) {
mainparam.rduri = window.GLOB.mainSystemApi
@@ -950,10 +958,14 @@
if (window.GLOB.debugger) {
console.info(param.LText)
}
+
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (form.database === 'sso' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
diff --git a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
index c9bc1d6..a0d02c5 100644
--- a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
@@ -122,7 +122,7 @@
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
arr_field: arr_field,
default_sql: 'true',
custom_script: '',
@@ -166,8 +166,8 @@
DateCount && console.info(`/*${config.label} 鎬绘暟鏌ヨ*/\n` + DateCount.replace(/\n\s{6}/ig, '\n'))
}
- param.LText = Utils.formatOptions(sql)
- param.DateCount = Utils.formatOptions(DateCount)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
+ param.DateCount = Utils.formatOptions(DateCount, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index c3cfc0b..7fad33b 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -198,7 +198,7 @@
deForms.push({
...item,
arr_field: _option.field,
- data_sql: Utils.formatOptions(_option.sql)
+ data_sql: Utils.formatOptions(_option.sql, window.GLOB.execType)
})
} else { // 鍚堝苟璇锋眰锛屽尯鍒嗘湰鍦板強绯荤粺
if (item.database === 'sso') {
@@ -305,7 +305,7 @@
deForms.push({
...item,
arr_field: item.arr_field,
- data_sql: Utils.formatOptions(sql)
+ data_sql: Utils.formatOptions(sql, window.GLOB.execType)
})
} else if (item.checkShift) {
let d = ''
@@ -408,9 +408,13 @@
}
if (param.LText) {
- param.LText = Utils.formatOptions(param.LText)
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
+
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -446,9 +450,13 @@
}
if (mainparam.LText) {
- mainparam.LText = Utils.formatOptions(mainparam.LText)
+ if (window.GLOB.execType === 'x') {
+ mainparam.exec_type = 'x'
+ }
+
+ mainparam.LText = Utils.formatOptions(mainparam.LText, mainparam.exec_type)
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
+ mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)
if (window.GLOB.mainSystemApi) {
mainparam.rduri = window.GLOB.mainSystemApi
@@ -501,8 +509,12 @@
param.BID = this.props.BID
}
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
+
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (item.database === 'sso' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index 3ce78d5..97d5062 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -739,12 +739,12 @@
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config)))
+ LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config))),
+ LText: ''
}
- param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
let save = false
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index 3d65364..96961c4 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -88,14 +88,14 @@
let param = {
func: 'sPC_Get_SelectedList',
- LText: Utils.formatOptions(_sql),
+ LText: Utils.formatOptions(_sql, 'x'),
obj_name: 'data',
- arr_field: 'PN,ID,Images'
+ arr_field: 'PN,ID,Images',
+ exec_type: 'x'
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(param).then(res => {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index aa4e7b5..5dd577b 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -337,17 +337,18 @@
let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`
- _scriptSql = Utils.formatOptions(_scriptSql)
+ _scriptSql = Utils.formatOptions(_scriptSql, 'x')
let _sParam = {
func: 'sPC_Get_SelectedList',
LText: _scriptSql,
obj_name: 'data',
- arr_field: 'funcname,longparam'
+ arr_field: 'funcname,longparam',
+ exec_type: 'x'
}
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
+ _sParam.secretkey = Utils.encrypt('', _sParam.timestamp)
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(_sParam).then(res => {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
index adf4197..7acae2d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
@@ -50,17 +50,18 @@
let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`
- _scriptSql = Utils.formatOptions(_scriptSql)
+ _scriptSql = Utils.formatOptions(_scriptSql, 'x')
let _sParam = {
func: 'sPC_Get_SelectedList',
LText: _scriptSql,
obj_name: 'data',
- arr_field: 'funcname,longparam'
+ arr_field: 'funcname,longparam',
+ exec_type: 'x'
}
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
+ _sParam.secretkey = Utils.encrypt('', _sParam.timestamp)
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(_sParam).then(res => {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index 1a8128f..ccad7dd 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -285,14 +285,14 @@
let param = {
func: 'sPC_Get_SelectedList',
- LText: Utils.formatOptions(_sql),
+ LText: Utils.formatOptions(_sql, 'x'),
obj_name: 'data',
- arr_field: 'PN,PrintTempNO,Images'
+ arr_field: 'PN,PrintTempNO,Images',
+ exec_type: 'x'
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(param).then(res => {
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index cd13077..898ff9a 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -265,6 +265,13 @@
reOptions.match = matchReg.class1
} else if (type === 'switch' || type === 'check') {
reOptions.match = matchReg.class2
+ if (type === 'switch') {
+ reLabel.openVal = '寮�鍚��'
+ reLabel.closeVal = '鍏抽棴鍊�'
+ } else {
+ reLabel.openVal = '鍕鹃�夊��'
+ reLabel.closeVal = '涓嶅嬀閫夊��'
+ }
} else if (type === 'date') {
reOptions.match = matchReg.class4
} else if (type === 'datemonth') {
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 98f43d5..f6088e5 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -64,12 +64,13 @@
func: 'sPC_Get_SelectedList',
LText: queryTableSql,
obj_name: 'data',
- arr_field: 'TbName,Remark'
+ arr_field: 'TbName,Remark',
+ exec_type: 'x'
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
if (window.GLOB.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
diff --git a/src/templates/treepageconfig/updatetable/index.jsx b/src/templates/treepageconfig/updatetable/index.jsx
index 231a7c6..cebb5ca 100644
--- a/src/templates/treepageconfig/updatetable/index.jsx
+++ b/src/templates/treepageconfig/updatetable/index.jsx
@@ -783,12 +783,12 @@
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config)))
+ LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config))),
+ LText: ''
}
- param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
let save = false
diff --git a/src/templates/zshare/createfunc/index.jsx b/src/templates/zshare/createfunc/index.jsx
index d464a7f..a707f0b 100644
--- a/src/templates/zshare/createfunc/index.jsx
+++ b/src/templates/zshare/createfunc/index.jsx
@@ -44,22 +44,24 @@
// 鍒犻櫎瀛樺偍杩囩▼
let droparam = {
func: 'sPC_TableData_InUpDe',
- LText: Utils.formatOptions(dropfunc),
+ LText: Utils.formatOptions(dropfunc, window.GLOB.execType || 'y'),
+ exec_type: window.GLOB.execType || 'y',
TypeCharOne: 'proc' // 鍒犻櫎鎴栧垱寤哄瓨鍌ㄨ繃绋嬫爣蹇�
}
droparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- droparam.secretkey = Utils.encrypt(droparam.LText, droparam.timestamp)
+ droparam.secretkey = Utils.encrypt('', droparam.timestamp)
droparam.open_key = Utils.encryptOpenKey(droparam.secretkey, droparam.timestamp)
// 鏂板缓瀛樺偍杩囩▼
let _param = {
func: 'sPC_TableData_InUpDe',
- LText: Utils.formatOptions(newLText),
+ LText: Utils.formatOptions(newLText, window.GLOB.execType || 'y'),
+ exec_type: window.GLOB.execType || 'y',
TypeCharOne: 'proc'
}
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
+ _param.secretkey = Utils.encrypt('', _param.timestamp)
_param.open_key = Utils.encryptOpenKey(_param.secretkey, _param.timestamp)
let saveParam = {
diff --git a/src/templates/zshare/customscript/index.jsx b/src/templates/zshare/customscript/index.jsx
index b3a0de2..856acc8 100644
--- a/src/templates/zshare/customscript/index.jsx
+++ b/src/templates/zshare/customscript/index.jsx
@@ -135,17 +135,18 @@
}
let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`
- _scriptSql = Utils.formatOptions(_scriptSql)
+ _scriptSql = Utils.formatOptions(_scriptSql, 'x')
let _sParam = {
func: 'sPC_Get_SelectedList',
LText: _scriptSql,
obj_name: 'data',
- arr_field: 'funcname,longparam'
+ arr_field: 'funcname,longparam',
+ exec_type: 'x'
}
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
+ _sParam.secretkey = Utils.encrypt('', _sParam.timestamp)
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(_sParam).then(res => {
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 606f277..8cedee1 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -1103,12 +1103,13 @@
LText: mutilForms.join(' union all '),
obj_name: '',
arr_field: '',
- table_type: 'Y'
+ table_type: 'Y',
+ exec_type: 'x'
}
- mutilparam.LText = Utils.formatOptions(mutilparam.LText)
+ mutilparam.LText = Utils.formatOptions(mutilparam.LText, 'x')
mutilparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- mutilparam.secretkey = Utils.encrypt(mutilparam.LText, mutilparam.timestamp)
+ mutilparam.secretkey = Utils.encrypt('', mutilparam.timestamp)
mutilparam.open_key = Utils.encryptOpenKey(mutilparam.secretkey, mutilparam.timestamp)
if (window.GLOB.cloudServiceApi) { // 浜戠璇锋眰
diff --git a/src/utils/timer-task.js b/src/utils/timer-task.js
index d9e54bc..c556e72 100644
--- a/src/utils/timer-task.js
+++ b/src/utils/timer-task.js
@@ -26,14 +26,15 @@
} else {
let _param = {
func: 's_get_timers_role',
- LText: `select '${window.GLOB.appkey || ''}','${uuid}'`,
+ LText: `select '${window.GLOB.appkey || ''}','${uuid}'`, // 鍙敤鍋氬瘑閽ラ獙璇侊紝宸叉棤鏁�
timer_type: interval,
- component_id: uuid
+ component_id: uuid,
+ exec_type: 'x'
}
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
+ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _param.LText = Utils.formatOptions(_param.LText, 'x')
+ _param.secretkey = Utils.encrypt('', _param.timestamp)
Api.getSystemConfig(_param).then(result => {
if (!result.status) {
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 5b82a9a..91e58db 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -102,7 +102,7 @@
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
arr_field: setting.arr_field,
default_sql: setting.execute ? 'true' : 'false'
}
@@ -295,7 +295,7 @@
param.sub_field = setting.sub_field
}
- // exec_type: 'y' 瑙ｇ爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
+ // exec_type 瑙ｇ爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -328,7 +328,7 @@
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
arr_field: statFields.map(col => col.field).join(','),
default_sql: setting.execute ? 'true' : 'false'
}
@@ -417,8 +417,8 @@
param.menuname = setting.$name
}
- param.custom_script = Utils.formatOptions(_customScript)
- param.LText = Utils.formatOptions(LText)
+ param.custom_script = Utils.formatOptions(_customScript, param.exec_type)
+ param.LText = Utils.formatOptions(LText, param.exec_type)
param.DateCount = ''
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -576,13 +576,9 @@
param.menuname = config.MenuName
}
- param.exec_type = 'y'
- param.LText = Utils.formatOptions(_LText.join(' union all '))
- param.custom_script = Utils.formatOptions(LText_field.join(' union all '))
- // param.LText1 = LText1
- // param.LText = LText
- // param.LText2 = LText2
- // param.LText_field = Utils.formatOptions(param.LText_field)
+ param.exec_type = window.GLOB.execType || 'y'
+ param.LText = Utils.formatOptions(_LText.join(' union all '), param.exec_type)
+ param.custom_script = Utils.formatOptions(LText_field.join(' union all '), param.exec_type)
if (config.cacheUseful === 'true') {
param.time_type = config.timeUnit
diff --git a/src/utils/utils.js b/src/utils/utils.js
index fb3811a..a0b492c 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,7 +1,7 @@
import React from 'react'
import moment from 'moment'
import md5 from 'md5'
-// import NodeRSA from 'node-rsa'
+import CryptoJS from 'crypto-js'
const formatKeys = [
{ key: 'select', value: ' msltk ' },
@@ -124,46 +124,29 @@
if (!value) return ''
value = value.replace(/\n/ig, ' \n ')
- // 鏇挎崲鍏抽敭瀛�
- formatKeys.forEach(item => {
- let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
- value = value.replace(reg, item.value)
- })
- // 鏇挎崲%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛�
- value = value.replace(/%/ig, ' mpercent ')
+
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- // if (exec_type === 'x') {
- // // let publicKey = `-----BEGIN PUBLIC KEY-----
- // // MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwGxFURiCrk5a2xfWuM3W
- // // 2lkS3ioZhUFXpkK1inMivItsA/J8MTaBB3EAVxC29xdVCU+xOzs512PuD2b1sjzX
- // // jwO6kx433NtB2okqGiP4RkzhEJHwdyc9dPUKdjirDznUWI9R7WayAf5Z4COhMsj2
- // // IbkyJgkb6Ivn0UgU0GSWc92HqJJmnb3Ti2gk6A2+oybz2RE3+xB/yOaNu3xav4yi
- // // xxo6harVLNBiaU+D7aDed1W3kE20gLOnEAvcLMjpe3n/QvF5RtELsm3T+vH3TIT2
- // // GI9+8cT20NZ2d7i41+j/AQZiPJNS3MVmc3aIhuyCOsNPLmvbZZi1KPSJIqkCwdEg
- // // mQIDAQAB
- // // -----END PUBLIC KEY-----`
+ // 鏇挎崲%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛�
+ value = value.replace(/%/ig, ' mpercent ')
- // // let pubKey = new NodeRSA(publicKey, 'pkcs8-public')
+ if (exec_type === 'x') {
+ let key = CryptoJS.enc.Utf8.parse('D1185ED7B32568C9')
+ let iv = CryptoJS.enc.Utf8.parse('')
+ let srcs = CryptoJS.enc.Utf8.parse(value)
- // // value = window.encodeURIComponent(value)
- // // value = pubKey.encrypt(value, 'base64')
-
- // // const priKey = new NodeRSA(privateKey, 'pkcs8-private')
- // // const res = priKey.decrypt(value, 'utf8')
- // } else {
+ let encrypted = CryptoJS.AES.encrypt(srcs, key, { iv: iv, mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+ value = encrypted.toString()
+ } else {
+ // 鏇挎崲鍏抽敭瀛�
+ formatKeys.forEach(item => {
+ let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
+ value = value.replace(reg, item.value)
+ })
// encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
- // let str = window.encodeURIComponent(value)
-
- // if (str.length % 3 === 1) {
- // str += '%2F*123*%2F'
- // } else if (str.length % 3 === 2) {
- // str += '%2F*12*%2F'
- // }
-
value = window.btoa(window.encodeURIComponent(value))
// 鎻掑叆瀛楃
let salt = 'minKe' // 鐩愬��
@@ -171,7 +154,7 @@
value = value.slice(0, index) + salt + value.slice(index)
// base64鍔犲瘑
value = window.btoa(value)
- // }
+ }
return value
}
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index 75206ec..c2d907c 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -569,17 +569,18 @@
inner join (select openid from sapp where id='${window.GLOB.appkey}') b
on a.openid=b.openid`
- _sql = Utils.formatOptions(_sql)
+ _sql = Utils.formatOptions(_sql, 'x')
let param = {
func: 'sPC_Get_SelectedList',
LText: _sql,
obj_name: 'data',
- arr_field: 'ID,TemplateCode,SignName'
+ arr_field: 'ID,TemplateCode,SignName',
+ exec_type: 'x'
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(param).then(res => {
@@ -651,11 +652,10 @@
let param = {
func: 's_kei_addupt',
ID: selectApp.ID,
- exec_type: 'y',
+ exec_type: 'x',
remark: selectApp.remark,
kei_no: selectApp.kei_no,
- cus_param_type: 'A',
- LText: ''
+ cus_param_type: 'A'
}
param.del_typename = record.typename
@@ -676,7 +676,7 @@
// 瀛愬簲鐢↖D銆乼ypename銆佸簲鐢↖D銆丆loudUserID銆乤ppkey銆乴ogin_types(鏄惁闇�瑕佺櫥褰曪紝宸插純鐢�)銆乴ink_type(鏄惁浣跨敤鐭繛鎺ワ紝宸插純鐢�)銆乺ole_type(鏄惁浣跨敤瑙掕壊绠＄悊)銆乴ang銆乧ss(鐨偆)銆乼itle(鏍囬)銆乫avicon(鍥炬爣)銆乽ser_binding(鐢ㄦ埛缁戝畾)銆乻ms_id(鐭俊妯℃澘ID)銆佽嚜瀹氫箟
param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify({userbind: item.userbind || '', instantMessage: item.instantMessage || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black', topHeight: item.topHeight || '', sysBgColor: item.sysBgColor || '#ffffff', direction: item.direction || 'vertical', adapter: item.adapter || '', share: item.share || '', share_des: item.share_des || '', share_url: item.share_url || '', share_link: item.share_link || ''})))}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
confirm({
content: '纭畾鍒犻櫎璇ュ瓙搴旂敤鍚楋紵',
@@ -901,7 +901,7 @@
let param = {
func: 's_kei_addupt',
ID: ID,
- exec_type: 'y',
+ exec_type: 'x',
remark: res.remark,
kei_no: res.kei_no,
cus_param_type: 'A',
@@ -922,7 +922,7 @@
param.LText = selectApp.sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify({userbind: item.userbind || '', instantMessage: item.instantMessage || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black', topHeight: item.topHeight || '', sysBgColor: item.sysBgColor || '#ffffff', direction: item.direction || 'vertical', adapter: item.adapter || '', share: item.share || '', share_des: item.share_des || '', share_url: item.share_url || '', share_link: item.share_link || ''})))}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
}
Api.getCloudConfig(param).then(result => {
@@ -978,7 +978,7 @@
let param = {
func: 's_kei_addupt',
ID: selectApp.ID,
- exec_type: 'y',
+ exec_type: 'x',
remark: selectApp.remark,
kei_no: selectApp.kei_no,
cus_param_type: 'A',
@@ -1015,7 +1015,7 @@
param.LText = sublist.map(item => `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify({userbind: item.userbind || '', instantMessage: item.instantMessage || '', apptype: item.apptype || '', delay: item.delay || 0, statusBarColor: item.statusBarColor || 'black', topHeight: item.topHeight || '', sysBgColor: item.sysBgColor || '#ffffff', direction: item.direction || 'vertical', adapter: item.adapter || '', share: item.share || '', share_des: item.share_des || '', share_url: item.share_url || '', share_link: item.share_link || ''})))}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
Api.getCloudConfig(param).then(result => {
if (result.status) {
diff --git a/src/views/basedesign/updateFormTab/index.jsx b/src/views/basedesign/updateFormTab/index.jsx
index 04821eb..5fb70ae 100644
--- a/src/views/basedesign/updateFormTab/index.jsx
+++ b/src/views/basedesign/updateFormTab/index.jsx
@@ -878,12 +878,12 @@
debug_md5: key,
debug_url: url,
debug_list: window.btoa(tbs),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config)))
+ LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config))),
+ LText: ''
}
- param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
Api.getCloudConfig(param).then(res => {
_resolve()
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index d64cb91..453d8a0 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -851,9 +851,9 @@
param.menuname = MenuName
}
- param.exec_type = 'y'
- param.LText = Utils.formatOptions(LText.join(' union all '))
- param.custom_script = Utils.formatOptions(LText_field.join(' union all '))
+ param.exec_type = window.GLOB.execType || 'y'
+ param.LText = Utils.formatOptions(LText.join(' union all '), param.exec_type)
+ param.custom_script = Utils.formatOptions(LText_field.join(' union all '), param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/views/design/header/editfirstmenu/index.jsx b/src/views/design/header/editfirstmenu/index.jsx
index 06dc1e7..4d1b286 100644
--- a/src/views/design/header/editfirstmenu/index.jsx
+++ b/src/views/design/header/editfirstmenu/index.jsx
@@ -125,15 +125,16 @@
if (type === 'confirm' && _menuchange) {
let param = {
func: 'sPC_Menu_SortUpt',
+ exec_type: 'x',
LText: this.state.menulist.map((item, index) => {
return 'select \'' + item.MenuID + '\' as Menuid,' + (index + 1) * 10 + ' as sort'
})
}
- param.LText = param.LText.join(' union ') // sql鎷兼帴
- param.LText = Utils.formatOptions(param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- param.secretkey = Utils.encrypt(param.LText, param.timestamp) // md5瀵嗛挜
+ param.LText = param.LText.join(' union ')
+ param.LText = Utils.formatOptions(param.LText, 'x')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
confirm({
title: '纭璋冩暣鑿滃崟椤哄簭鍚楋紵',
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index e8c88b3..f9110ad 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -298,17 +298,18 @@
inner join (select openid from sapp where id='${window.GLOB.appkey}') b
on a.openid=b.openid`
- _sql = Utils.formatOptions(_sql)
+ _sql = Utils.formatOptions(_sql, 'x')
let param = {
func: 'sPC_Get_SelectedList',
LText: _sql,
obj_name: 'data',
- arr_field: 'ID,TemplateCode,SignName'
+ arr_field: 'ID,TemplateCode,SignName',
+ exec_type: 'x'
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(param).then(res => {
diff --git a/src/views/design/header/versions/index.jsx b/src/views/design/header/versions/index.jsx
index 100b669..4500387 100644
--- a/src/views/design/header/versions/index.jsx
+++ b/src/views/design/header/versions/index.jsx
@@ -143,11 +143,12 @@
obj_name: 'data',
arr_field: 'ID,KeyWords,Remark,TypeName,Sort,SrcID',
BID: '',
+ exec_type: window.GLOB.execType || 'y'
}
- param.LText = Utils.formatOptions(sql)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.DateCount = ''
Api.genericInterface(param).then(response => {
@@ -318,11 +319,11 @@
let param = {
func: 'sPC_TableData_InUpDe',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
ID: version.BID
}
- param.LText = Utils.formatOptions(sql)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/views/design/sidemenu/editsecmenu/index.jsx b/src/views/design/sidemenu/editsecmenu/index.jsx
index c630d72..888c7ac 100644
--- a/src/views/design/sidemenu/editsecmenu/index.jsx
+++ b/src/views/design/sidemenu/editsecmenu/index.jsx
@@ -110,15 +110,16 @@
if (type === 'confirm') { // 淇濆瓨璋冩暣鍚庣殑椤哄簭
let param = {
func: 'sPC_Menu_SortUpt',
+ exec_type: 'x',
LText: this.state.menulist.map((item, index) => {
return 'select \'' + item.MenuID + '\' as Menuid,' + (index + 1) * 10 + ' as sort'
})
}
- param.LText = param.LText.join(' union ') // sql鎷兼帴
- param.LText = Utils.formatOptions(param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- param.secretkey = Utils.encrypt(param.LText, param.timestamp) // md5瀵嗛挜
+ param.LText = param.LText.join(' union ')
+ param.LText = Utils.formatOptions(param.LText, 'x')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
confirm({
title: '纭璋冩暣鑿滃崟椤哄簭鍚楋紵',
diff --git a/src/views/design/sidemenu/editthdmenu/index.jsx b/src/views/design/sidemenu/editthdmenu/index.jsx
index 2402f75..d482996 100644
--- a/src/views/design/sidemenu/editthdmenu/index.jsx
+++ b/src/views/design/sidemenu/editthdmenu/index.jsx
@@ -141,15 +141,16 @@
if (type === 'confirm') {
let param = {
func: 'sPC_Menu_SortUpt',
+ exec_type: 'x',
LText: this.state.menulist.map((item, index) => {
return 'select \'' + item.MenuID + '\' as Menuid,' + (index + 1) * 10 + ' as sort'
})
}
- param.LText = param.LText.join(' union ') // sql鎷兼帴
- param.LText = Utils.formatOptions(param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- param.secretkey = Utils.encrypt(param.LText, param.timestamp) // md5瀵嗛挜
+ param.LText = param.LText.join(' union ')
+ param.LText = Utils.formatOptions(param.LText, 'x')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
confirm({
title: '纭璋冩暣鑿滃崟椤哄簭鍚楋紵',
@@ -218,7 +219,7 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
this.setState({
confirmLoading: true
diff --git a/src/views/design/sidemenu/index.jsx b/src/views/design/sidemenu/index.jsx
index e25d692..d43da38 100644
--- a/src/views/design/sidemenu/index.jsx
+++ b/src/views/design/sidemenu/index.jsx
@@ -254,7 +254,7 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
this.setState({
loading: true
diff --git a/src/views/design/sidemenu/thdmenuplus/index.jsx b/src/views/design/sidemenu/thdmenuplus/index.jsx
index 3033939..be78279 100644
--- a/src/views/design/sidemenu/thdmenuplus/index.jsx
+++ b/src/views/design/sidemenu/thdmenuplus/index.jsx
@@ -180,7 +180,7 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
this.setState({
loading: true
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index b271577..7d3ece5 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -849,9 +849,8 @@
LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config)))
}
- param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
let btnParam = { // 娣诲姞鑿滃崟鎸夐挳
func: 'sPC_Button_AddUpt',
@@ -859,14 +858,14 @@
ParentID: config.uuid,
MenuNo: config.MenuNo,
Template: 'CustomPage',
- button_proc_edition: 'Y'
+ button_proc_edition: 'Y',
+ exec_type: 'x'
}
btnParam.LText = btns.join(' union all ')
-
- btnParam.LText = Utils.formatOptions(btnParam.LText)
+ btnParam.LText = Utils.formatOptions(btnParam.LText, 'x')
btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+ btnParam.secretkey = Utils.encrypt('', btnParam.timestamp)
new Promise(resolve => {
if (MenuType === 'billPrint') { // 鎵撳嵃鐢熸垚椤甸潰鏁堟灉鍥�
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 4c6417c..575cb43 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -434,7 +434,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -449,7 +449,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1636,13 +1636,13 @@
let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
kparam.LText = _appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
kparam.LText = kparam.LText.join(' union all ')
- kparam.LText = Utils.formatOptions(kparam.LText)
+ kparam.LText = Utils.formatOptions(kparam.LText, 'x')
kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
kparam.secretkey = Utils.encrypt('', kparam.timestamp)
@@ -1883,7 +1883,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1902,7 +1902,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1942,7 +1942,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1961,7 +1961,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 7ace0bb..4efe859 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -287,7 +287,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -302,7 +302,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1352,13 +1352,13 @@
let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
kparam.LText = _appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
kparam.LText = kparam.LText.join(' union all ')
- kparam.LText = Utils.formatOptions(kparam.LText)
+ kparam.LText = Utils.formatOptions(kparam.LText, 'x')
kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
kparam.secretkey = Utils.encrypt('', kparam.timestamp)
@@ -1567,7 +1567,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1586,7 +1586,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1626,7 +1626,7 @@
let param = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -1645,7 +1645,7 @@
param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx
index 8f03846..171b2c2 100644
--- a/src/views/rolemanage/index.jsx
+++ b/src/views/rolemanage/index.jsx
@@ -415,7 +415,7 @@
let _param = {
func: 's_kei_link_keyids_addupt',
BID: app.ID,
- exec_type: 'y',
+ exec_type: 'x',
LText: ''
}
@@ -424,7 +424,7 @@
if (appViewList.length !== _appViewList.length) {
_param.LText = _appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
_param.LText = _param.LText.join(' union all ')
- _param.LText = Utils.formatOptions(_param.LText)
+ _param.LText = Utils.formatOptions(_param.LText, 'x')
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_param.secretkey = Utils.encrypt('', _param.timestamp)
diff --git a/src/views/systemproc/proc/index.jsx b/src/views/systemproc/proc/index.jsx
index 577e462..100a0ff 100644
--- a/src/views/systemproc/proc/index.jsx
+++ b/src/views/systemproc/proc/index.jsx
@@ -162,22 +162,24 @@
let dropParam = {
func: 'sPC_TableData_InUpDe',
- LText: Utils.formatOptions(dropfunc),
+ LText: Utils.formatOptions(dropfunc, window.GLOB.execType || 'y'),
+ exec_type: window.GLOB.execType || 'y',
TypeCharOne: 'proc' // 鍒犻櫎瀛樺偍杩囩▼
}
dropParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- dropParam.secretkey = Utils.encrypt(dropParam.LText, dropParam.timestamp)
+ dropParam.secretkey = Utils.encrypt('', dropParam.timestamp)
dropParam.open_key = Utils.encryptOpenKey(dropParam.secretkey, dropParam.timestamp)
let createParam = {
func: 'sPC_TableData_InUpDe',
- LText: Utils.formatOptions(createfunc),
+ LText: Utils.formatOptions(createfunc, window.GLOB.execType || 'y'),
+ exec_type: window.GLOB.execType || 'y',
TypeCharOne: 'proc' // 鍒涘缓瀛樺偍杩囩▼
}
createParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- createParam.secretkey = Utils.encrypt(createParam.LText, createParam.timestamp)
+ createParam.secretkey = Utils.encrypt('', createParam.timestamp)
createParam.open_key = Utils.encryptOpenKey(createParam.secretkey, createParam.timestamp)
let saveParam = {
diff --git a/src/views/tabledesign/index.jsx b/src/views/tabledesign/index.jsx
index 68fc3b7..7d16779 100644
--- a/src/views/tabledesign/index.jsx
+++ b/src/views/tabledesign/index.jsx
@@ -602,9 +602,8 @@
LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config)))
}
- param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
let btnParam = { // 娣诲姞鑿滃崟鎸夐挳
func: 'sPC_Button_AddUpt',
@@ -612,14 +611,14 @@
ParentID: config.uuid,
MenuNo: config.MenuNo,
Template: 'BaseTable',
- button_proc_edition: 'Y'
+ button_proc_edition: 'Y',
+ exec_type: 'x'
}
btnParam.LText = btns.join(' union all ')
-
- btnParam.LText = Utils.formatOptions(btnParam.LText)
+ btnParam.LText = Utils.formatOptions(btnParam.LText, 'x')
btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+ btnParam.secretkey = Utils.encrypt('', btnParam.timestamp)
new Promise(resolve => {
Api.getCloudConfig(param).then(res => {
--
Gitblit v1.8.0