Merge branch 'master' of https://gitcode.net/dcloud/hello-uni-app-x

App.vue

@@ -32,8 +32,15 @@ export default {
   onLastPageBackPress: function (): boolean | null {
     // 自动化测试
     setLifeCycleNum(state.lifeCycleNum - 1000)
+    console.log('App LastPageBackPress')
     return null
   },
+  methods: {
+    increasetLifeCycleNum() {
+      setLifeCycleNum(state.lifeCycleNum + 100)
+      console.log('App increasetLifeCycleNum')
+    }
+  }
 }
 </script>
 

pages/API/get-app/get-app.test.js

@@ -4,8 +4,9 @@ describe('getApp', () => {
   it('getApp', async () => {
     const page = await program.navigateTo(PAGE_PATH)
     await page.waitFor(1000)
-    await page.callMethod('_getApp')
-    const data = await page.data()
-    expect(data.checked).toBe(true)
+    const oldData = await page.data()
+    await page.callMethod('_increasetLifeCycleNum')
+    const newData = await page.data()
+    expect(newData.lifeCycleNum - oldData.lifeCycleNum).toBe(100)
   })
 })

pages/API/get-app/get-app.uvue

 <template>
   <view>
     <page-head title="getApp"></page-head>
-		<button @click="_getApp">getApp</button>
+    <view class="uni-padding-wrap">
+      <button @click="_increasetLifeCycleNum">increase lifeCycleNum</button>
+      <text class="uni-common-mt">lifeCycleNum: {{ lifeCycleNum }}</text>
+    </view>
   </view>
 </template>
-<script>
-	export default {
+<script lang="ts">
+import { state } from '@/store/index.uts'
+export default {
   data() {
     return {
-				checked: false
+      lifeCycleNum: 0,
     }
 	},
+	onReady() {
+		this.lifeCycleNum = state.lifeCycleNum
+	},
   methods: {
-      _getApp: function () {
-				// const app = getApp()
-				this.checked = true
-			}
-		}
-	}
+    _increasetLifeCycleNum: function () {
+      const app = getApp()
+      app.increasetLifeCycleNum()
+      this.lifeCycleNum = state.lifeCycleNum
+    },
+  },
+}
 </script>

pages/API/get-current-pages/get-current-pages.uvue

 <template>
   <view>
     <page-head title="getCurrentPages"></page-head>
+    <view class="uni-padding-wrap">
       <button @click="_getCurrentPages">getCurrentPages</button>
       <button class="uni-common-mt" @click="hideAndShow">页面隐藏并显示</button>
-    <view style="padding: 15px 10px">
-      <text>当前页面栈中 {{pages.length}} 个页面，列表如下：</text>
+      <view style="padding: 15px 0px">
+        <text>当前页面栈中 {{ pages.length }} 个页面，列表如下：</text>
         <template v-for="(page, index) in pages" :key="page.route">
           <text style="margin-top: 5px"
             >index: {{ index }}, route: {{ page.route }}</text
@@ -12,6 +13,7 @@
         </template>
       </view>
     </view>
+  </view>
 </template>
 <script>
 class Page {

pages/API/navigator/navigator.test.js

@@ -51,6 +51,36 @@ describe('navigator', () => {
     await page.waitFor(1000)
   })
 
+  it('navigateTo relative path', async () => {
+    await page.callMethod('setLifeCycleNum', 0)
+    await page.callMethod('navigateToRelativePath1')
+    page = await program.navigateBack()
+    await page.waitFor(1000)
+    lifeCycleNum = await page.callMethod('getLifeCycleNum')
+    expect(lifeCycleNum).toBe(2)
+    await page.waitFor(1000)
+  })
+
+  it('navigateTo relative path ./', async () => {
+    await page.callMethod('setLifeCycleNum', 0)
+    await page.callMethod('navigateToRelativePath2')
+    page = await program.navigateBack()
+    await page.waitFor(1000)
+    lifeCycleNum = await page.callMethod('getLifeCycleNum')
+    expect(lifeCycleNum).toBe(2)
+    await page.waitFor(1000)
+  })
+
+  it('navigateTo relative path ../', async () => {
+    await page.callMethod('setLifeCycleNum', 0)
+    await page.callMethod('navigateToRelativePath3')
+    page = await program.navigateBack()
+    await page.waitFor(1000)
+    lifeCycleNum = await page.callMethod('getLifeCycleNum')
+    expect(lifeCycleNum).toBe(2)
+    await page.waitFor(1000)
+  })
+
   it('navigateBack', async () => {
     await page.callMethod('setLifeCycleNum', 0)
     await page.callMethod('navigateBack')

pages/API/navigator/navigator.uvue

@@ -175,6 +175,51 @@ export default {
         },
       })
     },
+    // 自动化测试
+    navigateToRelativePath1() {
+      uni.navigateTo({
+        url: 'new-page/new-page-1?data=new-page/new-page-1',
+        success() {
+          setLifeCycleNum(state.lifeCycleNum + 1)
+        },
+        fail() {
+          setLifeCycleNum(state.lifeCycleNum - 1)
+        },
+        complete() {
+          setLifeCycleNum(state.lifeCycleNum + 1)
+        },
+      })
+    },
+    // 自动化测试
+    navigateToRelativePath2() {
+      uni.navigateTo({
+        url: './new-page/new-page-1?data=./new-page/new-page-1',
+        success() {
+          setLifeCycleNum(state.lifeCycleNum + 1)
+        },
+        fail() {
+          setLifeCycleNum(state.lifeCycleNum - 1)
+        },
+        complete() {
+          setLifeCycleNum(state.lifeCycleNum + 1)
+        },
+      })
+    },
+    // 自动化测试
+    navigateToRelativePath3() {
+      uni.navigateTo({
+        url: '../navigator/new-page/new-page-1?data=../navigator/new-page/new-page-1',
+        success() {
+          setLifeCycleNum(state.lifeCycleNum + 1)
+        },
+        fail() {
+          setLifeCycleNum(state.lifeCycleNum - 1)
+        },
+        complete() {
+          setLifeCycleNum(state.lifeCycleNum + 1)
+        },
+      })
+    },
     navigateBack() {
       uni.navigateBack({
         success(result) {

pages/tabBar/API.uvue

@@ -51,7 +51,6 @@
                     {
 				            name: "getApp",
                             url: "get-app",
-                            enable: false
                         },
                         {
 				            name: "getCurrentPages",