forked from NervJS/taro
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '58/harmony-hybrid-3.6.29' into f-fix-exit-kxj
- Loading branch information
Showing
105 changed files
with
470 additions
and
720 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/detail/index.config.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| export default { | ||
| navigationBarTitleText: '混合路由：小程序首页', | ||
| enablePullDownRefresh: false, | ||
| backgroundTextStyle: 'dark', | ||
| onReachBottomDistance: 50, | ||
| pageOrientation: 'auto', | ||
| } |
16 changes: 16 additions & 0 deletions
16
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/detail/index.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| @import "@/styles/variables.scss"; | ||
|
|
||
| .container { | ||
| width: 100%; | ||
| height: 100%; | ||
| background-color: #E6FFCC; | ||
| } | ||
|
|
||
| .title { | ||
| font-size: 40px; | ||
| margin-top: 20px; | ||
| margin-bottom: 20px; | ||
| width: 100%; | ||
| text-align: center; | ||
| display: block; | ||
| } |
31 changes: 31 additions & 0 deletions
31
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/detail/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import React from 'react' | ||
| import { View, Button, Text } from '@tarojs/components' | ||
| import './index.scss' | ||
| import Taro from "@tarojs/taro"; | ||
| export default class Index extends React.Component { | ||
| state = { | ||
| // syncSingleResult: '', | ||
| // requestSingleResult: '', | ||
| // requestConcurrentResult: '', | ||
| // requestHignConcurrentResult: '', | ||
| // syncResult: '', | ||
| // requestByJsResult: '' | ||
| } | ||
|
|
||
| render() { | ||
| // const { syncSingleResult } = this.state | ||
| return ( | ||
| <View className='container'> | ||
| <Text className='title'> | ||
| 混合路由测试场景：小程序详情页 | ||
| </Text> | ||
| <Button | ||
| onClick={()=>{ | ||
| Taro.navigateBack() | ||
| }}> | ||
| 小程序端：返回 | ||
| </Button> | ||
| </View> | ||
| ) | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/home/index.config.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| export default { | ||
| navigationBarTitleText: '混合路由：小程序首页', | ||
| enablePullDownRefresh: false, | ||
| backgroundTextStyle: 'dark', | ||
| onReachBottomDistance: 50, | ||
| pageOrientation: 'auto', | ||
| } |
16 changes: 16 additions & 0 deletions
16
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/home/index.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| @import "@/styles/variables.scss"; | ||
|
|
||
| .container { | ||
| width: 100%; | ||
| height: 100%; | ||
| background-color: #FFCCCC; | ||
| } | ||
|
|
||
| .title { | ||
| font-size: 40px; | ||
| margin-top: 20px; | ||
| margin-bottom: 20px; | ||
| width: 100%; | ||
| text-align: center; | ||
| display: block; | ||
| } |
42 changes: 42 additions & 0 deletions
42
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/home/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import React from 'react' | ||
| import { View, Button, Text } from '@tarojs/components' | ||
| import './index.scss' | ||
| import Taro from "@tarojs/taro"; | ||
| import nativeApi from "@/util/nativeApi"; | ||
| export default class Index extends React.Component { | ||
| state = { | ||
| // syncSingleResult: '', | ||
| // requestSingleResult: '', | ||
| // requestConcurrentResult: '', | ||
| // requestHignConcurrentResult: '', | ||
| // syncResult: '', | ||
| // requestByJsResult: '' | ||
| } | ||
|
|
||
| render() { | ||
| // const { syncSingleResult } = this.state | ||
| return ( | ||
| <View className='container'> | ||
| <Text className='title'> | ||
| 混合路由测试场景：小程序首页 | ||
| </Text> | ||
| <Button | ||
| onClick={()=>{ | ||
| Taro.navigateTo({ | ||
| url: 'pages/harmony-hybrid/mix-router/list/index' | ||
| }) | ||
| }}> | ||
| 跳转：小程序列表页 | ||
| </Button> | ||
| <Button | ||
| onClick={()=>{ | ||
| nativeApi.navigateToNative({ | ||
| url: 'pages/NativeList' | ||
| }) | ||
| }}> | ||
| 跳转：原生列表页 | ||
| </Button> | ||
| </View> | ||
| ) | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/list/index.config.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| export default { | ||
| navigationBarTitleText: '混合路由：小程序列表页', | ||
| enablePullDownRefresh: false, | ||
| backgroundTextStyle: 'dark', | ||
| onReachBottomDistance: 50, | ||
| pageOrientation: 'auto', | ||
| } |
10 changes: 10 additions & 0 deletions
10
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/list/index.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| @import "@/styles/variables.scss"; | ||
|
|
||
| .title { | ||
| font-size: 40px; | ||
| margin-top: 20px; | ||
| margin-bottom: 20px; | ||
| width: 100%; | ||
| text-align: center; | ||
| display: block; | ||
| } |
33 changes: 33 additions & 0 deletions
33
examples/mini-program-example/src/pages/harmony-hybrid/mix-router/list/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import React from 'react' | ||
| import { View, Button, Text } from '@tarojs/components' | ||
| import './index.scss' | ||
| import Taro from "@tarojs/taro"; | ||
| export default class Index extends React.Component { | ||
| state = { | ||
| // syncSingleResult: '', | ||
| // requestSingleResult: '', | ||
| // requestConcurrentResult: '', | ||
| // requestHignConcurrentResult: '', | ||
| // syncResult: '', | ||
| // requestByJsResult: '' | ||
| } | ||
|
|
||
| render() { | ||
| // const { syncSingleResult } = this.state | ||
| return ( | ||
| <View className='harmony-hybrid-page'> | ||
| <Text className='title'> | ||
| 混合路由测试场景：小程序列表页 | ||
| </Text> | ||
| <Button | ||
| onClick={()=>{ | ||
| Taro.navigateTo({ | ||
| url: 'pages/harmony-hybrid/mix-router/detail/index' | ||
| }) | ||
| }}> | ||
| 跳转：小程序详情页 | ||
| </Button> | ||
| </View> | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "babel-preset-taro", | ||
| "version": "3.6.29-harmony-hybrid-alpha.31", | ||
| "version": "3.6.29-harmony-hybrid-alpha.34", | ||
| "description": "Taro babel preset", | ||
| "author": "yuche <[email protected]>", | ||
| "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@tarojs/create-app", | ||
| "version": "3.6.29-harmony-hybrid-alpha.31", | ||
| "version": "3.6.29-harmony-hybrid-alpha.34", | ||
| "description": "create taro app with one command", | ||
| "author": "VincentW <[email protected]>", | ||
| "homepage": "https://github.com/nervjs/taro/tree/master/packages/create-app#readme", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.