inviton-powerduck 0.0.80 → 0.0.82

package/components/datatable/datatable.tsx

@@ -337,7 +337,7 @@ export class DataTableFilterItemCollection extends Array<DataTableFilterItem> {
 }
 
 export class DataTableConfig {
-    static filterMarking = false;
+    static filterMarking = true;
 }
 
 @Component
@@ -854,6 +854,24 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
         return selectedRows;
     }
 
+    unmarkSelection(cb: () => void): void {
+        if (DataTableConfig.filterMarking) {
+            this.markInstance.unmark({
+                done: () => {
+                    this.enforceBodyRedraw = true;
+                    this.$nextTick(() => {
+                        this.enforceBodyRedraw = false;
+                        this.$nextTick(() => {
+                            cb();
+                        });
+                    });
+                },
+            });
+        } else {
+            cb();
+        }
+    }
+
     markSelection(): void {
         var mySelf = this;
         var escapeRegExp = function (string) {
@@ -872,6 +890,7 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
         };
 
         var regexBuilder = "";
+        var markArr: string[] = [];
         if (this.filterArr != null) {
             this.filterArr.forEach((filterItem) => {
                 if (regexBuilder.length > 0) {
@@ -879,7 +898,7 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
                 }
 
                 (getValueArr(filterItem) || []).forEach((filterValue) => {
-                    regexBuilder += escapeRegExp(filterValue);
+                    markArr.push(escapeRegExp(filterValue));
                 });
             });
         }
@@ -889,10 +908,8 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
         }
 
         if (DataTableConfig.filterMarking) {
-            this.markInstance.unmark({
-                done: function () {
-                    mySelf.markInstance.markRegExp(new RegExp("(" + regexBuilder + ")", "i"));
-                },
+            this.unmarkSelection(() => {
+                mySelf.markInstance.mark(markArr);
             });
         }
     }
@@ -926,11 +943,13 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
 
     handleClientsideFilter(markResults?: boolean): boolean {
         if (this.filterMode == DataTableFilterMode.Clientside) {
-            this.performClientsideFilter();
+            this.unmarkSelection(() => {
+                this.performClientsideFilter();
 
-            if (markResults) {
-                this.$nextTick(() => this.markSelection());
-            }
+                if (markResults) {
+                    this.markSelection();
+                }
+            });
 
             return true;
         }
@@ -1325,44 +1344,33 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
                 loadPromise = mySelf.customAjaxCall(mySelf.getAjaxArgs(paginationPosition, paginationLength));
             }
 
-            const unmark = (cb: () => void) => {
-                if (DataTableConfig.filterMarking) {
-                    mySelf.markInstance.unmark({
-                        done: function () {
-                            cb();
-                        },
-                    });
-                } else {
-                    cb();
-                }
-            }
 
-            loadPromise
-                .then((data: any) => {
-                    unmark(() => {
-                        mySelf.enforceBodyRedraw = true;
-                        mySelf.$nextTick(() => {
-                            mySelf.enforceBodyRedraw = false;
-                            mySelf.isLoading = false;
-
-                            if (mySelf.parseLoadedRowset != null) {
-                                let rowset = mySelf.parseLoadedRowset(data);
-                                mySelf.totalCount = rowset.TotalCount;
-                                mySelf.totalFilteredCount = rowset.TotalFilteredCount;
-                                mySelf.rows = rowset.Rows;
-                            } else {
-                                mySelf.totalCount = data.TotalCount;
-                                mySelf.totalFilteredCount = data.TotalFilteredCount;
-                                mySelf.rows = data.Rows;
-                            }
-
-                            mySelf.loadedRows = mySelf.rows;
-                            mySelf.$forceUpdate();
-                            mySelf.$nextTick(() => mySelf.markSelection());
-                            resolve(data);
-                        });
+
+            loadPromise.then((data: any) => {
+                mySelf.unmarkSelection(() => {
+                    mySelf.enforceBodyRedraw = true;
+                    mySelf.$nextTick(() => {
+                        mySelf.enforceBodyRedraw = false;
+                        mySelf.isLoading = false;
+
+                        if (mySelf.parseLoadedRowset != null) {
+                            let rowset = mySelf.parseLoadedRowset(data);
+                            mySelf.totalCount = rowset.TotalCount;
+                            mySelf.totalFilteredCount = rowset.TotalFilteredCount;
+                            mySelf.rows = rowset.Rows;
+                        } else {
+                            mySelf.totalCount = data.TotalCount;
+                            mySelf.totalFilteredCount = data.TotalFilteredCount;
+                            mySelf.rows = data.Rows;
+                        }
+
+                        mySelf.loadedRows = mySelf.rows;
+                        mySelf.$forceUpdate();
+                        mySelf.$nextTick(() => mySelf.markSelection());
+                        resolve(data);
                     });
-                })
+                });
+            })
                 .catch((err) => {
                     mySelf.isLoading = false;
                     NotificationProvider.showErrorMessage(PowerduckState.getResourceValue('errorFetchingData'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inviton-powerduck",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "type": "module",
   "scripts": {
     "build": " vite build && vue-tsc  --declaration --emitDeclarationOnly",