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 | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/index.jsx index 5eab415..31c37e5 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) @@ -212,10 +212,9 @@ if (_loading) { notification.warning({ top: 92, - message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒', + message: '瀛樺湪鏈繚瀛樿剼鏈紒', duration: 5 }) - return } this.setState({loading: true}) this.sqlverify(() => { // 楠岃瘉鎴愬姛 @@ -255,7 +254,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 +266,6 @@ </span> } key="scripts" id="mk-setting-scripts"> <CustomScript - dict={this.props.dict} setting={setting} scripts={scripts} defaultSql={this.state.defaultsql} @@ -284,4 +281,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