fix: select with color tag value (#1963)
* fix: select with color tag value * fix: select with color tag value
This commit is contained in:
parent
78095d1128
commit
e139646d65
@ -206,6 +206,7 @@ const InternalRemoteSelect = connect(
|
|||||||
{...others}
|
{...others}
|
||||||
loading={data! ? loading : true}
|
loading={data! ? loading : true}
|
||||||
options={mapOptionsToTags(options)}
|
options={mapOptionsToTags(options)}
|
||||||
|
rawOptions={options}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
@ -7,12 +7,17 @@ import React from 'react';
|
|||||||
import { ReadPretty } from './ReadPretty';
|
import { ReadPretty } from './ReadPretty';
|
||||||
import { defaultFieldNames, getCurrentOptions } from './shared';
|
import { defaultFieldNames, getCurrentOptions } from './shared';
|
||||||
|
|
||||||
type Props = SelectProps<any, any> & { objectValue?: boolean; onChange?: (v: any) => void; multiple: boolean };
|
type Props = SelectProps<any, any> & {
|
||||||
|
objectValue?: boolean;
|
||||||
|
onChange?: (v: any) => void;
|
||||||
|
multiple: boolean;
|
||||||
|
rawOptions: any[];
|
||||||
|
};
|
||||||
|
|
||||||
const isEmptyObject = (val: any) => !isValid(val) || (typeof val === 'object' && Object.keys(val).length === 0);
|
const isEmptyObject = (val: any) => !isValid(val) || (typeof val === 'object' && Object.keys(val).length === 0);
|
||||||
|
|
||||||
const ObjectSelect = (props: Props) => {
|
const ObjectSelect = (props: Props) => {
|
||||||
const { value, options, onChange, fieldNames, mode, loading, ...others } = props;
|
const { value, options, onChange, fieldNames, mode, loading, rawOptions, ...others } = props;
|
||||||
const toValue = (v: any) => {
|
const toValue = (v: any) => {
|
||||||
if (isEmptyObject(v)) {
|
if (isEmptyObject(v)) {
|
||||||
return;
|
return;
|
||||||
@ -52,7 +57,7 @@ const ObjectSelect = (props: Props) => {
|
|||||||
onChange={(changed) => {
|
onChange={(changed) => {
|
||||||
const current = getCurrentOptions(
|
const current = getCurrentOptions(
|
||||||
toArr(changed).map((v) => v.value),
|
toArr(changed).map((v) => v.value),
|
||||||
options,
|
rawOptions,
|
||||||
fieldNames,
|
fieldNames,
|
||||||
);
|
);
|
||||||
if (['tags', 'multiple'].includes(mode) || props.multiple) {
|
if (['tags', 'multiple'].includes(mode) || props.multiple) {
|
||||||
|
Loading…
Reference in New Issue
Block a user