fix(filter-picker): add defaultOperationsOption on FilterCondition (#…

…1773) Co-authored-by: maxin <maxin@growingio.com>
growingio · Jan 6, 2022 · 127648b · 127648b · vercel · Jan 6, 2022
1 parent 6b41a98
commit 127648b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/legacy/filter-picker/FilterPicker.tsx b/src/legacy/filter-picker/FilterPicker.tsx
@@ -8,7 +8,7 @@ import Dropdown from '../dropdown';
 import defaultLocaleTextObject from './locales/zh-CN';
 import './style';
 
-const defaultOperationsOption: operationsOptionType = {
+export const defaultOperationsOption: operationsOptionType = {
   string: ['=', '!=', 'in', 'not in', 'like', 'not like', 'hasValue', 'noValue'],
   int: ['=', '!=', '>', '>=', '<', '<=', 'between', 'not between', 'hasValue', 'noValue'],
   double: ['=', '!=', '>', '>=', '<', '<=', 'between', 'not between', 'hasValue', 'noValue'],

diff --git a/src/legacy/filter-picker/components/FilterList/Expression/FilterCondition/index.tsx b/src/legacy/filter-picker/components/FilterList/Expression/FilterCondition/index.tsx
@@ -6,7 +6,7 @@ import { attributeValue, FilterValueType, StringValue, NumberValue, DateValue }
 import Selector from '../../../../../selector-pro';
 import { ListValue, operationsOptionType } from '../../../../interfaces';
 import Tooltip from '../../../../../../tooltip'; // new
-import { FilterPickerContext, TextObject } from '../../../../FilterPicker';
+import { defaultOperationsOption, FilterPickerContext, TextObject } from '../../../../FilterPicker';
 import defaultLocaleTextObject from '../../../../locales/zh-CN';
 
 interface FilterConditionProps {
@@ -95,7 +95,7 @@ function FilterCondition(props: FilterConditionProps) {
       curryDimensionValueRequest={curryDimensionValueRequest}
       values={values}
       exprKey={exprKey}
-      operationsOption={operationsOption}
+      operationsOption={{ ...defaultOperationsOption, ...operationsOption }}
       numType={numType}
     />
   );