inviton-powerduck 0.0.81 → 0.0.83

package/components/datatable/datatable.tsx

@@ -890,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) {
@@ -897,7 +898,7 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
                 }
 
                 (getValueArr(filterItem) || []).forEach((filterValue) => {
-                    regexBuilder += escapeRegExp(filterValue);
+                    markArr.push(escapeRegExp(filterValue));
                 });
             });
         }
@@ -908,7 +909,7 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
 
         if (DataTableConfig.filterMarking) {
             this.unmarkSelection(() => {
-                mySelf.markInstance.markRegExp(new RegExp("(" + regexBuilder + ")", "i"));
+                mySelf.markInstance.mark(markArr);
             });
         }
     }

package/components/datatable/upper-buttons-wrapper.tsx

@@ -1,4 +1,4 @@
-import { Prop } from "vue-facing-decorator";
+import { Prop, toNative } from "vue-facing-decorator";
 import TsxComponent, { Component } from "../../app/vuetsx";
 import { Teleport } from "vue";
 import { PortalUtils } from "../../common/utils/utils";
@@ -8,12 +8,16 @@ interface DataTableUpperButtonsWrapperArgs {
     cssClass?: string;
 }
 
+export class DataTableUpperButtonsWrapperConfig {
+	static defaultPortalTarget = '#bs-dtbtn-container';
+}
+
 @Component({
     components: {
         teleport: Teleport,
     },
 })
-export default class DataTableUpperButtonsWrapper extends TsxComponent<DataTableUpperButtonsWrapperArgs> implements DataTableUpperButtonsWrapperArgs {
+class DataTableUpperButtonsWrapperComponent extends TsxComponent<DataTableUpperButtonsWrapperArgs> implements DataTableUpperButtonsWrapperArgs {
     @Prop() hasCheckbox?: boolean;
     @Prop() cssClass?: string;
 
@@ -30,11 +34,15 @@ export default class DataTableUpperButtonsWrapper extends TsxComponent<DataTable
         return builder;
     }
 
+	get portalContainer(): string {
+		return DataTableUpperButtonsWrapperConfig.defaultPortalTarget;
+	}
+
     private render(h) {
         if (PortalUtils.isIOS()) {
             return (
                 <div class={"ios-table-upper-buttons-wrap" + (this.hasCheckbox ? " wrap-has-checkbox" : "")}>
-                    <teleport to="#bs-dtbtn-container">
+					<teleport to={this.portalContainer} defer={true}>
                         <div class={this.getCssClass()}>{this.$slots.default?.()}</div>
                     </teleport>
                 </div>
@@ -44,3 +52,6 @@ export default class DataTableUpperButtonsWrapper extends TsxComponent<DataTable
         }
     }
 }
+
+const DataTableUpperButtonsWrapper = toNative(DataTableUpperButtonsWrapperComponent)
+export default DataTableUpperButtonsWrapper

package/package.json

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