Merge pull request #519 from huqiaoli/dev

fix(DatePicker):修改时分秒值

Author: ChenlingasMx

packages/core/src/DatePicker/component/PickerView.tsx

@@ -27,7 +27,7 @@ export interface PickerViewProps extends PickerProps {
 }
 
 const PickerView = (props: PickerViewProps) => {
-  const { title, showTitle, titleStyle, renderTitle, getTypeDate, value, ...other } = props;
+  const { title, showTitle, titleStyle, renderTitle, getTypeDate, value, onScrollEnd, ...other } = props;
   const textStyle = StyleSheet.flatten([styles.textStyle, titleStyle]);
   const [state, setState] = useState<number>(0);
   useEffect(() => {

packages/core/src/DatePicker/pure-function.ts

@@ -159,8 +159,8 @@ export function getHours(initial: number = 0, type: 'star' | 'end' = 'star'): Pi
   return arr;
 }
 /** 得到分钟或者秒 */
-export function getMinutesOrSeconds(initial: number = 1, type: 'star' | 'end' = 'star'): PickerData[] {
-  const star = type === 'star' ? initial : 1;
+export function getMinutesOrSeconds(initial: number = 0, type: 'star' | 'end' = 'star'): PickerData[] {
+  const star = type === 'star' ? initial : 0;
   const end = type === 'end' ? initial : 59;
   const arr: PickerData[] = createDate(star, end);
   return arr;

packages/core/src/Picker/index.tsx

@@ -48,6 +48,7 @@ export interface PickerProps {
   readonly?: boolean;
   /** value 改变时触发 */
   onChange?: (value: number) => unknown;
+  onScrollEnd?: () => void;
 }
 
 const Picker = (props: PickerProps) => {
@@ -60,6 +61,7 @@ const Picker = (props: PickerProps) => {
     value = 0,
     onChange,
     readonly = false,
+    onScrollEnd,
   } = props;
   const Y = useRef(new Animated.Value(0)).current;
   const scrollView = useRef<ScrollView>();
@@ -171,6 +173,10 @@ const Picker = (props: PickerProps) => {
     };
   }, [lines]);
 
+  const onMomentumScrollEnd = () => {
+    onScrollEnd?.();
+  };
+
   return (
     <View style={{ paddingVertical: 0, height: (style.containerHeight as number) * lines }}>
       <ScrollView
@@ -183,6 +189,7 @@ const Picker = (props: PickerProps) => {
           useNativeDriver: false,
         })}
         scrollEnabled={!readonly}
+        onMomentumScrollEnd={onMomentumScrollEnd}
       >
         {
           <Pressable

packages/core/src/TextArea/index.tsx

@@ -33,7 +33,7 @@ export interface TextAreaProps extends ViewProps {
   /** 是否禁用 */
   editable?: boolean;
   /** 文本域内容变化时触发 */
-  onChangeText?: (val: string) => void;
+  onChange?: (val: string) => void;
   /** 文本框中的文字内容 */
   value?: string;
   /** 是否展示字数 */
@@ -50,7 +50,7 @@ function TextArea(props: TextAreaProps) {
     placeholder = '',
     placeholderTextColor = '#989FB2',
     numberOfLines = 30,
-    onChangeText = () => {},
+    onChange = () => {},
     maxLength = 50,
     value = '',
     editable = true,
@@ -64,7 +64,7 @@ function TextArea(props: TextAreaProps) {
   const [defaultText, setDefaultText] = useState<string>('');
   const [height = 0, setHeight] = useState<number>(0);
 
-  const onChange = (event: NativeSyntheticEvent<TextInputChangeEventData>) => {
+  const onChangeValue = (event: NativeSyntheticEvent<TextInputChangeEventData>) => {
     if (autoSize) {
       setDefaultText(event.nativeEvent.text);
     }
@@ -87,8 +87,8 @@ function TextArea(props: TextAreaProps) {
           placeholderTextColor={placeholderTextColor}
           numberOfLines={numberOfLines}
           maxLength={maxLength}
-          onChangeText={onChangeText}
-          onChange={onChange}
+          onChangeText={onChange}
+          onChange={onChangeValue}
           onContentSizeChange={onContentSizeChange}
           editable={editable}
           value={value}