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/zshare/actionList/normalbutton/index.jsx | 59 ++++++++++++++++++-----------------------------------------
1 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index f303197..35ea599 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -233,14 +233,10 @@
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText2 = LText2
- param.LText1 = LText1
- param.LText = LText
-
+ param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
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) {
@@ -274,14 +270,10 @@
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText2 = LText2
- param.LText1 = LText1
- param.LText = LText
-
+ param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
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, this.props.Tab) // 鏁版嵁婧�
@@ -293,14 +285,10 @@
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText2 = LText2
- param.LText1 = LText1
- param.LText = LText
-
+ param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
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)
}
}
@@ -365,13 +353,10 @@
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText2 = LText2
- param.LText1 = LText1
- param.LText = LText
+ param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
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 (index !== 0) {
@@ -404,14 +389,10 @@
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText2 = LText2
- param.LText1 = LText1
- param.LText = LText
-
+ param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
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, cell, columns, this.props.Tab) // 鏁版嵁婧�
@@ -423,14 +404,10 @@
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText2 = LText2
- param.LText1 = LText1
- param.LText = LText
-
+ param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
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