fix(calendarcard): 修复受控模式 (jdf2e#2063)

* fix(calendarcard): 修复受控模式

* fix(calendarcard): 修复受控模式

Author: eiinu

src/packages/calendarcard/calendarcard.taro.tsx

@@ -11,6 +11,7 @@ import {
 } from './utils'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
 import { CalendarCardDay, CalendarCardMonth, CalendarCardValue } from './types'
+import { usePropsValue } from '@/utils/use-props-value'
 
 export interface CalendarCardProps extends BasicComponent {
   // 日视图-选择一个日期 | 日视图-选择多个日期 | 日视图-选择范围 | 周视图-选择某一周
@@ -102,20 +103,14 @@ export const CalendarCard = React.forwardRef<
     return range ? [convertDayToDate(range)] : []
   }
 
-  const [innerValue, setInnerValue] = useState<CalendarCardDay[]>(() => {
-    const val = (
-      value || defaultValue ? valueToRange(value || defaultValue) : []
-    ) as CalendarCardDay[]
-    return val
+  const [innerValue, setInnerValue] = usePropsValue<CalendarCardDay[]>({
+    value: value ? (valueToRange(value) as CalendarCardDay[]) : undefined,
+    defaultValue: defaultValue
+      ? (valueToRange(defaultValue) as CalendarCardDay[])
+      : undefined,
+    finalValue: [],
   })
 
-  useEffect(() => {
-    const val = (
-      value || defaultValue ? valueToRange(value || defaultValue) : []
-    ) as CalendarCardDay[]
-    setInnerValue(val)
-  }, [value])
-
   const change = (v: CalendarCardDay[]) => {
     setInnerValue(v)
     if (type === 'single') {

src/packages/calendarcard/calendarcard.tsx

@@ -11,6 +11,7 @@ import {
 } from './utils'
 import { useConfig } from '@/packages/configprovider/configprovider'
 import { CalendarCardDay, CalendarCardMonth, CalendarCardValue } from './types'
+import { usePropsValue } from '@/utils/use-props-value'
 
 export interface CalendarCardProps extends BasicComponent {
   // 日视图-选择一个日期 | 日视图-选择多个日期 | 日视图-选择范围 | 周视图-选择某一周
@@ -102,20 +103,14 @@ export const CalendarCard = React.forwardRef<
     return range ? [convertDayToDate(range)] : []
   }
 
-  const [innerValue, setInnerValue] = useState<CalendarCardDay[]>(() => {
-    const val = (
-      value || defaultValue ? valueToRange(value || defaultValue) : []
-    ) as CalendarCardDay[]
-    return val
+  const [innerValue, setInnerValue] = usePropsValue<CalendarCardDay[]>({
+    value: value ? (valueToRange(value) as CalendarCardDay[]) : undefined,
+    defaultValue: defaultValue
+      ? (valueToRange(defaultValue) as CalendarCardDay[])
+      : undefined,
+    finalValue: [],
   })
 
-  useEffect(() => {
-    const val = (
-      value || defaultValue ? valueToRange(value || defaultValue) : []
-    ) as CalendarCardDay[]
-    setInnerValue(val)
-  }, [value])
-
   const change = (v: CalendarCardDay[]) => {
     setInnerValue(v)
     if (type === 'single') {