From cc1a76df575c18f0d0ee96e8658461efdce3a918 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:01 +0800
Subject: [PATCH] 2023-01-17

---
 src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
index 3f3d3a4..31c37e5 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
@@ -16,7 +16,6 @@
 
 class SettingForm extends Component {
   static propTpyes = {
-    dict: PropTypes.object,         // 瀛楀吀椤�
     menu: PropTypes.object,         // 鑿滃崟淇℃伅
     config: PropTypes.object,       // 椤甸潰閰嶇疆淇℃伅
     inputSubmit: PropTypes.any      // 鍥炶溅鎻愪氦浜嬩欢
@@ -135,16 +134,18 @@
     } 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)
+        LText: SettingUtils.getDebugSql(setting, _scripts, timestamp)
       }
+      param.LText = param.LText.replace(/\n/g, ' ')
       param.LText = Utils.formatOptions(param.LText)
-      param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-      param.secretkey = Utils.encrypt('', param.timestamp)
+      param.timestamp = timestamp
+      param.secretkey = Utils.encrypt('', timestamp)
       
-      Api.getLocalConfig(param).then(result => {
+      Api.genericInterface(param).then(result => {
         if (result.status) {
           _resolve()
         } else {
@@ -211,10 +212,9 @@
       if (_loading) {
         notification.warning({
           top: 92,
-          message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+          message: '瀛樺湪鏈繚瀛樿剼鏈紒',
           duration: 5
         })
-        return
       }
       this.setState({loading: true})
       this.sqlverify(() => { // 楠岃瘉鎴愬姛
@@ -248,13 +248,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} className="verify-card-box" onChange={this.changeTab}>
+        <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}
@@ -265,9 +264,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