From 59272f7ea5b88b4935403202f973a436f5d889e4 Mon Sep 17 00:00:00 2001 From: txazo Date: Wed, 15 Jan 2025 14:17:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?AsWeb=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9Ene?= =?UTF-8?q?stedScroll=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: txazo --- atomicserviceweb/interfaces/atomicserviceweb.js | 15 ++++++++++++++- atomicserviceweb/source/atomicserviceweb.ets | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/atomicserviceweb/interfaces/atomicserviceweb.js b/atomicserviceweb/interfaces/atomicserviceweb.js index 232beec..0b69641 100644 --- a/atomicserviceweb/interfaces/atomicserviceweb.js +++ b/atomicserviceweb/interfaces/atomicserviceweb.js @@ -125,6 +125,7 @@ export class AtomicServiceWeb extends ViewPU { this.__mixedMode = new SynchedPropertySimpleOneWayPU(t10.mixedMode, this, "mixedMode"); this.__darkMode = new SynchedPropertySimpleOneWayPU(t10.darkMode, this, "darkMode"); this.__forceDarkAccess = new SynchedPropertySimpleOneWayPU(t10.forceDarkAccess, this, "forceDarkAccess"); + this.__nestedScroll = new SynchedPropertyObjectOneWayPU(t10.nestedScroll, this, "nestedScroll"); this.__controller = new SynchedPropertyNesedObjectPU(t10.controller, this, "controller"); this.onMessage = () => { }; @@ -202,6 +203,7 @@ export class AtomicServiceWeb extends ViewPU { this.__mixedMode.reset(q10.mixedMode); this.__darkMode.reset(q10.darkMode); this.__forceDarkAccess.reset(q10.forceDarkAccess); + this.__nestedScroll.reset(q10.nestedScroll); this.__controller.set(q10.controller); } @@ -209,6 +211,7 @@ export class AtomicServiceWeb extends ViewPU { this.__mixedMode.purgeDependencyOnElmtId(p10); this.__darkMode.purgeDependencyOnElmtId(p10); this.__forceDarkAccess.purgeDependencyOnElmtId(p10); + this.__nestedScroll.purgeDependencyOnElmtId(p10); this.__controller.purgeDependencyOnElmtId(p10); } @@ -216,6 +219,7 @@ export class AtomicServiceWeb extends ViewPU { this.__mixedMode.aboutToBeDeleted(); this.__darkMode.aboutToBeDeleted(); this.__forceDarkAccess.aboutToBeDeleted(); + this.__nestedScroll.aboutToBeDeleted(); this.__controller.aboutToBeDeleted(); SubscriberManager.Get().delete(this.id__()); this.aboutToBeDeletedInternal(); @@ -245,6 +249,14 @@ export class AtomicServiceWeb extends ViewPU { this.__forceDarkAccess.set(r11); } + get nestedScroll() { + return this.__nestedScroll.get(); + } + + set nestedScroll(d9) { + this.__nestedScroll.set(d9); + } + get controller() { return this.__controller.get(); } @@ -279,6 +291,7 @@ export class AtomicServiceWeb extends ViewPU { Web.mixedMode(this.mixedMode); Web.darkMode(this.darkMode); Web.forceDarkAccess(this.forceDarkAccess); + Web.nestedScroll(ObservedObject.GetRawObject(this.nestedScroll)); Web.onErrorReceive((q11) => this.onCommonCallBack('onErrorReceive', q11, this.onErrorReceive)); Web.onHttpErrorReceive((p11) => this.onCommonCallBack('onHttpErrorReceive', p11, this.onHttpErrorReceive)); Web.onPageBegin((l10) => this.onCommonCallBack('onPageBegin', l10, this.onPageBegin)); @@ -1038,7 +1051,7 @@ class AtomicServiceApi extends AtomicService { background: false }).then((t2) => { t2.on('complete', () => { - this.success(new DownloadFileResult(p2), m2); + this.success(new DownloadFileResult(p2), m2); }); t2.on('fail', w2 => { this.errorWithCodeAndMsg(new AsError(w2, 'File download fail.'), m2); diff --git a/atomicserviceweb/source/atomicserviceweb.ets b/atomicserviceweb/source/atomicserviceweb.ets index 67faf48..e6c9c9c 100644 --- a/atomicserviceweb/source/atomicserviceweb.ets +++ b/atomicserviceweb/source/atomicserviceweb.ets @@ -113,6 +113,7 @@ export struct AtomicServiceWeb { @Prop mixedMode?: MixedMode; @Prop darkMode?: WebDarkMode; @Prop forceDarkAccess?: boolean; + @Prop nestedScroll?: NestedScrollOptions | NestedScrollOptionsExt; @ObjectLink controller: AtomicServiceWebController; public onMessage?: Callback = () => { }; @@ -165,6 +166,7 @@ export struct AtomicServiceWeb { .mixedMode(this.mixedMode) .darkMode(this.darkMode) .forceDarkAccess(this.forceDarkAccess) + .nestedScroll(this.nestedScroll) .onErrorReceive((event: OnErrorReceiveEvent) => this.onCommonCallBack('onErrorReceive', event, this.onErrorReceive)) .onHttpErrorReceive((event: OnHttpErrorReceiveEvent) => this.onCommonCallBack('onHttpErrorReceive', event, -- Gitee From a06a132647b1948d9433efff5e623c190ae6230a Mon Sep 17 00:00:00 2001 From: txazo Date: Wed, 15 Jan 2025 19:40:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?AsWeb=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9Ene?= =?UTF-8?q?stedScroll=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: txazo --- atomicserviceweb/interfaces/atomicserviceweb.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomicserviceweb/interfaces/atomicserviceweb.js b/atomicserviceweb/interfaces/atomicserviceweb.js index 0b69641..a9b53c9 100644 --- a/atomicserviceweb/interfaces/atomicserviceweb.js +++ b/atomicserviceweb/interfaces/atomicserviceweb.js @@ -125,7 +125,7 @@ export class AtomicServiceWeb extends ViewPU { this.__mixedMode = new SynchedPropertySimpleOneWayPU(t10.mixedMode, this, "mixedMode"); this.__darkMode = new SynchedPropertySimpleOneWayPU(t10.darkMode, this, "darkMode"); this.__forceDarkAccess = new SynchedPropertySimpleOneWayPU(t10.forceDarkAccess, this, "forceDarkAccess"); - this.__nestedScroll = new SynchedPropertyObjectOneWayPU(t10.nestedScroll, this, "nestedScroll"); + this.__nestedScroll = new SynchedPropertyObjectOneWayPU(t10.nestedScroll, this, 'nestedScroll'); this.__controller = new SynchedPropertyNesedObjectPU(t10.controller, this, "controller"); this.onMessage = () => { }; -- Gitee