@monoui/vuejs 1.1.20 → 1.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@monoui/vuejs",
-	"version": "1.1.20",
+	"version": "1.1.23",
 	"description": "This project will contain MonoFor UI Framework",
 	"main": "./dist/main.js",
 	"repository": "git@gitlab.com:monoui/vuejs.git",
@@ -8,6 +8,7 @@
 	"license": "MIT",
 	"scripts": {
 		"docs": "vuepress dev docs",
+		"dev": "vuepress dev docs",
 		"styleguide": "vue-styleguidist server",
 		"styleguide:build": "vue-styleguidist build",
 		"deploy": "cross-env NODE_ENV=production webpack --config webpack.config.js",

package/src/components/Table/Table.vue

@@ -425,8 +425,10 @@ export default {
 		}
 	},
 	watch: {
-		searchWord(word) {
-			this.addFilter(word);
+		searchWord: {
+			handler: function(newValue) {
+				if (!this.comingFromPopState) this.addFilter(newValue);
+			}
 		}
 	},
 	data() {
@@ -443,7 +445,8 @@ export default {
 			isLoading: false,
 			limit: 250,
 			searchDebounceTimeout: null,
-			initialSorting: []
+			comingFromPopState: false,
+			skipWatch: false
 		};
 	},
 	computed: {
@@ -470,9 +473,15 @@ export default {
 		this.addPopStateListener();
 	},
 	async mounted() {
-		this.initialSorting = [...this.sorting];
-		this.loadHistory();
-		if (this.autoLoad) await this.getValues();
+		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();
+		}
+		if (this.autoLoad) {
+			await this.getValues();
+		}
 	},
 	methods: {
 		addPopStateListener() {
@@ -482,14 +491,12 @@ export default {
 			window.removeEventListener("popstate", this.popStateEvent);
 		},
 		async popStateEvent() {
+			this.comingFromPopState = true;
 			this.loadHistory();
-			await this.getValues(false);
+			this.getValues(false);
 		},
 		loadHistory() {
-			this.settings.currentPage = this.getHistoryParameter(
-				"page",
-				this.settings.currentPage
-			);
+			this.settings.currentPage = this.getHistoryParameter("page", 1);
 			this.settings.itemPerPage = this.getHistoryParameter(
 				"limit",
 				this.perPage || this.settings.itemPerPage
@@ -565,31 +572,47 @@ export default {
 				itemPerPage
 			);
 
-			if (addHistory) {
-				let state = null;
-				this.clearHistoryParameters("f-");
+			if (addHistory && !this.comingFromPopState) {
+				const filterPrefix = this.getHistoryName("f-");
+				const sortPrefix = this.getHistoryName("s-");
+				let url = new URL(window.location);
+				let params = new URLSearchParams(url.search);
+				//console.log("url start: " + url);
+				for (const searchParam of params) {
+					if (searchParam[0].startsWith(filterPrefix)) {
+						url.searchParams.delete(searchParam[0]);
+						//console.log("url later: " + url);
+					}
+
+					if (searchParam[0].startsWith(sortPrefix)) {
+						url.searchParams.delete(searchParam[0]);
+						//console.log("url later: " + url);
+					}
+				}
+
 				for (const filter of this.filters) {
-					state = this.addHistoryParameter(
+					url = this.addHistoryParameter(
 						`f-${filter.Column}`,
 						filter.Value,
 						this.storage,
-						state,
+						url,
 						false
 					);
 				}
 
-				this.clearHistoryParameters("s-");
 				for (const sort of this.sorting) {
-					state = this.addHistoryParameter(
+					url = this.addHistoryParameter(
 						`s-${sort.Column}`,
 						sort.Asc ? 1 : 0,
 						this.storage,
-						state,
+						url,
 						false
 					);
 				}
-				this.replaceHistory(state);
+				this.replaceHistory(url);
 			}
+			this.comingFromPopState = false;
+			this.skipWatch = false;
 
 			if (!result || result.status !== 200) {
 				this.isLoading = false;
@@ -620,12 +643,18 @@ export default {
 
 			this.settings.currentPage = currentPage;
 			this.settings.itemPerPage = itemPerPage;
+			if (this.settings.currentPage <= 0) {
+				this.settings.currentPage = 1;
+			}
 			if (
 				this.settings.itemPerPage ===
 				(resultData.totalItemCount || resultData.TotalItemCount)
 			) {
 				this.settings.pageCount = 1;
 			}
+			if (this.settings.pageCount <= 0) {
+				this.settings.pageCount = 1;
+			}
 			if (this.settings.currentPage > this.settings.pageCount) {
 				this.settings.currentPage = this.settings.pageCount;
 				this.changePage(this.settings.currentPage);
@@ -642,14 +671,14 @@ export default {
 		changeItemPerPage(value) {
 			this.settings.itemPerPage = value;
 			this.addHistoryParameter("limit", value);
-			this.getValues();
+			this.getValues(false);
 		},
 		isLessThanTotalItemCount(val) {
 			return this.settings.totalItemCount > val;
 		},
 		/** */
 		refresh() {
-			this.getValues();
+			if (!this.comingFromPopState) this.getValues();
 		},
 		addFilter(word) {
 			if (!this.searchColumn) return;
@@ -665,6 +694,7 @@ export default {
 			);
 		},
 		searchColumnValue(column, value, limit = -1) {
+			if (this.skipWatch) return;
 			let filter = this.filters.find(x => x.Column === column);
 
 			if (filter && (!value || value.length < limit)) {
@@ -706,8 +736,7 @@ export default {
 							url.searchParams.delete(searchParam[0]);
 						}
 					}
-					window.history.pushState({}, "", url);
-					return;
+					return url;
 				}
 
 				if (storage === "local") {
@@ -835,31 +864,24 @@ export default {
 			const parameters = this.getHistoryParameters("f-");
 			const trimName = this.getHistoryName("f-");
 			const names = Object.keys(parameters);
+			this.filters.splice(0, this.filters.length);
 			for (const paramName of names) {
 				const value = parameters[paramName];
 				const column = paramName.replace(trimName, "");
 
-				let filter = this.filters.find(x => x.Column === column);
-
-				if (filter && !value) {
-					this.filters.splice(this.filters.indexOf(filter), 1);
-				} else if (value) {
-					if (filter) {
-						filter.Value = value;
-					} else {
-						this.filters.push({
-							Column: column,
-							Value: value
-						});
-					}
+				if (value) {
+					this.filters.push({
+						Column: column,
+						Value: value
+					});
 				}
 			}
 		},
 		loadHistorySorting() {
-			const latestSorting = [...this.initialSorting];
 			const parameters = this.getHistoryParameters("s-");
 			const trimName = this.getHistoryName("s-");
 			const names = Object.keys(parameters);
+			this.sorting.splice(0, this.sorting.length);
 			for (const paramName of names) {
 				var paramValue = parameters[paramName];
 				let value = undefined;
@@ -867,25 +889,22 @@ export default {
 				else if (paramValue && paramValue === "0") value = false;
 				const column = paramName.replace(trimName, "");
 
-				let sort = latestSorting.find(x => x.Column === column);
-
-				if (value !== undefined) {
-					if (sort) {
-						sort.Value = value;
-					} else {
-						latestSorting.push({ Column: column, Asc: value });
-					}
-				}
-			}
-			this.sorting.length = 0;
-			for (const sort of latestSorting) {
-				this.sorting.push(sort);
+				this.sorting.push({
+					Column: column,
+					Asc: value
+				});
 			}
 		},
 		replaceHistory(state, storage = this.historyStorage) {
-			if (!state) return;
 			if (storage === "query") {
-				window.history.pushState({ url: state.href }, "", state);
+				let url;
+				if (state) url = state;
+				else
+					url = new URL(
+						window.location.origin + window.location.pathname
+					);
+				//console.log("Pushing(3): " + url);
+				window.history.pushState({ url: url.href }, "", url.href);
 				return;
 			}
 		},
@@ -908,6 +927,7 @@ export default {
 						state = url;
 						return state;
 					}
+					//console.log("Pushing(2): " + url.href);
 					window.history.pushState({ url: url.href }, "", url.href);
 					return;
 				}
@@ -1002,6 +1022,7 @@ export default {
 				if (storage === "query") {
 					const url = new URL(window.location);
 					url.searchParams.delete(historyName);
+					//console.log("Pushing(1): " + url);
 					window.history.pushState({}, "", url);
 					return;
 				}