From 14fe45e623515c68ea51c24dc01eaab430eb671f Mon Sep 17 00:00:00 2001 From: yumoqing Date: Thu, 25 Jul 2024 18:29:10 +0800 Subject: [PATCH] bugfix --- bricks/dataviewer.js | 17 ++++++----------- bricks/scroll.js | 13 +++++++++++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/bricks/dataviewer.js b/bricks/dataviewer.js index 980111b..0f16600 100644 --- a/bricks/dataviewer.js +++ b/bricks/dataviewer.js @@ -37,6 +37,7 @@ bricks.DataViewer = class extends bricks.VBox { this.scrollpanel.bind('max_threshold', this.load_next_page.bind(this)); await this.render(); this.set_key_select_items(); + bricks.debug_obj = this.scrollpanel; } async build_other(){ } @@ -73,12 +74,6 @@ bricks.DataViewer = class extends bricks.VBox { this.filler_widget = new bricks.Filler({}); this.add_widget(this.filler_widget) this.scrollpanel = new bricks.VScrollPanel({}); - /* - this.scrollpanel.set_css('scrollpanel'); - this.scrollpanel.set_style('height','100%'); - this.scrollpanel.set_style('width','100%'); - this.scrollpanel.set_style('overflow','auto'); - */ this.filler_widget.add_widget(this.scrollpanel); } async renderPageData(data, page){ @@ -297,8 +292,8 @@ bricks.DataViewer = class extends bricks.VBox { var d = await this.loader.loadPreviousPage(); if (d){ this.dataHandle(d); - var total = this.container.dom_element.scrollHeight - this.container.dom_element.clientHeight; - this.container.dom_element.scrollTop = d.pos_rate * total; + var total = this.scrollpanel.dom_element.scrollHeight - this.scrollpanel.dom_element.clientHeight; + this.scrollpanel.dom_element.scrollTop = d.pos_rate * total; } else { bricks.debug(this.loader, 'load previous page error'); } @@ -320,8 +315,8 @@ bricks.DataViewer = class extends bricks.VBox { var d = await this.loader.loadNextPage(); if (d){ this.dataHandle(d); - var total = this.container.dom_element.scrollHeight - this.container.dom_element.clientHeight; - this.container.dom_element.scrollTop = d.pos_rate * total; + var total = this.scrollpanel.dom_element.scrollHeight - this.scrollpanel.dom_element.clientHeight; + this.scrollpanel.dom_element.scrollTop = d.pos_rate * total; } else { bricks.debug(this.loader, 'load next page error'); } @@ -336,7 +331,7 @@ bricks.DataViewer = class extends bricks.VBox { var items = this.dom_element.querySelectorAll('[data-page="' + page + '"]'); for (var i=0;i