@monoui/vuejs 1.1.35 → 1.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@monoui/vuejs",
-	"version": "1.1.35",
+	"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,11 +495,7 @@ export default {
 		this.addPopStateListener();
 	},
 	async mounted() {
-		const filterParams = this.getHistoryParameters("f-");
-		const sortingParams = this.getHistoryParameters("s-");
-		if (filterParams || sortingParams) {
-			this.loadHistory(filterParams, sortingParams);
-		}
+		this.loadHistory();
 		if (this.autoLoad) {
 			await this.getValues();
 		}
@@ -516,7 +512,7 @@ export default {
 			this.loadHistory();
 			this.getValues(false);
 		},
-		loadHistory(filterParams, sortingParams) {
+		loadHistory() {
 			this.settings.currentPage = this.getHistoryParameter("page", 1);
 			this.settings.itemPerPage = this.getHistoryParameter(
 				"limit",
@@ -528,8 +524,8 @@ export default {
 					""
 				);
 			}
-			this.loadHistoryFilters(filterParams);
-			this.loadHistorySorting(sortingParams);
+			this.loadHistoryFilters();
+			this.loadHistorySorting();
 		},
 		sortableIcon(column) {
 			const currentSort = this.sorting.find(x => x.Column === column);
@@ -727,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();
 		},
@@ -881,12 +879,14 @@ export default {
 				console.error(error);
 			}
 		},
-		loadHistoryFilters(filterParams) {
-			if (!filterParams) filterParams = this.getHistoryParameters("f-");
+		loadHistoryFilters() {
+			const filterParams = this.getHistoryParameters("f-");
 			if (!filterParams) return;
 
 			const trimName = this.getHistoryName("f-");
 			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 = filterParams[paramName];
@@ -899,12 +899,14 @@ export default {
 				}
 			}
 		},
-		loadHistorySorting(sortingParams) {
-			if (!sortingParams) sortingParams = this.getHistoryParameters("s-");
+		loadHistorySorting() {
+			const sortingParams = this.getHistoryParameters("s-");
 			if (!sortingParams) return;
 
 			const trimName = this.getHistoryName("s-");
 			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 = sortingParams[paramName];