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 @@
-
- title: {{ title }}
-
-
-
-
\ 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 @@
-
-
-
-
-
- page lifecycle
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
@@ -303,6 +318,22 @@ export default {
url: 'page-composition'
}
]
+ }, {
+ id: 'component',
+ name: '组件生命周期',
+ children: [
+ {
+ id: 'component-options',
+ name: '组件生命周期 选项式 API',
+ url: 'component-options'
+ },
+
+ {
+ id: 'component-composition',
+ name: '组件生命周期 组合式 API',
+ url: 'component-composition'
+ }
+ ]
}
] as Page[]
},
@@ -510,4 +541,4 @@ export default {
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/lifecycle/component/ChildComponentComposition.uvue b/pages/lifecycle/component/ChildComponentComposition.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..02fc3971df6bf9999b41fd0b88b5fdd153657c26
--- /dev/null
+++ b/pages/lifecycle/component/ChildComponentComposition.uvue
@@ -0,0 +1,101 @@
+
+ title: {{ title }}
+
+
+
+
diff --git a/components/OptionsAPILifecycle.uvue b/pages/lifecycle/component/ChildComponentOptions.uvue
similarity index 87%
rename from components/OptionsAPILifecycle.uvue
rename to pages/lifecycle/component/ChildComponentOptions.uvue
index 9a1e385b2b982280e8240f16f2e572b52939b316..9e42bf61649505cd1ca33d5a3fb7c0c5e04a48b5 100644
--- a/components/OptionsAPILifecycle.uvue
+++ b/pages/lifecycle/component/ChildComponentOptions.uvue
@@ -1,12 +1,12 @@
title: {{ title }}
-
-
+
+
+ component lifecycle 选项式 API
+
+
+
+
+
diff --git a/pages/lifecycle/page/page-composition.uvue b/pages/lifecycle/page/page-composition.uvue
index 7180fd99d676eb34553f24c1c2ab75bf755eb40a..50777e2c204c26d4f1c65233b4de2ac4a8a8107a 100644
--- a/pages/lifecycle/page/page-composition.uvue
+++ b/pages/lifecycle/page/page-composition.uvue
@@ -3,7 +3,7 @@
- page lifecycle
+ page lifecycle 组合式 API
scrollToBottom
@@ -18,11 +18,11 @@
type DataInfo = {
isScrolled : boolean
}
- const dataInfo = reactive({
- isScrolled: false,
+ const dataInfo = reactive({
+ isScrolled: false,
} as DataInfo)
- onLoad((_ : OnLoadOptions) => {
+ onLoad((_ : OnLoadOptions) => {
// 自动化测试
setLifeCycleNum(state.lifeCycleNum + 100)
})
@@ -39,7 +39,7 @@
setLifeCycleNum(state.lifeCycleNum + 10)
})
onPageScroll((_) => {
- // 自动化测试
+ // 自动化测试
dataInfo.isScrolled = true
})
onReachBottom(() => {
@@ -65,9 +65,9 @@
})
// 自动化测试
- const pageGetLifeCycleNum = () : number => {
+ const pageGetLifeCycleNum = () : number => {
return state.lifeCycleNum
- }
+ }
// 自动化测试
const pageSetLifeCycleNum = (num : number) => {
setLifeCycleNum(num)
@@ -90,7 +90,7 @@
})
}
- defineExpose({
+ defineExpose({
dataInfo,
pageGetLifeCycleNum,
pageSetLifeCycleNum,
diff --git a/pages/lifecycle/page/page-options.uvue b/pages/lifecycle/page/page-options.uvue
index f5e079348caaddfb7c46aa9868a2fa2f9e42ac9f..07c9ecb0ec3cef4ee8dd59e34c24b4e66b9f096e 100644
--- a/pages/lifecycle/page/page-options.uvue
+++ b/pages/lifecycle/page/page-options.uvue
@@ -3,7 +3,7 @@
- page lifecycle
+ page lifecycle 选项式 API
scrollToBottom