From 876a5e6657d67df66bb525d02dd6d147ba81cae5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 一月 2023 09:53:37 +0800
Subject: [PATCH] 2023-01-05
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 64 +++-----------------------------
1 files changed, 6 insertions(+), 58 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index eb8ffeb..d3bc305 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -29,7 +29,6 @@
state = {
verify: {},
activeKey: 'setting',
- systemScripts: [],
defaultscript: '', // 鑷畾涔夎剼鏈�
excelColumns: [
{
@@ -353,57 +352,6 @@
searches: searches,
activeKey: card.intertype === 'system' && _verify.dataType === 'custom' ? 'setting' : 'columns',
defaultscript: defaultscript
- })
- }
-
- componentDidMount () {
- this.getsysScript()
- }
-
- getsysScript = () => {
- if (sessionStorage.getItem('mk_sys_scripts')) {
- this.setState({
- systemScripts: JSON.parse(sessionStorage.getItem('mk_sys_scripts'))
- })
- return
- }
-
- 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)
-
- let _sParam = {
- func: 'sPC_Get_SelectedList',
- LText: _scriptSql,
- obj_name: 'data',
- arr_field: 'funcname,longparam'
- }
-
- _sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
- _sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
-
- Api.getSystemConfig(_sParam).then(res => {
- if (res.status) {
- let _scripts = res.data.map(item => {
- return {
- name: item.funcname,
- value: window.decodeURIComponent(window.atob(item.longparam))
- }
- })
-
- sessionStorage.setItem('mk_sys_scripts', JSON.stringify(_scripts))
-
- this.setState({
- systemScripts: _scripts
- })
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
})
}
@@ -945,7 +893,7 @@
}
}
- scriptsChange = (values) => {
+ scriptsChange = (values, callback) => {
let verify = JSON.parse(JSON.stringify(this.state.verify))
if (values.uuid) {
@@ -968,10 +916,12 @@
loading: false,
verify: verify
})
+ callback(true)
}, () => { // 楠岃瘉澶辫触
this.setState({
loading: false
})
+ callback(false)
}, verify.scripts)
}
@@ -984,7 +934,7 @@
}
let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- let sql = SettingUtils.getDebugSql(verify, scripts, searches, Utils, timestamp)
+ let sql = SettingUtils.getDebugSql(verify, scripts, (verify.useSearch === 'true' ? searches : []), Utils, timestamp)
let param = {
func: 's_debug_sql',
exec_type: 'y',
@@ -1012,7 +962,7 @@
render() {
const { card } = this.props
- const { verify, excelColumns, defaultscript, scriptsColumns, activeKey, loading } = this.state
+ const { verify, excelColumns, defaultscript, scriptsColumns, activeKey, loading, searches } = this.state
const { getFieldDecorator } = this.props.form
const formItemLayout = {
labelCol: {
@@ -1058,9 +1008,7 @@
<CustomScript
btn={card}
sheet={verify.tableName}
- usefulfields={verify.columns}
- scripts={verify.scripts}
- systemScripts={this.state.systemScripts}
+ searches={verify.useSearch === 'true' ? searches : []}
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
/>
--
Gitblit v1.8.0