@nixweb/nixloc-ui 1.17.0 → 1.20.0

package/src/component/layout/ScrollBar.vue

@@ -1,6 +1,5 @@
 <template>
-  <div :id="id" class="scrollbar" :style="'max-height:' + maxHeight + 'px' + ';' + 'min-height:' + minHeight + 'px'
-    ">
+  <div :id="id" class="scrollbar" :style="'max-height:' + maxHeight + 'px' + ';' + 'min-height:' + minHeight + 'px'">
     <div id="scroll-bar">
       <slot></slot>
     </div>
@@ -18,14 +17,28 @@ export default {
     minHeight: Number,
     endScrollBar: Function,
   },
+  data() {
+    return {
+      _scrollHandler: null,
+    };
+  },
   mounted() {
-    const listElm = document.querySelector("#" + this.id);
-    if (listElm != null)
-      listElm.addEventListener("scroll", (e) => {
-        if (listElm.scrollTop + listElm.clientHeight >= listElm.scrollHeight) {
+    const listElm = this.$el;
+    if (listElm != null) {
+      this._scrollHandler = () => {
+        if (listElm.scrollTop + listElm.clientHeight >= listElm.scrollHeight - 1) {
           if (this.endScrollBar) this.endScrollBar();
         }
-      });
+      };
+      listElm.addEventListener("scroll", this._scrollHandler);
+    }
+  },
+  beforeDestroy() {
+    const listElm = this.$el;
+    if (listElm != null && this._scrollHandler) {
+      listElm.removeEventListener("scroll", this._scrollHandler);
+      this._scrollHandler = null;
+    }
   },
   methods: {
     ...mapMutations("generic", ["addEvent"]),
@@ -35,7 +48,7 @@ export default {
 
 <style scoped>
 .scrollbar {
-  overflow-y: visible;
+  overflow-y: auto;
   overflow-x: hidden;
 }
 

package/src/store/modules/generic.js

@@ -255,7 +255,21 @@ export default {
                         const produtoEnd = tbodyHtml.indexOf("</tr>", produtoStart) + "</tr>".length;
 
                         const wrapStart = grupoStart;
-                        const wrapEnd = produtoEnd;
+                        let wrapEnd = produtoEnd;
+
+                        // Keep the group/subgroup total row inside the repeated block when present.
+                        const somaMasterToken = "somaGrupo(grupo)";
+                        const somaMasterIndex = tbodyHtml.indexOf(somaMasterToken, produtoEnd);
+                        if (somaMasterIndex !== -1) {
+                            const totalRowStart = tbodyHtml.lastIndexOf("<tr", somaMasterIndex);
+                            const totalRowEnd = tbodyHtml.indexOf("</tr>", somaMasterIndex) + "</tr>".length;
+
+
+
+                            if (totalRowStart !== -1 && totalRowEnd > wrapEnd) {
+                                wrapEnd = totalRowEnd;
+                            }
+                        }
 
                         let templateContent = tbodyHtml.substring(wrapStart, wrapEnd);