@monoui/vuejs 1.1.34 → 1.1.35

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@monoui/vuejs",
-	"version": "1.1.34",
+	"version": "1.1.35",
 	"description": "This project will contain MonoFor UI Framework",
 	"main": "./dist/main.js",
 	"repository": "git@gitlab.com:monoui/vuejs.git",

package/src/components/Table/Table.vue

@@ -495,11 +495,10 @@ export default {
 		this.addPopStateListener();
 	},
 	async mounted() {
-		var filterPrefix = this.getHistoryName("f-");
-		var sortingPrefix = this.getHistoryName("s-");
-		let url = new URL(window.location).toString();
-		if (url.indexOf(filterPrefix) >= 0 || url.indexOf(sortingPrefix) >= 0) {
-			this.loadHistory();
+		const filterParams = this.getHistoryParameters("f-");
+		const sortingParams = this.getHistoryParameters("s-");
+		if (filterParams || sortingParams) {
+			this.loadHistory(filterParams, sortingParams);
 		}
 		if (this.autoLoad) {
 			await this.getValues();
@@ -517,7 +516,7 @@ export default {
 			this.loadHistory();
 			this.getValues(false);
 		},
-		loadHistory() {
+		loadHistory(filterParams, sortingParams) {
 			this.settings.currentPage = this.getHistoryParameter("page", 1);
 			this.settings.itemPerPage = this.getHistoryParameter(
 				"limit",
@@ -529,8 +528,8 @@ export default {
 					""
 				);
 			}
-			this.loadHistoryFilters();
-			this.loadHistorySorting();
+			this.loadHistoryFilters(filterParams);
+			this.loadHistorySorting(sortingParams);
 		},
 		sortableIcon(column) {
 			const currentSort = this.sorting.find(x => x.Column === column);
@@ -882,15 +881,15 @@ export default {
 				console.error(error);
 			}
 		},
-		loadHistoryFilters() {
-			const parameters = this.getHistoryParameters("f-");
-			if (!parameters) return;
+		loadHistoryFilters(filterParams) {
+			if (!filterParams) filterParams = this.getHistoryParameters("f-");
+			if (!filterParams) return;
 
 			const trimName = this.getHistoryName("f-");
-			const names = Object.keys(parameters);
+			const names = Object.keys(filterParams);
 			this.filters.splice(0, this.filters.length);
 			for (const paramName of names) {
-				const value = parameters[paramName];
+				const value = filterParams[paramName];
 				const column = paramName.replace(trimName, "");
 				if (value) {
 					this.filters.push({
@@ -900,15 +899,15 @@ export default {
 				}
 			}
 		},
-		loadHistorySorting() {
-			const parameters = this.getHistoryParameters("s-");
-			if (!parameters) return;
+		loadHistorySorting(sortingParams) {
+			if (!sortingParams) sortingParams = this.getHistoryParameters("s-");
+			if (!sortingParams) return;
 
 			const trimName = this.getHistoryName("s-");
-			const names = Object.keys(parameters);
+			const names = Object.keys(sortingParams);
 			this.sorting.splice(0, this.sorting.length);
 			for (const paramName of names) {
-				var paramValue = parameters[paramName];
+				var paramValue = sortingParams[paramName];
 				let value = undefined;
 				if (paramValue && paramValue === "1") value = true;
 				else if (paramValue && paramValue === "0") value = false;