From 06404e701a89955958cbf56213e2eec618d8644d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 16 十二月 2020 18:36:16 +0800 Subject: [PATCH] 2020-12-16 --- src/tabviews/verupmanage/actionList/index.jsx | 66 ++++++++++---------------------- 1 files changed, 21 insertions(+), 45 deletions(-) diff --git a/src/tabviews/verupmanage/actionList/index.jsx b/src/tabviews/verupmanage/actionList/index.jsx index 82c3b5f..0a20a3d 100644 --- a/src/tabviews/verupmanage/actionList/index.jsx +++ b/src/tabviews/verupmanage/actionList/index.jsx @@ -172,15 +172,11 @@ } else if (btn.sql) { param.ID = primaryId param.LText = Utils.getSysDefaultSql(btn, setting, '', param, data[0], columns) // 鏁版嵁婧� - - let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText) - - param.LText2 = LText2 - param.LText1 = LText1 - param.LText = LText - + + param.exec_type = 'y' // 鍚庡彴瑙g爜 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.LText = Utils.formatOptions(param.LText) } } else if (btn.OpenType === 'pop') { // 琛ㄥ崟 if (btn.innerFunc) { @@ -204,27 +200,19 @@ } param.ID = primaryId || Utils.getguid() param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], columns) // 鏁版嵁婧� - - let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText) - - param.LText2 = LText2 - param.LText1 = LText1 - param.LText = LText - + + param.exec_type = 'y' // 鍚庡彴瑙g爜 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.LText = Utils.formatOptions(param.LText) } else if (btn.sql) { param.ID = primaryId param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], columns) // 鏁版嵁婧� - - let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText) - - param.LText2 = LText2 - param.LText1 = LText1 - param.LText = LText - + + param.exec_type = 'y' // 鍚庡彴瑙g爜 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.LText = Utils.formatOptions(param.LText) } } @@ -267,14 +255,10 @@ param.ID = primaryId param.LText = Utils.getSysDefaultSql(btn, setting, '', param, cell, columns) // 鏁版嵁婧� - let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText) - - param.LText2 = LText2 - param.LText1 = LText1 - param.LText = LText - + param.exec_type = 'y' // 鍚庡彴瑙g爜 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.LText = Utils.formatOptions(param.LText) } } else if (btn.OpenType === 'pop') { // 琛ㄥ崟 if (btn.innerFunc) { @@ -295,14 +279,10 @@ param.ID = _formPrimaryId || Utils.getguid() param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, cell, columns) // 鏁版嵁婧� - let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText) - - param.LText2 = LText2 - param.LText1 = LText1 - param.LText = LText - + param.exec_type = 'y' // 鍚庡彴瑙g爜 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.LText = Utils.formatOptions(param.LText) } else if (btn.sql) { if (index !== 0) { formdata = formdata.map(_data => { @@ -316,14 +296,10 @@ param.ID = primaryId param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, cell, columns) // 鏁版嵁婧� - let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText) - - param.LText2 = LText2 - param.LText1 = LText1 - param.LText = LText - + param.exec_type = 'y' // 鍚庡彴瑙g爜 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.LText = Utils.formatOptions(param.LText) } } -- Gitblit v1.8.0