@monoui/vuejs 1.1.33 → 1.1.35

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@monoui/vuejs",
-	"version": "1.1.33",
+	"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,42 +881,42 @@ export default {
 				console.error(error);
 			}
 		},
-		loadHistoryFilters() {
-			const parameters = this.getHistoryParameters("f-");
+		loadHistoryFilters(filterParams) {
+			if (!filterParams) filterParams = this.getHistoryParameters("f-");
+			if (!filterParams) return;
+
 			const trimName = this.getHistoryName("f-");
-			const names = Object.keys(parameters);
-			if (parameters && parameters.length > 0) {
-				this.filters.splice(0, this.filters.length);
-				for (const paramName of names) {
-					const value = parameters[paramName];
-					const column = paramName.replace(trimName, "");
-					if (value) {
-						this.filters.push({
-							Column: column,
-							Value: value
-						});
-					}
+			const names = Object.keys(filterParams);
+			this.filters.splice(0, this.filters.length);
+			for (const paramName of names) {
+				const value = filterParams[paramName];
+				const column = paramName.replace(trimName, "");
+				if (value) {
+					this.filters.push({
+						Column: column,
+						Value: value
+					});
 				}
 			}
 		},
-		loadHistorySorting() {
-			const parameters = this.getHistoryParameters("s-");
+		loadHistorySorting(sortingParams) {
+			if (!sortingParams) sortingParams = this.getHistoryParameters("s-");
+			if (!sortingParams) return;
+
 			const trimName = this.getHistoryName("s-");
-			const names = Object.keys(parameters);
-			if (parameters && parameters.length > 0) {
-				this.sorting.splice(0, this.sorting.length);
-				for (const paramName of names) {
-					var paramValue = parameters[paramName];
-					let value = undefined;
-					if (paramValue && paramValue === "1") value = true;
-					else if (paramValue && paramValue === "0") value = false;
-					const column = paramName.replace(trimName, "");
+			const names = Object.keys(sortingParams);
+			this.sorting.splice(0, this.sorting.length);
+			for (const paramName of names) {
+				var paramValue = sortingParams[paramName];
+				let value = undefined;
+				if (paramValue && paramValue === "1") value = true;
+				else if (paramValue && paramValue === "0") value = false;
+				const column = paramName.replace(trimName, "");
 
-					this.sorting.push({
-						Column: column,
-						Asc: value
-					});
-				}
+				this.sorting.push({
+					Column: column,
+					Asc: value
+				});
 			}
 		},
 		replaceHistory(state, storage = this.historyStorage) {