@gm-mobile/mp 3.9.3-beta.13 → 3.9.3-beta.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/component/page/base.tsx +12 -6
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gm-mobile/mp",
|
|
3
|
-
"version": "3.9.3-beta.
|
|
3
|
+
"version": "3.9.3-beta.17",
|
|
4
4
|
"description": "",
|
|
5
5
|
"author": "liyatang <liyatang@qq.com>",
|
|
6
6
|
"homepage": "https://github.com/gmfe/gm-mobile#readme",
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
"url": "https://github.com/gmfe/gm-mobile/issues"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@gm-mobile/c-react": "^3.9.3-beta.
|
|
25
|
-
"@gm-mobile/c-tool": "^3.9.3-beta.
|
|
26
|
-
"@gm-mobile/locales": "^3.9.3-beta.
|
|
24
|
+
"@gm-mobile/c-react": "^3.9.3-beta.17",
|
|
25
|
+
"@gm-mobile/c-tool": "^3.9.3-beta.17",
|
|
26
|
+
"@gm-mobile/locales": "^3.9.3-beta.17"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
29
29
|
"@tarojs/components": "3.0.18",
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"prop-types": "^15.7.2",
|
|
34
34
|
"react": "^16.13.1"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "e78a422ee30327fbfd97136029423ba39c42c613"
|
|
37
37
|
}
|
|
@@ -14,6 +14,8 @@ interface PageProps extends HtmlHTMLAttributes<HTMLDivElement> {
|
|
|
14
14
|
top?: ReactNode
|
|
15
15
|
/** bottom位置自带底部安全边距，不需要和safeBottom同时使用 */
|
|
16
16
|
bottom?: ReactNode
|
|
17
|
+
/** 左侧内容 */
|
|
18
|
+
left?: ReactNode
|
|
17
19
|
pageClassName?: string
|
|
18
20
|
pageStyle?: CSSProperties
|
|
19
21
|
/** 底部安全区域 */
|
|
@@ -32,6 +34,7 @@ const Page: FC<PageProps> = ({
|
|
|
32
34
|
tabbar,
|
|
33
35
|
top,
|
|
34
36
|
bottom,
|
|
37
|
+
left,
|
|
35
38
|
children,
|
|
36
39
|
className,
|
|
37
40
|
pageClassName,
|
|
@@ -76,12 +79,15 @@ const Page: FC<PageProps> = ({
|
|
|
76
79
|
</Flex>
|
|
77
80
|
)}
|
|
78
81
|
{top && <View className='m-top m-flex-none'>{top}</View>}
|
|
79
|
-
<
|
|
80
|
-
className=
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
<Flex auto className='m-page-wrapper'>
|
|
83
|
+
<View className='m-page-side'>{left}</View>
|
|
84
|
+
<View
|
|
85
|
+
className={classNames('m-page-content', pageClassName)}
|
|
86
|
+
style={pageStyle}
|
|
87
|
+
>
|
|
88
|
+
{children}
|
|
89
|
+
</View>
|
|
90
|
+
</Flex>
|
|
85
91
|
{bottom && (
|
|
86
92
|
<SafeBottomMP className='m-bottom m-flex-none'>
|
|
87
93
|
{bottom}
|