@gm-mobile/mp 3.9.3 → 3.9.4-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/mp",
-  "version": "3.9.3",
+  "version": "3.9.4-alpha.2",
   "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-react": "^3.9.3",
-    "@gm-mobile/c-tool": "^3.9.3",
-    "@gm-mobile/locales": "^3.9.3"
+    "@gm-mobile/c-react": "^3.9.4-alpha.2",
+    "@gm-mobile/c-tool": "^3.9.4-alpha.2",
+    "@gm-mobile/locales": "^3.9.4-alpha.2"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "1f1d2b656046efe6479f05f9fde2e34cb99df4de"
+  "gitHead": "cbed3b0f5f17996f4fa6ab7c5e0ed3a75dfbf2f9"
 }

package/src/component/page/page.tsx

@@ -1,18 +1,11 @@
-import React, {
-  useEffect,
-  useRef,
-  FC,
-  useState,
-  ReactNode,
-  CSSProperties,
-} from 'react'
+import React, { useEffect, useRef, FC, useState, CSSProperties } from 'react'
 import { Flex, LayoutRoot, LayoutRootV1, Loading } from '@gm-mobile/c-react'
 import { ScrollView, View } from '@tarojs/components'
 import PageBase, { PageProps } from './base'
 import { pxTransform } from '@tarojs/taro'
 
 interface PageMPProps extends PageProps {
-  /** 最大宽度，默认480(ipad)，对ipad设备做居中变窄处理，设置1025(iPad pro 12.9 inch)可以跳过处理 */
+  /** 最大宽度，对超过最大宽度的页面做做居中变窄处理 */
   maxWidth?: number
   onRefresh?: () => Promise<any>
   /** 上滑加载更多事件。如果promise返回一个空数组，表示没有更多了 */
@@ -21,7 +14,7 @@ interface PageMPProps extends PageProps {
 
 const PageMP: FC<PageMPProps> = ({
   children,
-  maxWidth = 480,
+  maxWidth = 2048,
   onRefresh,
   onLoadMore,
   style,
@@ -158,3 +151,16 @@ const PageMP: FC<PageMPProps> = ({
 
 export default PageMP
 export type { PageMPProps }
+
+/** 适配后的高度，考虑ipad 大屏裁剪宽度后的比例 */
+export function calcPageHeightWithMaxWidth(maxWidth = 480) {
+  const { screenWidth } = wx.getSystemInfoSync()
+  const transformRatio = maxWidth / screenWidth
+  return `calc(100vh / ${transformRatio})`
+}
+
+export function calcPageWidthWithMaxWidth(maxWidth = 800) {
+  const { screenWidth } = wx.getSystemInfoSync()
+  const transformRatio = maxWidth / screenWidth
+  return `calc(100vw / ${transformRatio})`
+}