Merge branch 'master' into positec

king

2022-11-24 5478a1f1d6a9dca0d8c3c4301b28cb6a67f58993

 src/templates/modalconfig/settingform/index.jsx

@@ -111,12 +111,7 @@
            </Form.Item>
          </Col> */}
          <Col span={24}>
            <Form.Item label={
              <Tooltip placement="topLeft" title="对话框在仅有一个可输入表单（非隐藏、非只读的文本或数字）时有效。">
                <QuestionCircleOutlined className="mk-form-tip" />
                显示方式
              </Tooltip>
            }>
            <Form.Item label="显示方式">
              {getFieldDecorator('display', {
                initialValue: display || 'modal'
              })(