Merge branch 'develop'

king

2022-08-02 8d66ff34fae5b048a6b7923cc75d34f13a08be9d

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

@@ -29,6 +29,7 @@
    interType: 'system',
    procMode: 'script',
    requestMode: 'system',
    controlField: '',
    tableType: '',
    funcTooltip: '',
    funcRules: []
@@ -66,6 +67,7 @@
      interType: setting.interType || 'system',
      procMode: setting.procMode || 'script',
      requestMode: setting.requestMode || 'system',
      controlField: setting.controlField || '',
      tableType: setting.tableType,
      funcTooltip: tooltip,
      funcRules: rules
@@ -195,7 +197,7 @@
  render() {
    const { setting, dict, menu, config, columns } = this.props
    const { getFieldDecorator } = this.props.form
    const { interType, funcRules, funcTooltip, procMode, requestMode, tableType } = this.state
    const { interType, funcRules, funcTooltip, procMode, requestMode, tableType, controlField } = this.state

    const formItemLayout = {
      labelCol: {
@@ -633,7 +635,7 @@
                  <Radio value="default">大</Radio>
                  <Radio value="middle">中</Radio>
                  <Radio value="small">小</Radio>
                  {/* <Radio value="mini">微</Radio> */}
                  <Radio value="mini">迷你</Radio>
                </Radio.Group>)}
              </Form.Item>
            </Col>
@@ -680,7 +682,7 @@
                </Radio.Group>)}
              </Form.Item>
            </Col>
            <Col span={12}>
            {/* <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="在搜索条件存在时，是否显示搜索和重置按钮。">
                  <QuestionCircleOutlined className="mk-form-tip" />
@@ -695,10 +697,10 @@
                  <Radio value="false">隐藏</Radio>
                </Radio.Group>)}
              </Form.Item>
            </Col>
            </Col> */}
            {tableType !== '' ? <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="在启用无人值守功能时无效。">
                <Tooltip placement="topLeft" title="当按钮执行完成并返回主键值时，默认选中主键值对应行。注：在启用无人值守功能时无效。">
                  <QuestionCircleOutlined className="mk-form-tip" />
                  首行选中
                </Tooltip>
@@ -725,7 +727,7 @@
                })(<InputNumber min={1} max={500} precision={0} />)}
              </Form.Item>
            </Col>
            <Col span={12}>
            {/* <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="高级搜索弹窗的宽度，注：当宽度值小于100时表示占窗口的百分比，大于100时表示宽度的绝对值。">
                  <QuestionCircleOutlined className="mk-form-tip" />
@@ -736,7 +738,7 @@
                  initialValue: setting.advanceWidth || 1000
                })(<InputNumber min={10} max={3000} precision={0}/>)}
              </Form.Item>
            </Col>
            </Col> */}
            <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="双击表格中行，触发的按钮。">
@@ -786,6 +788,38 @@
                })(<InputNumber min={12} max={50} precision={0}/>)}
              </Form.Item>
            </Col>
            <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="用于控制行数据是否可选择。">
                  <QuestionCircleOutlined className="mk-form-tip" />
                  禁用字段
                </Tooltip>
              }>
                {getFieldDecorator('controlField', {
                  initialValue: setting.controlField || ''
                })(
                  <Select allowClear onChange={(val) => this.setState({controlField: val})}>
                    {columns.map((option, i) =>
                      <Select.Option key={i} value={option.value}>
                        {option.text}
                      </Select.Option>
                    )}
                  </Select>
                )}
              </Form.Item>
            </Col>
            {controlField ? <Col span={12}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="当字段值与控制值相等时，行数据会禁用，多个值用逗号分隔。">
                  <QuestionCircleOutlined className="mk-form-tip" />
                  控制值
                </Tooltip>
              }>
                {getFieldDecorator('controlVal', {
                  initialValue: setting.controlVal || ''
                })(<Input autoComplete="off" />)}
              </Form.Item>
            </Col> : null}
          </Row>
        </Form>
      </div>