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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.12.7-beta.6",
+  "version": "3.12.8-beta.0",
   "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.6",
-    "@gm-mobile/c-tool": "^3.12.7-beta.6",
-    "@gm-mobile/locales": "^3.12.7-beta.6",
+    "@gm-mobile/c-font": "^3.12.8-beta.0",
+    "@gm-mobile/c-tool": "^3.12.8-beta.0",
+    "@gm-mobile/locales": "^3.12.8-beta.0",
     "dayjs": "^1.11.6"
   },
   "peerDependencies": {
@@ -34,5 +34,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "7dafd80614346aa8042857377dd30d2a90e60e72"
+  "gitHead": "b2f7e90ea8591c56f4d24192c39e663d6afea923"
 }

package/src/component/calendar/months_list.tsx

@@ -9,7 +9,7 @@ import { MonthListProps } from './types'
 import usePreviousObject from './use_previous'
 
 // 目前只支持固定高度，定为265
-const MONTH_HEIGHT = 265
+const MONTH_HEIGHT = 285
 
 function whichValueChanged(
   prevArray: [Dayjs, Dayjs],
@@ -46,6 +46,7 @@ const MonthsList: FC<MonthListProps> = ({
   disabledDate,
   showDateLabel,
   canScrollWhenMaxOrMinChange = false,
+  itemHeight = MONTH_HEIGHT,
 }) => {
   const refList = useRef<VListRef>(null)
   const previous = usePreviousObject(selected)
@@ -132,7 +133,7 @@ const MonthsList: FC<MonthListProps> = ({
       className='m-calendar-content'
       data={monthsList}
       height={height}
-      itemHeight={MONTH_HEIGHT}
+      itemHeight={itemHeight}
       distance={0}
       renderItem={(month: { item: Dayjs; index: number }) => {
         return (

package/src/component/calendar/types.ts

@@ -32,6 +32,7 @@ interface MonthProps {
 interface MonthListProps extends Omit<MonthProps, 'currentMoment'> {
   height: number
   canScrollWhenMaxOrMinChange?: boolean
+  itemHeight?: number
 }
 
 interface BaseCalendarProps

package/src/component/dialog/common/base.tsx

@@ -14,6 +14,7 @@ interface Option<T> {
   children: ReactNode
   /** 将取代保存(onOk)按钮 */
   bottom?: ReactNode
+  zIndex?: number
   /** 入场方向 */
   direction?: 'left' | 'right' | 'bottom' | 'top'
   /** 点击确定按钮后的事件，返回值将作为showDialog的返回值 */
@@ -23,6 +24,7 @@ interface Option<T> {
 
 export function showDialog<T>({
   title,
+  zIndex,
   okText = '确定',
   cancelText = '取消',
   left,
@@ -95,6 +97,7 @@ export function showDialog<T>({
     }
 
     Popup.render({
+      zIndex,
       disabledHeader: true,
       [direction]: true,
       disabledAnimate: false,

package/src/component/popup/popup.tsx

@@ -35,6 +35,7 @@ const PopupBase: FC<PopupProps> = ({
   isPickPopup,
   disabledHeader,
   disabledMask,
+  zIndex,
   /** 动画有卡顿现象，先禁用 */
   disabledAnimate = true,
   children,
@@ -77,8 +78,13 @@ const PopupBase: FC<PopupProps> = ({
         'm-popup-picker-container': isPickPopup,
       })}
     >
-      {!disabledMask && <Mask opacity={opacity} onClick={onHide} />}
-      <View {...rest} className={cn} style={s}>
+      {!disabledMask && <Mask opacity={opacity} onClick={onHide} style={{
+        zIndex: zIndex,
+      }} />}
+      <View {...rest} className={cn} style={{
+        ...s,
+        zIndex: zIndex ? zIndex + 1 : undefined,
+      }}>
         {!disabledHeader && (
           <Flex justifyBetween alignCenter className='m-popup-top'>
             <Flex flex column className='m-padding-left-15 m-text-16'>

package/src/component/popup/types.ts

@@ -23,6 +23,7 @@ interface PopupProps extends HTMLAttributes<HTMLDivElement> {
   disableBottomSafeArea?: boolean
   /** 预留底部自定义导航高度,默认为true */
   hasCustomTab?: boolean
+  zIndex?: number
 }
 
 interface PopupStaticsTypes {