Merge branch 'master' into positec

king

2024-03-08 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08

 src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx

@@ -521,7 +521,7 @@
    })
  }

  columnChange = (values) => {
  columnChange = (values, callback) => {
    let verify = JSON.parse(JSON.stringify(this.state.verify))

    let fields = verify.columns.map(item => item.Column)
@@ -532,6 +532,8 @@
        duration: 5
      })
      return
    } else {
      callback()
    }

    values.uuid = Utils.getuuid()
@@ -902,19 +904,6 @@
                    </Radio.Group>)}
                  </Form.Item>
                </Col>
                {verify.excelHandle === 'true' ? <Col span={24} style={{paddingLeft: '30px'}}>
                  <Form.Item wrapperCol={ {xs: { span: 24 }, sm: { span: 24 }} } label="">
                    {getFieldDecorator('excel_func', {
                      initialValue: verify.excel_func || '',
                      rules: [
                        {
                          required: true,
                          message: '请填写自定义逻辑!'
                        }
                      ]
                    })(<CodeMirror mode="text/javascript" theme="cobalt" />)}
                  </Form.Item>
                </Col> : null}
                {verify.excelHandle !== 'true' ? <Col span={8}>
                  <Form.Item label={
                    <Tooltip placement="bottomLeft" title="导入时工作表名与excel中必须一致，注：工作表名为Sheet1且excel中仅有一个工作表时不进行表名验证。">
@@ -933,7 +922,7 @@
                    })(<Input placeholder="" autoComplete="off" />)}
                  </Form.Item>
                </Col> : null}
                {verify.excelHandle !== 'true' ? <Col span={8}>
                <Col span={8}>
                  <Form.Item label={
                    <Tooltip placement="bottomLeft" title="忽略首行时，会校验excel中表头名称与excel列设置是否一致。">
                      <QuestionCircleOutlined className="mk-form-tip" />
@@ -944,6 +933,19 @@
                      initialValue: verify.range || 0
                    })(<InputNumber min={0} max={100} precision={0} />)}
                  </Form.Item>
                </Col>
                {verify.excelHandle === 'true' ? <Col span={24} style={{paddingLeft: '30px'}}>
                  <Form.Item wrapperCol={ {xs: { span: 24 }, sm: { span: 24 }} } label="">
                    {getFieldDecorator('excel_func', {
                      initialValue: verify.excel_func || '',
                      rules: [
                        {
                          required: true,
                          message: '请填写自定义逻辑!'
                        }
                      ]
                    })(<CodeMirror mode="text/javascript" theme="cobalt" />)}
                  </Form.Item>
                </Col> : null}
              </Row>
            </Form>