From 4a8970e43aa886987c39ddc85ca1dd8b6e43806e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 24 八月 2022 14:46:54 +0800
Subject: [PATCH] 2022-08-24
---
src/views/basedesign/index.jsx | 3 -
src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx | 24 ++++++-----
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 29 +++++++++-----
src/menu/datasource/verifycard/settingform/index.jsx | 26 +++++++++----
src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx | 6 ++-
5 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 9f89d35..cc9c58e 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -27,6 +27,7 @@
modules: [],
usefulFields: [],
useMSearch: this.props.setting.useMSearch || 'false',
+ sysInterface: this.props.setting.sysInterface || 'false',
supModule: this.props.setting.supModule || [],
appType: sessionStorage.getItem('appType')
}
@@ -141,10 +142,13 @@
})
}
}
-
+
onSysInter = (e) => {
let value = e.target.value
-
+
+ this.setState({
+ sysInterface: value
+ })
if (value === 'true') {
this.props.form.setFieldsValue({interface: window.GLOB.mainSystemApi})
}
@@ -157,7 +161,7 @@
render() {
const { setting, columns, config } = this.props
const { getFieldDecorator } = this.props.form
- const { interType, modules, useMSearch, laypage, supModule, usefulFields, appType } = this.state
+ const { interType, modules, useMSearch, laypage, supModule, usefulFields, appType, sysInterface } = this.state
const formItemLayout = {
labelCol: {
@@ -226,7 +230,13 @@
{interType === 'outer' ? <Col span={8}>
<Form.Item label="绯荤粺鎺ュ彛">
{getFieldDecorator('sysInterface', {
- initialValue: setting.sysInterface || 'false'
+ initialValue: sysInterface,
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鏄惁浣跨敤绯荤粺鎺ュ彛!'
+ }
+ ]
})(
<Radio.Group onChange={this.onSysInter}>
<Radio value="true">鏄�</Radio>
@@ -256,17 +266,17 @@
{interType === 'outer' ? <Col className="outer-interface" span={24}>
<Form.Item label="鎺ュ彛鍦板潃">
{getFieldDecorator('interface', {
- initialValue: setting.interface || '',
+ initialValue: setting.interface || (sysInterface === 'true' ? window.GLOB.mainSystemApi : ''),
rules: [
{
- required: true,
+ required: sysInterface !== 'true' ? true : false,
message: this.props.dict['form.required.input'] + '鎺ュ彛鍦板潃!'
}
]
- })(<TextArea rows={2}/>)}
+ })(<TextArea rows={2} readOnly={sysInterface === 'true'}/>)}
</Form.Item>
</Col> : null}
- {interType === 'outer' ? <Col className="outer-interface" span={24}>
+ {interType === 'outer' && sysInterface !== 'true' ? <Col className="outer-interface" span={24}>
<Form.Item label={<Tooltip placement="topLeft" title="姝ｅ紡绯荤粺鎺ュ彛鍦板潃锛屼负绌烘椂浣跨敤鎺ュ彛鍦板潃">
<QuestionCircleOutlined className="mk-form-tip" />
姝ｅ紡鍦板潃
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
index b61e619..f047810 100644
--- a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
@@ -10,6 +10,8 @@
import CodeMirror from '@/templates/zshare/codemirror'
import './index.scss'
+const { TextArea } = Input
+
class SettingForm extends Component {
static propTpyes = {
dict: PropTypes.object, // 瀛楀吀椤�
@@ -226,6 +228,16 @@
</Form.Item>
</Col> : null}
{interType === 'outer' ? <Col span={8}>
+ <Form.Item label="澶栭儴鍑芥暟">
+ {getFieldDecorator('outerFunc', {
+ initialValue: setting.outerFunc || '',
+ rules: [
+
+ ]
+ })(<Input placeholder={''} autoComplete="off" />)}
+ </Form.Item>
+ </Col> : null}
+ {interType === 'outer' ? <Col span={24} className="data-source">
<Form.Item label="鎺ュ彛鍦板潃">
{getFieldDecorator('interface', {
initialValue: setting.interface || '',
@@ -235,17 +247,7 @@
message: this.props.dict['form.required.input'] + '鎺ュ彛鍦板潃!'
},
]
- })(<Input placeholder={''} autoComplete="off" />)}
- </Form.Item>
- </Col> : null}
- {interType === 'outer' ? <Col span={8}>
- <Form.Item label="澶栭儴鍑芥暟">
- {getFieldDecorator('outerFunc', {
- initialValue: setting.outerFunc || '',
- rules: [
-
- ]
- })(<Input placeholder={''} autoComplete="off" />)}
+ })(<TextArea rows={2}/>)}
</Form.Item>
</Col> : null}
{interType === 'system' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index c00c44f..df973b7 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -29,6 +29,7 @@
interType: 'system',
procMode: 'script',
requestMode: 'system',
+ sysInterface: 'false',
controlField: '',
tableType: '',
funcTooltip: '',
@@ -68,6 +69,7 @@
procMode: setting.procMode || 'script',
requestMode: setting.requestMode || 'system',
controlField: setting.controlField || '',
+ sysInterface: setting.sysInterface || 'false',
tableType: setting.tableType,
funcTooltip: tooltip,
funcRules: rules
@@ -178,10 +180,15 @@
this.setState({
requestMode: value
})
- } else if (key === 'sysInterface' && value === 'true') {
- this.props.form.setFieldsValue({
- interface: window.GLOB.mainSystemApi || ''
+ } else if (key === 'sysInterface') {
+ this.setState({
+ sysInterface: value
})
+ if (value === 'true') {
+ this.props.form.setFieldsValue({
+ interface: window.GLOB.mainSystemApi || ''
+ })
+ }
}
this.props.updateStatus({[key]: value})
}
@@ -197,7 +204,7 @@
render() {
const { setting, dict, menu, config, columns } = this.props
const { getFieldDecorator } = this.props.form
- const { interType, funcRules, funcTooltip, procMode, requestMode, tableType, controlField } = this.state
+ const { interType, funcRules, funcTooltip, procMode, requestMode, tableType, controlField, sysInterface } = this.state
const formItemLayout = {
labelCol: {
@@ -266,7 +273,7 @@
{interType === 'outer' ? <Col span={12}>
<Form.Item label={dict['header.form.sysInterface']}>
{getFieldDecorator('sysInterface', {
- initialValue: setting.sysInterface || 'false',
+ initialValue: sysInterface,
rules: [
{
required: true,
@@ -321,19 +328,19 @@
</Form.Item>
</Col> : null}
{interType === 'outer' || interType === 'custom' ? <Col className="data-source" span={24}>
- <Form.Item label="娴嬭瘯鍦板潃">
+ <Form.Item label="鎺ュ彛鍦板潃">
{getFieldDecorator('interface', {
- initialValue: setting.interface || '',
+ initialValue: setting.interface || (interType === 'outer' && sysInterface === 'true' ? window.GLOB.mainSystemApi : ''),
rules: [
{
- required: true,
- message: dict['form.required.input'] + '娴嬭瘯鍦板潃!'
+ required: interType === 'outer' && sysInterface === 'true' ? false : true,
+ message: dict['form.required.input'] + '鎺ュ彛鍦板潃!'
},
]
- })(<TextArea rows={2} />)}
+ })(<TextArea rows={2} readOnly={interType === 'outer' && sysInterface === 'true'}/>)}
</Form.Item>
</Col> : null}
- {interType === 'outer' || interType === 'custom' ? <Col className="data-source" span={24}>
+ {(interType === 'outer' && sysInterface !== 'true') || interType === 'custom' ? <Col className="data-source" span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="姝ｅ紡绯荤粺鎵�浣跨敤鐨勭殑鎺ュ彛鍦板潃銆�">
<QuestionCircleOutlined className="mk-form-tip" />
diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx
index 4562d28..6c21f28 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx
@@ -10,6 +10,8 @@
import CodeMirror from '@/templates/zshare/codemirror'
import './index.scss'
+const { TextArea } = Input
+
class SettingForm extends Component {
static propTpyes = {
dict: PropTypes.object, // 瀛楀吀椤�
@@ -284,7 +286,7 @@
})(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
</Form.Item>
</Col> : null}
- {interType === 'outer' ? <Col span={12}>
+ {interType === 'outer' ? <Col span={24} className="data-source">
<Form.Item label="鎺ュ彛鍦板潃">
{getFieldDecorator('interface', {
initialValue: setting.interface || '',
@@ -294,7 +296,7 @@
message: dict['form.required.input'] + '鎺ュ彛鍦板潃!'
}
]
- })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
+ })(<TextArea rows={2}/>)}
</Form.Item>
</Col> : null}
{interType === 'outer' ? <Col span={12}>
diff --git a/src/views/basedesign/index.jsx b/src/views/basedesign/index.jsx
index 61a6e9b..41172b4 100644
--- a/src/views/basedesign/index.jsx
+++ b/src/views/basedesign/index.jsx
@@ -71,8 +71,7 @@
let param = {
func: 'sPC_Get_LongParam',
- // MenuID: editMenu.MenuID
- MenuID: '1587005717541lov40vg61q7l1rbveon'
+ MenuID: editMenu.MenuID
}
this.setState({
--
Gitblit v1.8.0