@gm-mobile/c-react 3.12.7-beta.4 → 3.12.7-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.12.7-beta.4",
+  "version": "3.12.7-beta.6",
   "description": "> TODO: description",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
     "url": "https://github.com/gmfe/gm-mobile/issues"
   },
   "dependencies": {
-    "@gm-mobile/c-font": "^3.12.7-beta.4",
-    "@gm-mobile/c-tool": "^3.12.7-beta.4",
-    "@gm-mobile/locales": "^3.12.7-beta.4",
+    "@gm-mobile/c-font": "^3.12.7-beta.6",
+    "@gm-mobile/c-tool": "^3.12.7-beta.6",
+    "@gm-mobile/locales": "^3.12.7-beta.6",
     "dayjs": "^1.11.6"
   },
   "peerDependencies": {
@@ -34,5 +34,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "b139541489e14038c41f4bd943beb3334f375235"
+  "gitHead": "7dafd80614346aa8042857377dd30d2a90e60e72"
 }

package/src/component/action_sheet/{index.weapp.tsx → index1.weapp.tsx}

@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import { ActionSheetProps } from './type'
 
+/** 没用了吧 */
 const ActionSheet: ActionSheetProps = {
   render({ data }) {
     return new Promise((resolve, reject) => {

package/src/component/calendar/months_list.tsx

@@ -80,6 +80,9 @@ const MonthsList: FC<MonthListProps> = ({
   const monthsList = computedMonthList()
 
   const scrollToTarget = (flag: boolean) => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current)
+    }
     if (selected.length) {
       const date = type === CALENDAR_TYPE.RANGE ? selected[1] : selected[0]
       const targetId = _.findIndex(
@@ -89,13 +92,9 @@ const MonthsList: FC<MonthListProps> = ({
           moment(item).month() === moment(date).month()
       )
 
-      if (flag) {
-        setTimeout(() => {
-          refList.current && refList.current.apiDoScrollToKey(targetId)
-        }, 200)
-      } else {
+      timeoutRef.current = setTimeout(() => {
         refList.current && refList.current.apiDoScrollToKey(targetId)
-      }
+      }, 200)
     }
   }
 
@@ -111,8 +110,8 @@ const MonthsList: FC<MonthListProps> = ({
       clearTimeout(timeoutRef.current)
     }
     if (max || min) {
-      const flagItem = whichValueChanged(previous as any, selected as any)
-      const date = selected[flagItem]
+      const date = selected[0]
+
       const targetId = _.findIndex(
         monthsList,
         (item) =>
@@ -120,12 +119,12 @@ const MonthsList: FC<MonthListProps> = ({
           moment(item).month() === moment(date).month()
       )
       if (targetId !== -1) {
-        timeoutRef.current = setTimeout(() => {
+        setTimeout(() => {
           refList.current && refList.current.apiDoScrollToKey(targetId)
         }, 200)
       }
     }
-  }, [max, min])
+  }, [max, min, monthsList])
 
   return (
     <VList