Merge branch 'master' into positec

king

2023-06-12 07c005cf28acf74e3afde82122e4c53e1000d70c

 src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx

@@ -14,7 +14,6 @@

class SettingForm extends Component {
  static propTpyes = {
    dict: PropTypes.object,       // 字典项
    menu: PropTypes.object,       // 菜单信息
    setting: PropTypes.object,    // 数据源配置
    inputSubmit: PropTypes.func   // 触发提交
@@ -109,6 +108,14 @@
              })
              reject()
              return
            } else if (/,,/ig.test(values.dataresource)) {
              notification.warning({
                top: 92,
                message: '数据源中，不可出现连续的英文逗号（,,）',
                duration: 5
              })
              reject()
              return
            }

            let error = Utils.verifySql(values.dataresource)
@@ -175,7 +182,7 @@
  }

  render() {
    const { setting, dict, menu } = this.props
    const { setting, menu } = this.props
    const { getFieldDecorator } = this.props.form
    const { interType, funcRules, funcTooltip } = this.state

@@ -200,7 +207,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + '表名!'
                    message: '请输入表名!'
                  },
                  {
                    max: 50,
@@ -217,7 +224,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + '标题!'
                    message: '请输入标题!'
                  },
                  {
                    max: formRule.input.max,
@@ -228,13 +235,13 @@
            </Form.Item>
          </Col>
          <Col span={8}>
            <Form.Item label={dict['header.form.intertype']}>
            <Form.Item label="接口类型">
              {getFieldDecorator('interType', {
                initialValue: interType,
                rules: [
                  {
                    required: true,
                    message: dict['form.required.select'] + dict['header.form.intertype'] + '!'
                    message: '请选择接口类型!'
                  }
                ]
              })(
@@ -246,19 +253,24 @@
            </Form.Item>
          </Col>
          {interType === 'outer' ? <Col span={8}>
            <Form.Item label={dict['header.form.sysInterface']}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="单点登录系统">
                <QuestionCircleOutlined className="mk-form-tip" />
                系统接口
              </Tooltip>
            }>
              {getFieldDecorator('sysInterface', {
                initialValue: setting.sysInterface || 'false',
                rules: [
                  {
                    required: true,
                    message: dict['form.required.select'] + dict['header.form.sysInterface'] + '!'
                    message: '请选择系统接口!'
                  },
                ]
              })(
              <Radio.Group onChange={(e) => {this.onRadioChange(e, 'sysInterface')}}>
                <Radio value="true">{dict['model.true']}</Radio>
                <Radio value="false">{dict['model.false']}</Radio>
                <Radio value="true">是</Radio>
                <Radio value="false">否</Radio>
              </Radio.Group>)}
            </Form.Item>
          </Col> : null}
@@ -274,7 +286,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + '内部函数!'
                    message: '请输入内部函数!'
                  },
                  {
                    max: formRule.func.max,
@@ -292,7 +304,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + '接口地址!'
                    message: '请输入接口地址!'
                  }
                ]
              })(<TextArea rows={2}/>)}
@@ -328,7 +340,7 @@
          </Col> : null}
          <Col span={8}>
            <Form.Item label={
              <Tooltip placement="topLeft" title={'数据值字段。'}>
              <Tooltip placement="topLeft" title="数据值字段。">
                <QuestionCircleOutlined className="mk-form-tip" />
                Value
              </Tooltip>
@@ -338,7 +350,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + 'Value!'
                    message: '请输入Value!'
                  },
                  {
                    pattern: formRule.field.pattern,
@@ -363,7 +375,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + 'Label!'
                    message: '请输入Label!'
                  },
                  {
                    pattern: formRule.field.pattern,
@@ -378,7 +390,7 @@
          </Col>
          <Col span={8}>
            <Form.Item label={
              <Tooltip placement="topLeft" title={'父级字段。'}>
              <Tooltip placement="topLeft" title="父级字段。">
                <QuestionCircleOutlined className="mk-form-tip" />
                Parent
              </Tooltip>
@@ -388,7 +400,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + 'Label!'
                    message: '请输入Label!'
                  },
                  {
                    pattern: formRule.field.pattern,
@@ -408,7 +420,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + '排序!'
                    message: '请输入排序!'
                  },
                  {
                    max: formRule.input.max,
@@ -448,7 +460,7 @@
                rules: [
                  {
                    required: true,
                    message: dict['form.required.input'] + '宽度!'
                    message: '请输入宽度!'
                  }
                ]
              })(<InputNumber min={2} max={12} precision={0} />)}