@gm-mobile/c-react 3.12.7-beta.7 → 3.12.8-beta.1

package/package.json

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

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/dialog/common/choose.tsx

@@ -27,6 +27,8 @@ export interface ChooseProps {
   /** 高度 */
   height?: string
   onCancel?: () => void
+  /** 自定义z-index */
+  zIndex?: number
 }
 
 /** 底部弹出的选择界面 */
@@ -39,6 +41,7 @@ export default function ({
   maxHeight = '50vh',
   height,
   onCancel,
+  zIndex,
 }: ChooseProps) {
   if (multiSelect) needConfirm = true
   const selected = [...defaultSelected] as Item[]
@@ -97,6 +100,7 @@ export default function ({
   })
   const promise = showDialog<Item[]>({
     title,
+    zIndex,
     children: <Children />,
     onOk: () => selected,
     onCancel: onCancel,

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 {