From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12
---
src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
index b3958a5..46b7486 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
@@ -2,10 +2,8 @@
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
import { Form, notification, Modal, Spin, Tabs } from 'antd'
-import moment from 'moment'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
import SettingUtils from './utils.jsx'
import DataSource from './datasource'
import asyncComponent from '@/utils/asyncComponent'
@@ -16,7 +14,6 @@
class SettingForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
@@ -135,18 +132,10 @@
} else if (type === 'scripts' && _scripts.length === 0) {
_resolve()
} else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
- let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- let param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: SettingUtils.getDebugSql(setting, _scripts, timestamp)
- }
- param.LText = Utils.formatOptions(param.LText)
- param.timestamp = timestamp
- param.secretkey = Utils.encrypt('', timestamp)
+ let sql = SettingUtils.getDebugSql(setting, _scripts)
- Api.getLocalConfig(param).then(result => {
- if (result.status) {
+ Api.sDebug(sql).then(result => {
+ if (result.status || result.ErrCode === '-2') {
_resolve()
} else {
_reject()
@@ -212,10 +201,9 @@
if (_loading) {
notification.warning({
top: 92,
- message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+ message: '瀛樺湪鏈繚瀛樿剼鏈紒',
duration: 5
})
- return
}
this.setState({loading: true})
this.sqlverify(() => { // 楠岃瘉鎴愬姛
@@ -249,13 +237,12 @@
const { activeKey, setting, loading, scripts } = this.state
return (
- <div className="model-tree-setting-form-box" id="model-setting-form-body">
+ <div className="model-tree-setting-form-box">
{loading && <Spin size="large" />}
<Tabs activeKey={activeKey} onChange={this.changeTab}>
<TabPane tab="鏁版嵁婧�" key="setting">
<DataSource
menu={menu}
- dict={this.props.dict}
setting={setting}
inputSubmit={this.props.inputSubmit}
wrappedComponentRef={(inst) => this.settingForm = inst}
@@ -266,9 +253,8 @@
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
- } key="scripts">
+ } key="scripts" id="mk-setting-scripts">
<CustomScript
- dict={this.props.dict}
setting={setting}
scripts={scripts}
defaultSql={this.state.defaultsql}
--
Gitblit v1.8.0