@monoui/vuejs 1.1.43 → 1.1.45

package/package.json

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

package/src/components/Modal/Modal.vue

@@ -8,8 +8,8 @@
 		@hidden="hidden()"
 		:hide-footer="hideFooter"
 		:dialog-class="isFullScreen ? 'modal-dialog-fullScreen' : ''"
-		:content-class="isFullScreen ? 'modal-content-fullScreen' : ''"
-		:body-class="isFullScreen ? 'modal-body-fullScreen' : ''"
+		:content-class="computedContentClass"
+		:body-class="computedBodyClass"
 		:header-class="isFullScreen ? 'modal-header-fullScreen' : ''"
 	>
 		<mui-loader :loading="loading" />
@@ -93,6 +93,16 @@ export default {
 			get() {
 				return this.loading ? "" : this.title;
 			}
+		},
+		computedBodyClass() {
+			return this.isFullScreen
+				? `${this.bodyClass} modal-body-fullScreen`
+				: this.bodyClass;
+		},
+		computedContentClass() {
+			return this.isFullScreen
+				? `${this.contentClass} modal-content-fullScreen`
+				: this.contentClass;
 		}
 	},
 	props: {
@@ -148,6 +158,14 @@ export default {
 		enableFullScreen: {
 			type: Boolean,
 			default: false
+		},
+		bodyClass: {
+			type: String,
+			default: ""
+		},
+		contentClass: {
+			type: String,
+			default: ""
 		}
 	},
 	methods: {

package/src/components/Table/Table.vue

@@ -495,17 +495,16 @@ export default {
 		this.addPopStateListener();
 	},
 	async mounted() {
-		if (this.history)
-			this.loadHistory();
+		if (this.history) this.loadHistory();
 
 		if (this.autoLoad) {
-			await this.getValues();
+			await this.getValues(true, true);
 		}
 	},
 	methods: {
 		addPopStateListener() {
 			if (this.history)
-			window.addEventListener("popstate", this.popStateEvent);
+				window.addEventListener("popstate", this.popStateEvent);
 		},
 		removePopStateListener() {
 			window.removeEventListener("popstate", this.popStateEvent);
@@ -580,7 +579,7 @@ export default {
 				row
 			);
 		},
-		async getValues(addHistory = true) {
+		async getValues(addHistory = true, initialLoad = false) {
 			this.isLoading = true;
 			this.$emit("loading", this.isLoading);
 			const { currentPage, itemPerPage } = this.settings;
@@ -592,9 +591,10 @@ export default {
 				itemPerPage
 			);
 
-			if (addHistory && !this.comingFromPopState) {
+			if (!initialLoad && addHistory && !this.comingFromPopState) {
 				const filterPrefix = this.getHistoryName("f-");
 				const sortPrefix = this.getHistoryName("s-");
+				let urlOriginal = new URL(window.location);
 				let url = new URL(window.location);
 				let params = new URLSearchParams(url.search);
 				//console.log("url start: " + url);
@@ -629,7 +629,8 @@ export default {
 						false
 					);
 				}
-				this.replaceHistory(url);
+				if (JSON.stringify(url) != JSON.stringify(urlOriginal))
+					this.replaceHistory(url);
 			}
 			this.comingFromPopState = false;
 			this.skipWatch = false;