From 062c0505290cbb0b14c8db7c55e3768ba2630ba5 Mon Sep 17 00:00:00 2001 From: zhenyuWang <13641039885@163.com> Date: Mon, 26 Aug 2024 17:30:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(API):=20dialogPage=20=E8=A1=A5=E5=85=85=20?= =?UTF-8?q?eventBus=20=E7=A4=BA=E4=BE=8B=E5=8F=8A=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/API/dialog-page/dialog-1.uvue | 11 +- pages/API/dialog-page/dialog-page.test.js | 44 ++++--- pages/API/dialog-page/dialog-page.uvue | 150 ++++++++++++---------- 3 files changed, 122 insertions(+), 83 deletions(-) diff --git a/pages/API/dialog-page/dialog-1.uvue b/pages/API/dialog-page/dialog-1.uvue index d5464d8b..26270449 100644 --- a/pages/API/dialog-page/dialog-1.uvue +++ b/pages/API/dialog-page/dialog-1.uvue @@ -54,7 +54,15 @@ ) { // 自动化测试 setLifeCycleNum(state.lifeCycleNum + 1) - } + } + this.$dialogPage.$emit('fn1', {from: 'dialog1'}) + this.$dialogPage.$emit('fn2', null) + this.$dialogPage.$off('fn2') + this.$dialogPage.$emit('fn1', {from: 'dialog1'}) + this.$dialogPage.$emit('fn2', null) + this.$dialogPage.$emit('fnOnce', null) + this.$dialogPage.$emit('fnOnce', null) + }, onHide() { console.log('dialog 1 onHide') @@ -67,6 +75,7 @@ setLifeCycleNum(state.lifeCycleNum - 5) }, onBackPress(options : OnBackPressOptions) : boolean | null { + console.log('dialogPage1 onBackPress', options) // 自动化测试 setLifeCycleNum(state.lifeCycleNum + 1) return true diff --git a/pages/API/dialog-page/dialog-page.test.js b/pages/API/dialog-page/dialog-page.test.js index f902d49d..a8b4c88c 100644 --- a/pages/API/dialog-page/dialog-page.test.js +++ b/pages/API/dialog-page/dialog-page.test.js @@ -35,9 +35,10 @@ describe('dialog page', () => { expect(image).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') // 不应触发父页面的生命周期,应该触发: - // 1. openDialogPage sucess & complete callback + // 1. openDialogPage success & complete callback // 2. dialog page 生命周期 - expect(lifecycleNum).toBe(7) + expect(lifecycleNum).toBe(13) + await page.callMethod('setLifeCycleNum', 0) }); it('closeDialogPage', async () => { @@ -53,13 +54,15 @@ describe('dialog page', () => { // closeDialogPage success & complete callback 应被触发 // dialogPage onUnload 应被触发 lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(4) + expect(lifecycleNum).toBe(-3) + await page.callMethod('setLifeCycleNum', 0) }) it('openDialog with wrong path', async () => { await page.callMethod('openDialog1WrongPath') lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(1) + expect(lifecycleNum).toBe(-3) + await page.callMethod('setLifeCycleNum', 0) }) it('navigateTo nextPage & open Dialog', async () => { @@ -83,7 +86,8 @@ describe('dialog page', () => { }); expect(image).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(-3) + expect(lifecycleNum).toBe(-4) + await page.callMethod('setLifeCycleNum', 0) }) it('dialog1 navigateBack', async () => { @@ -101,7 +105,8 @@ describe('dialog page', () => { expect(image).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') // onBackPress 生命周期应该被触发 - expect(lifecycleNum).toBe(-2) + expect(lifecycleNum).toBe(1) + await page.callMethod('setLifeCycleNum', 0) }) it('open dialog2', async () => { @@ -112,7 +117,8 @@ describe('dialog page', () => { } lifecycleNum = await page.callMethod('getLifeCycleNum') // 应触发前一个 dialogPage 的 onHide - expect(lifecycleNum).toBe(2) + expect(lifecycleNum).toBe(4) + await page.callMethod('setLifeCycleNum', 0) }) it('closeDialogPage', async () => { @@ -120,7 +126,7 @@ describe('dialog page', () => { lifecycleNum = await page.callMethod('getLifeCycleNum') // 应触发 success & complete 回调 // 应触发 dialogPage 的 unload，下层的 dialogPage 会先 show 再 unload - expect(lifecycleNum).toBe(-5) + expect(lifecycleNum).toBe(-7) const image = await program.screenshot({ deviceShot: true, @@ -130,6 +136,7 @@ describe('dialog page', () => { } }); expect(image).toSaveImageSnapshot(); + await page.callMethod('setLifeCycleNum', 0) }) it('open multiple dialog page', async () => { @@ -147,7 +154,7 @@ describe('dialog page', () => { }); expect(image1).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(-1) + expect(lifecycleNum).toBe(4) await page.callMethod('openDialog2') await page.waitFor(1000) @@ -163,7 +170,8 @@ describe('dialog page', () => { }); expect(image2).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(3) + expect(lifecycleNum).toBe(8) + await page.callMethod('setLifeCycleNum', 0) }) it('openDialogPage to home page', async () => { @@ -173,7 +181,8 @@ describe('dialog page', () => { await page.waitFor(2000) } lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(7) + expect(lifecycleNum).toBe(4) + await page.callMethod('setLifeCycleNum', 0) }) it('dialog2 navigateBack', async () => { @@ -191,7 +200,8 @@ describe('dialog page', () => { expect(image).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') // onBackPress 生命周期应该被触发 - expect(lifecycleNum).toBe(9) + expect(lifecycleNum).toBe(2) + await page.callMethod('setLifeCycleNum', 0) }) it('close specified dialogPage', async () => { @@ -209,7 +219,7 @@ describe('dialog page', () => { }); expect(image1).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(13) + expect(lifecycleNum).toBe(4) await page.callMethod('openDialog1') await page.waitFor(1000) @@ -225,7 +235,7 @@ describe('dialog page', () => { }); expect(image2).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(19) + expect(lifecycleNum).toBe(16) await page.callMethod('closeSpecifiedDialog', 0) const image3 = await program.screenshot({ @@ -237,7 +247,7 @@ describe('dialog page', () => { }); expect(image3).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(16) + expect(lifecycleNum).toBe(13) await page.callMethod('closeSpecifiedDialog', 1) const image4 = await program.screenshot({ @@ -249,7 +259,7 @@ describe('dialog page', () => { }); expect(image4).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(14) + expect(lifecycleNum).toBe(11) await page.callMethod('closeSpecifiedDialog', 0) const image5 = await program.screenshot({ @@ -261,7 +271,7 @@ describe('dialog page', () => { }); expect(image5).toSaveImageSnapshot(); lifecycleNum = await page.callMethod('getLifeCycleNum') - expect(lifecycleNum).toBe(11) + expect(lifecycleNum).toBe(8) }) diff --git a/pages/API/dialog-page/dialog-page.uvue b/pages/API/dialog-page/dialog-page.uvue index b16ea811..6312b4f6 100644 --- a/pages/API/dialog-page/dialog-page.uvue +++ b/pages/API/dialog-page/dialog-page.uvue @@ -1,11 +1,11 @@ @@ -40,7 +40,7 @@ }) }, openDialog1() { - uni.openDialogPage({ + const dialogPage = uni.openDialogPage({ url: '/pages/API/dialog-page/dialog-1?name=dialog1', success(res) { console.log('openDialogPage1 success', res) @@ -56,28 +56,48 @@ // 自动化测试 setLifeCycleNum(state.lifeCycleNum + 1) } + })! + const fn1 = (options: any | null) => { + console.log('dialogPage1 be triggered fn1', options) + setLifeCycleNum(state.lifeCycleNum + 1) + } + const fn11 = (options: any | null) => { + console.log('dialogPage1 be triggered fn11', options) + setLifeCycleNum(state.lifeCycleNum + 1) + } + const fn2 = (options: any | null) => { + console.log('dialogPage1 be triggered fn2', options) + setLifeCycleNum(state.lifeCycleNum + 1) + } + const fnOnce = (options: any | null) => { + console.log('dialogPage1 be triggered fnOnce', options) + setLifeCycleNum(state.lifeCycleNum + 1) + } + dialogPage.$on('fn1', fn1) + dialogPage.$on('fn1', fn11) + dialogPage.$on('fn2', fn2) + dialogPage.$once('fnOnce', fnOnce) + }, + openDialog2() { + uni.openDialogPage({ + url: '/pages/API/dialog-page/dialog-2', + disableEscBack: true, + success(res) { + console.log('openDialog2 success', res) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum + 1) + }, + fail(err) { + console.log('openDialog2 fail', err) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum - 4) + }, + complete(res) { + console.log('openDialog2 complete', res) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum + 1) + } }) - }, - openDialog2() { - uni.openDialogPage({ - url: '/pages/API/dialog-page/dialog-2', - disableEscBack: true, - success(res) { - console.log('openDialog2 success', res) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum + 1) - }, - fail(err) { - console.log('openDialog2 fail', err) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum - 4) - }, - complete(res) { - console.log('openDialog2 complete', res) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum + 1) - } - }) }, openDialog1WrongPath() { uni.openDialogPage({ @@ -124,46 +144,46 @@ }, 1000) } }) - }, - closeDialog() { - uni.closeDialogPage({ - success(res) { - console.log('closeDialog success', res) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum + 1) - }, - fail(err) { - console.log('closeDialog fail', err) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum - 4) - }, - complete(res) { - console.log('closeDialog complete', res) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum + 1) - } - }) - }, - closeSpecifiedDialog(index: number) { - const dialogPages = this.$getDialogPages() - uni.closeDialogPage({ - dialogPage: dialogPages[index], - success(res) { - console.log('closeSomeOneDialog success', res) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum + 1) - }, - fail(err) { - console.log('closeSomeOneDialog fail', err) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum - 4) - }, - complete(res) { - console.log('closeSomeOneDialog complete', res) - // 自动化测试 - setLifeCycleNum(state.lifeCycleNum + 1) - } - }) + }, + closeDialog() { + uni.closeDialogPage({ + success(res) { + console.log('closeDialog success', res) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum + 1) + }, + fail(err) { + console.log('closeDialog fail', err) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum - 4) + }, + complete(res) { + console.log('closeDialog complete', res) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum + 1) + } + }) + }, + closeSpecifiedDialog(index: number) { + const dialogPages = this.$getDialogPages() + uni.closeDialogPage({ + dialogPage: dialogPages[index], + success(res) { + console.log('closeSomeOneDialog success', res) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum + 1) + }, + fail(err) { + console.log('closeSomeOneDialog fail', err) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum - 4) + }, + complete(res) { + console.log('closeSomeOneDialog complete', res) + // 自动化测试 + setLifeCycleNum(state.lifeCycleNum + 1) + } + }) }, setLifeCycleNum(value: number) { setLifeCycleNum(value) -- GitLab