Merge pull request #925 from thundersdata-frontend/rn-issue

fix: 修复不小心提交的bug

Author: chj-damon

packages/react-native-picker/src/picker/components/Normal/index.tsx

@@ -13,7 +13,6 @@ function NormalPicker<T>(props: ImperativeModalChildrenProps<NormalPickerProps<T
   const {
     title,
     data,
-    request,
     value,
     onChange,
     cancelText = '取消',
@@ -23,15 +22,16 @@ function NormalPicker<T>(props: ImperativeModalChildrenProps<NormalPickerProps<T
     ...restProps
   } = props;
 
-  const { selectedValue, handleOk, handleChange, handleClose, options } = useNormalPicker({
-    data,
-    request,
+  const initialValue = data.length > 0 ? data[0].value : undefined;
+
+  const { selectedValue, handleOk, handleChange, handleClose } = useNormalPicker({
     value,
+    initialValue,
     onChange,
     closeModal,
   });
 
-  if (options.length === 0) return null;
+  if (data.length === 0) return null;
 
   return (
     <>
@@ -59,7 +59,7 @@ function NormalPicker<T>(props: ImperativeModalChildrenProps<NormalPickerProps<T
         </Pressable>
       </Flex>
       <Box height={px(200)}>
-        <WheelPicker {...restProps} data={options} value={selectedValue} onChange={handleChange} />
+        <WheelPicker {...restProps} data={data} value={selectedValue} onChange={handleChange} />
       </Box>
     </>
   );

packages/react-native-picker/src/picker/components/Normal/useNormalPicker.ts

@@ -6,11 +6,10 @@ import { NormalPickerProps } from '../../type';
 
 export default function useNormalPicker<T>({
   value,
+  initialValue,
   onChange,
   closeModal,
-}: ImperativeModalChildrenProps<Omit<NormalPickerProps<T>, 'data'>>) {
-  const initialValue = data.length > 0 ? data[0].value : undefined;
-
+}: ImperativeModalChildrenProps<Omit<NormalPickerProps<T>, 'data'> & { initialValue?: T }>) {
   const [selectedValue, selectValue] = useSafeState<T | undefined>(value || initialValue);
 
   const handleChange = (val: PickerData<T>) => {

packages/react-native-picker/src/picker/type.ts

@@ -2,21 +2,13 @@ import { CascadePickerItemProps, WheelPickerPropsBase } from '../components/Whee
 
 export interface PickerProps<T> extends WheelPickerPropsBase {
   /** 选择项列表 */
-  data?: CascadePickerItemProps<T>[];
-  /** 请求数据 */
-  request?: () => Promise<CascadePickerItemProps<T>[]>;
+  data: CascadePickerItemProps<T>[];
   /** 是否级联 */
   cascade?: boolean;
   /** 展示几列 */
   cols?: number;
   value?: T[] | T;
   onChange?: (value?: T extends (infer U)[] ? U[] : T) => void;
-  /** 字段名 */
-  fieldNames?: {
-    label?: string;
-    value?: string;
-    children?: string;
-  };
 }
 
 /** 弹窗Picker的属性 */