Merge branch 'filter-app' into fix/filter-control

antvis · Dec 26, 2023 · 6306ecb · 6306ecb
2 parents 2cd1d8e + afb2f62
commit 6306ecb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/li-analysis-assets/src/widgets/FilterControl/Component/DateItem.tsx b/packages/li-analysis-assets/src/widgets/FilterControl/Component/DateItem.tsx
@@ -1,10 +1,10 @@
-import type { DateConfig } from '@antv/li-p2';
+import type { FilterDateConfigType } from '@antv/li-p2';
 import React from 'react';
 import { FilterDateConfig } from '@antv/li-p2';
 
 export interface DateItemProps {
-  value: DateConfig;
-  onChange: (value: DateConfig) => void;
+  value: FilterDateConfigType;
+  onChange: (value: FilterDateConfigType) => void;
 }
 
 const DateItem: React.FC<DateItemProps> = (props) => {

diff --git a/packages/li-analysis-assets/src/widgets/FilterControl/Component/NumberItem.tsx b/packages/li-analysis-assets/src/widgets/FilterControl/Component/NumberItem.tsx
@@ -1,13 +1,13 @@
 import { DownOutlined } from '@ant-design/icons';
-import type { NumberConfig } from '@antv/li-p2';
+import type { FilterNumberConfigType } from '@antv/li-p2';
 import { FilterNumberConfig } from '@antv/li-p2';
 import { Button, Popover } from 'antd';
 import React, { useState } from 'react';
 import useStyle from './style';
 
 export interface NumberItemProps {
-  value: NumberConfig;
-  onChange: (value: NumberConfig) => void;
+  value: FilterNumberConfigType;
+  onChange: (value: FilterNumberConfigType) => void;
 }
 
 const NumberItem: React.FC<NumberItemProps> = (props) => {
@@ -29,7 +29,7 @@ const NumberItem: React.FC<NumberItemProps> = (props) => {
   };
 
   const onSubmit = () => {
-    const numberNode = { ...defaluValue, ...valAndOperator } as NumberConfig;
+    const numberNode = { ...defaluValue, ...valAndOperator } as FilterNumberConfigType;
     onChange(numberNode);
     setOpen(false);
   };

diff --git a/packages/li-analysis-assets/src/widgets/FilterControl/Component/StringItem.tsx b/packages/li-analysis-assets/src/widgets/FilterControl/Component/StringItem.tsx
@@ -1,13 +1,13 @@
-import type { StringConfig } from '@antv/li-p2';
+import type { FilterStringConfigType } from '@antv/li-p2';
 import { FilterStringConfig } from '@antv/li-p2';
 import { uniq } from 'lodash-es';
 import React, { useMemo } from 'react';
 
 export interface StringItemProps {
-  value: StringConfig;
+  value: FilterStringConfigType;
   field: string;
   data: Record<string, any>[];
-  onChange: (value: StringConfig) => void;
+  onChange: (value: FilterStringConfigType) => void;
 }
 
 const StringItem: React.FC<StringItemProps> = (props) => {