QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-06-02 06:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(select): keep options order when in single mode (#19085)

Browse Source
This commit is contained in:
Jesse Yang
2022-03-11 13:01:38 -08:00
committed by GitHub
parent 124cb0dc66
commit ae13d8313b
22 changed files with 207 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
superset-frontend/src/explore/components/controls/SelectControl.jsx
View File

@@ -18,8 +18,8 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { css, t } from '@superset-ui/core';
import Select, { propertyComparator } from 'src/components/Select/Select';
import { css, isEqualArray, t } from '@superset-ui/core';
import Select from 'src/components/Select/Select';
import ControlHeader from 'src/explore/components/ControlHeader';
const propTypes = {
@@ -94,8 +94,8 @@ export default class SelectControl extends React.PureComponent {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
nextProps.choices !== this.props.choices ||
nextProps.options !== this.props.options
!isEqualArray(nextProps.choices, this.props.choices) ||
!isEqualArray(nextProps.options, this.props.options)
) {
const options = this.getOptions(nextProps);
this.setState({ options });
@@ -133,10 +133,9 @@ export default class SelectControl extends React.PureComponent {
}));
} else if (choices) {
// Accepts different formats of input
options = choices.map((c, i) => {
options = choices.map(c => {
if (Array.isArray(c)) {
const [value, label] = c.length > 1 ? c : [c[0], c[0]];
if (!this.props.sortComparator) return { value, label, order: i };
return {
value,
label,
@@ -241,7 +240,7 @@ export default class SelectControl extends React.PureComponent {
optionRenderer,
options: this.state.options,
placeholder,
sortComparator: this.props.sortComparator || propertyComparator('order'),
sortComparator: this.props.sortComparator,
value: getValue(),
};