diff --git a/components/CompositionAPILifecycle.uvue b/components/CompositionAPILifecycle.uvue deleted file mode 100644 index 9fdb92d669b861977277eb0d12954b8576d5bd23..0000000000000000000000000000000000000000 --- a/components/CompositionAPILifecycle.uvue +++ /dev/null @@ -1,101 +0,0 @@ - - - \ No newline at end of file diff --git a/pages.json b/pages.json index 638ce0e873793418b9b46af40161a2d50d4392ab..0df3db28ac82d926e63c0a8dd180a4ce4456abdc 100644 --- a/pages.json +++ b/pages.json @@ -292,9 +292,17 @@ } }, { - "path": "pages/lifecycle/component/component", + "path": "pages/lifecycle/component/component-options", "style": { - "navigationBarTitleText": "component-lifecycle" + "navigationBarTitleText": "component-lifecycle 选项式 API", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/lifecycle/component/component-composition", + "style": { + "navigationBarTitleText": "component-lifecycle 组合式 API", + "enablePullDownRefresh": true } }, { @@ -759,20 +767,6 @@ "navigationBarTitleText": "onScopeDispose" } }, - { - "path": "pages/composition-api/lifecycle/page-lifecycle/page-lifecycle", - "style": { - "navigationBarTitleText": "页面生命周期", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/composition-api/lifecycle/component-lifecycle/component-lifecycle", - "style": { - "navigationBarTitleText": "组件生命周期", - "enablePullDownRefresh": true - } - }, { "path": "pages/composition-api/dependency-injection/provide/provide", "style": { diff --git a/pages/composition-api/lifecycle/page-lifecycle/page-lifecycle.test.js b/pages/composition-api/lifecycle/page-lifecycle/page-lifecycle.test.js deleted file mode 100644 index d250afbf21aa4faf118253f523f8a92341a650f9..0000000000000000000000000000000000000000 --- a/pages/composition-api/lifecycle/page-lifecycle/page-lifecycle.test.js +++ /dev/null @@ -1,71 +0,0 @@ -const PAGE_PATH = '/pages/composition-api/lifecycle/page-lifecycle/page-lifecycle' -const HOME_PATH = '/pages/tab-bar/options-api' -const INTER_PAGE_PATH = '/pages/app-instance/index/index' -let page -let lifeCycleNum - -describe('page-lifecycle', () => { - beforeAll(async () => { - page = await program.reLaunch(HOME_PATH) - await page.waitFor(700) - await page.callMethod('setLifeCycleNum', 0) - }); - afterAll(async () => { - const resetLifecycleNum = 1100 - await page.callMethod('setLifeCycleNum', resetLifecycleNum) - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(resetLifecycleNum) - }) - - it('onLoad onShow onReady onResize', async () => { - page = await program.reLaunch(PAGE_PATH) - await page.waitFor(700) - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(120) - await page.callMethod('pageSetLifeCycleNum', 0) - }) - it('onPullDownRefresh', async () => { - await page.callMethod('pullDownRefresh') - await page.waitFor(1500) - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(10) - await page.callMethod('pageSetLifeCycleNum', 0) - }) - it('onPageScroll onReachBottom', async () => { - await program.pageScrollTo(2000) - await page.waitFor(1000) - const isScrolled = await page.callMethod('getIsScrolled') - expect(isScrolled).toBe(true) - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(10) - await page.callMethod('pageSetLifeCycleNum', 0) - }) - it('onHide', async () => { - page = await program.navigateTo(INTER_PAGE_PATH) - await page.waitFor('view') - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(-10) - page = await program.navigateBack() - await page.waitFor('view') - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(0) - }) - it('onUnload', async () => { - page = await program.reLaunch(HOME_PATH) - await page.waitFor(700) - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(-100) - await page.callMethod('setLifeCycleNum', 0) - }) - it('onBackPress', async () => { - page = await program.navigateTo(PAGE_PATH) - await page.waitFor(700) - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(120) - page = await program.navigateBack() - await page.waitFor('view') - lifeCycleNum = await page.callMethod('getLifeCycleNum') - expect(lifeCycleNum).toBe(10) - await page.callMethod('setLifeCycleNum', 0) - }) -}) \ No newline at end of file diff --git a/pages/composition-api/lifecycle/page-lifecycle/page-lifecycle.uvue b/pages/composition-api/lifecycle/page-lifecycle/page-lifecycle.uvue deleted file mode 100644 index 8a2197eb533fdc904de004bf970adf8991ec7718..0000000000000000000000000000000000000000 --- a/pages/composition-api/lifecycle/page-lifecycle/page-lifecycle.uvue +++ /dev/null @@ -1,105 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/index.uvue b/pages/index/index.uvue index 2ab0f3cf96a0b4b03369944c09927ddfebbd74a0..7f996d033243123cc2dee95a9c5345dd15e77e77 100644 --- a/pages/index/index.uvue +++ b/pages/index/index.uvue @@ -4,10 +4,22 @@ - + - - {{ page.name }} + + {{ page.name }}