From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
index 5eab415..bc1225f 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { notification, Modal, Spin, Tabs } from 'antd'
+import { Form, notification, Modal, Spin, Tabs } from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -16,7 +16,6 @@
class SettingForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
@@ -141,6 +140,7 @@
exec_type: 'y',
LText: SettingUtils.getDebugSql(setting, _scripts, timestamp)
}
+ param.LText = param.LText.replace(/\n/g, ' ')
param.LText = Utils.formatOptions(param.LText)
param.timestamp = timestamp
param.secretkey = Utils.encrypt('', timestamp)
@@ -255,7 +255,6 @@
<TabPane tab="鏁版嵁婧�" key="setting">
<DataSource
menu={menu}
- dict={this.props.dict}
setting={setting}
inputSubmit={this.props.inputSubmit}
wrappedComponentRef={(inst) => this.settingForm = inst}
@@ -268,7 +267,6 @@
</span>
} key="scripts" id="mk-setting-scripts">
<CustomScript
- dict={this.props.dict}
setting={setting}
scripts={scripts}
defaultSql={this.state.defaultsql}
@@ -284,4 +282,4 @@
}
}
-export default SettingForm
\ No newline at end of file
+export default Form.create()(SettingForm)
\ No newline at end of file
--
Gitblit v1.8.0