Merge branch 'develop'

king

2024-06-01 4cc738e535d1a20701d206e12cf9de8cc5a01170

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

@@ -414,10 +414,10 @@
                {getFieldDecorator('primaryKey', {
                  initialValue: setting.primaryKey || ''
                })(
                  <Select>
                  <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
                    {columns.map((option, i) =>
                      <Select.Option key={i} value={option.field}>
                        {option.label}
                        {`${option.label}（${option.field}）`}
                      </Select.Option>
                    )}
                  </Select>
@@ -652,10 +652,10 @@
                {getFieldDecorator('subKey', {
                  initialValue: setting.subKey || ''
                })(
                  <Select>
                  <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
                    {this.props.subColumns.map((option, i) =>
                      <Select.Option key={i} value={option.field}>
                        {option.label}
                        {`${option.label}（${option.field}）`}
                      </Select.Option>
                    )}
                  </Select>
@@ -667,10 +667,10 @@
                {getFieldDecorator('subBID', {
                  initialValue: setting.subBID || ''
                })(
                  <Select>
                  <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
                    {this.props.subColumns.map((option, i) =>
                      <Select.Option key={i} value={option.field}>
                        {option.label}
                        {`${option.label}（${option.field}）`}
                      </Select.Option>
                    )}
                  </Select>