Merge branch 'master' into positec

king

2025-03-07 861192573a5fa59529d542201c210066f0ed3ca4

 src/menu/datasource/verifycard/settingform/index.jsx

@@ -192,7 +192,7 @@
  }

  render() {
    const { columns, config } = this.props
    const { columns, config, hasMainSearch } = this.props
    const { getFieldDecorator } = this.props.form
    const { setting, modules, innerRules, innertip, MenuType, visible } = this.state

@@ -562,7 +562,7 @@
                  initialValue: setting.useMSearch || 'true'
                })(
                  <Radio.Group onChange={(e) => {this.onOptionChange(e.target.value, 'useMSearch')}}>
                    <Radio value="true">使用</Radio>
                    <Radio value="true">使用{!hasMainSearch ? <Tooltip placement="top" title="无可使用的外部搜索条件"><span className="mk-dot"></span></Tooltip> : null}</Radio>
                    <Radio value="false">不使用</Radio>
                  </Radio.Group>
                )}