feat: Cascader component value support number type (#86)

react-component · May 17, 2020 · 557aecb · 557aecb
1 parent 03c9b9b
commit 557aecb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/Cascader.tsx b/src/Cascader.tsx
@@ -8,13 +8,15 @@ import Menus from './Menus';
 import BUILT_IN_PLACEMENTS from './placements';
 
 export interface CascaderFieldNames {
-  value?: string;
+  value?: string | number;
   label?: string;
   children?: string;
 }
 
+export type CascaderValueType = (string | number)[];
+
 export interface CascaderOption {
-  value?: string;
+  value?: string | number;
   label?: React.ReactNode;
   disabled?: boolean;
   isLeaf?: boolean;
@@ -24,10 +26,10 @@ export interface CascaderOption {
 }
 
 export interface CascaderProps extends Pick<TriggerProps, 'getPopupContainer'> {
-  value?: string[];
-  defaultValue?: string[];
+  value?: CascaderValueType;
+  defaultValue?: CascaderValueType;
   options?: CascaderOption[];
-  onChange?: (value: string[], selectOptions: CascaderOption[]) => void;
+  onChange?: (value: CascaderValueType, selectOptions: CascaderOption[]) => void;
   onPopupVisibleChange?: (popupVisible: boolean) => void;
   popupVisible?: boolean;
   disabled?: boolean;
@@ -50,8 +52,8 @@ export interface CascaderProps extends Pick<TriggerProps, 'getPopupContainer'> {
 
 interface CascaderState {
   popupVisible?: boolean;
-  activeValue?: string[];
-  value?: string[];
+  activeValue?: CascaderValueType;
+  value?: CascaderValueType;
   prevProps?: CascaderProps;
 }
 
@@ -158,7 +160,7 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {
     return [...options].filter(o => !o.disabled);
   }
 
-  getActiveOptions(activeValue: string[]): CascaderOption[] {
+  getActiveOptions(activeValue: CascaderValueType): CascaderOption[] {
     return arrayTreeFilter(
       this.props.options || [],
       (o, level) => o[this.getFieldName('value')] === activeValue[level],

diff --git a/src/Menus.tsx b/src/Menus.tsx
@@ -3,8 +3,8 @@ import arrayTreeFilter from 'array-tree-filter';
 import { CascaderOption, CascaderFieldNames } from './Cascader';
 
 interface MenusProps {
-  value?: string[];
-  activeValue?: string[];
+  value?: (string | number)[];
+  activeValue?: (string | number)[];
   options?: CascaderOption[];
   prefixCls?: string;
   expandTrigger?: string;