Skip to content

Commit

Permalink
fix(filter-condition): 组件国际化问题 (#1650)
Browse files Browse the repository at this point in the history
  • Loading branch information
huskylengcb committed Dec 8, 2021
1 parent 4989cff commit eb25fc2
Showing 1 changed file with 18 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React, { useContext, useMemo, useState } from 'react';
import React, { useMemo, useState } from 'react';
import { useLocale } from '@gio-design/utils';
import parseValuesToText from './utils';
import FilterAttrOverlay from './FilterAttrOverlay';
import { attributeValue, FilterValueType, StringValue, NumberValue, DateValue } from './interfaces';
import Selector from '../../../../../selector-pro';
import { operationsOptionType } from '../../../../interfaces';
import Tooltip from '../../../../../../tooltip'; // new
import { FilterPickerContext } from '../../../../FilterPicker';
import { FilterPickerContext, TextObject } from '../../../../FilterPicker';
import defaultLocaleTextObject from '../../../../locales/zh-CN';

export const defaultOperationsOption: operationsOptionType = {
string: ['=', '!=', 'in', 'not in', 'like', 'not like', 'hasValue', 'noValue'],
Expand Down Expand Up @@ -48,9 +50,9 @@ function FilterCondition(props: FilterConditionProps) {
borderless = true,
size = 'middle',
} = props;
const { textObject } = useContext(FilterPickerContext);
const localeTextObject: TextObject = useLocale('FilterPicker');
const textObject = useMemo(() => ({ ...defaultLocaleTextObject, ...localeTextObject }), [localeTextObject]);
const [visible, setVisible] = useState(false);
const { textObject: t } = useContext(FilterPickerContext);
const conditionText = useMemo<string>(
() => parseValuesToText(valueType, op, values, textObject),
[valueType, op, values, textObject]
Expand Down Expand Up @@ -82,7 +84,7 @@ function FilterCondition(props: FilterConditionProps) {
<span className="filter-condition_select">
<Tooltip
title={conditionText}
disabled={conditionText === t.selectFilter}
disabled={conditionText === textObject.selectFilter}
getContainer={() => document.body}
placement="topLeft"
>
Expand All @@ -106,15 +108,17 @@ function FilterCondition(props: FilterConditionProps) {
);

return exprKey ? (
<Selector
valueRender={valueRender}
dropdownVisible={visible}
dropdownRender={dropdownRender}
onDropdownVisibleChange={visibleChange}
disabled={disabled}
borderless={borderless}
size={size}
/>
<FilterPickerContext.Provider value={{ textObject }}>
<Selector
valueRender={valueRender}
dropdownVisible={visible}
dropdownRender={dropdownRender}
onDropdownVisibleChange={visibleChange}
disabled={disabled}
borderless={borderless}
size={size}
/>
</FilterPickerContext.Provider>
) : null;
}
export default FilterCondition;

1 comment on commit eb25fc2

@vercel
Copy link

@vercel vercel bot commented on eb25fc2 Dec 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.