@monoui/vuejs 1.1.34 → 1.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@monoui/vuejs",
-	"version": "1.1.34",
+	"version": "1.1.36",
 	"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,12 +495,7 @@ 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();
-		}
+		this.loadHistory();
 		if (this.autoLoad) {
 			await this.getValues();
 		}
@@ -728,10 +723,12 @@ export default {
 			if (filter) {
 				filter.Value = value;
 			} else {
-				this.filters.push({
-					Column: column,
-					Value: value
-				});
+				if (value) {
+					this.filters.push({
+						Column: column,
+						Value: value
+					});
+				}
 			}
 			this.getValues();
 		},
@@ -883,14 +880,16 @@ export default {
 			}
 		},
 		loadHistoryFilters() {
-			const parameters = this.getHistoryParameters("f-");
-			if (!parameters) return;
+			const filterParams = this.getHistoryParameters("f-");
+			if (!filterParams) return;
 
 			const trimName = this.getHistoryName("f-");
-			const names = Object.keys(parameters);
+			const names = Object.keys(filterParams);
+			if (!names || names.length == 0) return;
+
 			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({
@@ -901,14 +900,16 @@ export default {
 			}
 		},
 		loadHistorySorting() {
-			const parameters = this.getHistoryParameters("s-");
-			if (!parameters) return;
+			const sortingParams = this.getHistoryParameters("s-");
+			if (!sortingParams) return;
 
 			const trimName = this.getHistoryName("s-");
-			const names = Object.keys(parameters);
+			const names = Object.keys(sortingParams);
+			if (!names || names.length == 0) return;
+
 			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;