inviton-powerduck 0.0.79 → 0.0.80

package/components/datatable/datatable.tsx

@@ -336,6 +336,10 @@ export class DataTableFilterItemCollection extends Array<DataTableFilterItem> {
     }
 }
 
+export class DataTableConfig {
+    static filterMarking = false;
+}
+
 @Component
 class TableButtonComponent extends TsxComponent<TableButton> implements TableButton {
     @Prop() title!: string;
@@ -453,9 +457,12 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
         this.currentMobileBehavior = this.mobileBehavior;
         this.performColumnRefresh();
         this.handleWindowResized();
-        this.markInstance = new Mark(this.$el);
         window.addEventListener("resize", this.handleWindowResized, true);
 
+        if (DataTableConfig.filterMarking) {
+            this.markInstance = new Mark(this.$el);
+        }
+
         if (this.handleInitialFilter) {
             this.parseInitialFilter();
         }
@@ -881,11 +888,13 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
             regexBuilder += escapeRegExp(this.fullTextQuery);
         }
 
-        this.markInstance.unmark({
-            done: function () {
-                mySelf.markInstance.markRegExp(new RegExp("(" + regexBuilder + ")", "i"));
-            },
-        });
+        if (DataTableConfig.filterMarking) {
+            this.markInstance.unmark({
+                done: function () {
+                    mySelf.markInstance.markRegExp(new RegExp("(" + regexBuilder + ")", "i"));
+                },
+            });
+        }
     }
 
     addFilterItem(dtColumn: TableColumn, newFilter: DataTablePostBackFilterItem): void {
@@ -1316,33 +1325,43 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
                 loadPromise = mySelf.customAjaxCall(mySelf.getAjaxArgs(paginationPosition, paginationLength));
             }
 
-            loadPromise
-                .then((data: any) => {
+            const unmark = (cb: () => void) => {
+                if (DataTableConfig.filterMarking) {
                     mySelf.markInstance.unmark({
                         done: function () {
-                            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);
-                            });
+                            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);
+                        });
+                    });
                 })
                 .catch((err) => {
                     mySelf.isLoading = false;

package/package.json

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