king
2022-08-24 4a8970e43aa886987c39ddc85ca1dd8b6e43806e
2022-08-24
5个文件已修改
88 ■■■■■ 已修改文件
src/menu/datasource/verifycard/settingform/index.jsx 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basedesign/index.jsx 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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" />
                  正式地址
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'}}>
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" />
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}>
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({