@monoui/vuejs 1.1.78 → 1.1.80

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@monoui/vuejs",
-	"version": "1.1.78",
+	"version": "1.1.80",
 	"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

@@ -418,14 +418,6 @@ import IconSorting from "./Icons/Sorting.vue";
 import IconSortingAZ from "./Icons/SortingAZ.vue";
 import IconSortingArrows from "./Icons/SortingArrows.vue";
 
-const defaultTimeFrame = {
-	enabled: false,
-	title: "All",
-	column: "CreatedDate",
-	frame: 3,
-	options: [3, 6, 9, 12, "Clear"]
-};
-
 export default {
 	name: "mui-table",
 	components: {
@@ -629,17 +621,17 @@ export default {
 			comingFromPopState: false,
 			skipWatch: false,
 			selectedCorrelationId: null,
-			emptyGuid: "00000000-0000-0000-0000-000000000000"
+			emptyGuid: "00000000-0000-0000-0000-000000000000",
+			finalTimeFrame: {
+				enabled: false,
+				column: "CreatedDate",
+				title: "All",
+				frame: 3,
+				options: [3, 6, 9, 12, "Clear"]
+			}
 		};
 	},
 	computed: {
-		finalTimeFrame() {
-			return {
-				...defaultTimeFrame,
-				...this.timeFrame
-			};
-		},
-
 		filteredPerPageValues() {
 			const values = [];
 			for (const value of this.perPageValues) {
@@ -668,6 +660,22 @@ export default {
 	async mounted() {
 		if (this.history) this.loadHistory();
 
+		if (this.timeFrame) {
+			if (this.timeFrame.enabled) this.finalTimeFrame.enabled = true;
+
+			if (this.timeFrame.column)
+				this.finalTimeFrame.column = this.timeFrame.column;
+
+			if (this.timeFrame.title)
+				this.finalTimeFrame.title = this.timeFrame.title;
+
+			if (this.timeFrame.frame)
+				this.finalTimeFrame.frame = this.timeFrame.frame;
+
+			if (this.timeFrame.options && this.timeFrame.options.length > 0)
+				this.finalTimeFrame.options = this.timeFrame.options;
+		}
+
 		if (this.finalTimeFrame && this.finalTimeFrame.enabled) {
 			this.applyTimeFrameFilter(this.finalTimeFrame.frame);
 		}
@@ -677,6 +685,12 @@ export default {
 		}
 	},
 	methods: {
+		getTimeFrameTitle() {
+			if (this.finalTimeFrame.frame)
+				return this.getMonthLabel(this.finalTimeFrame.frame, true);
+			return this.finalTimeFrame.title;
+		},
+
 		getMonthLabel(lbl, align = false) {
 			if (lbl === "Clear") return lbl;
 
@@ -684,12 +698,6 @@ export default {
 			return lbl < 10 ? `\u00A0${lbl} months` : `${lbl} months`;
 		},
 
-		getTimeFrameTitle() {
-			if (this.finalTimeFrame.frame)
-				return this.getMonthLabel(this.finalTimeFrame.frame, true);
-			return this.finalTimeFrame.title;
-		},
-
 		applyTimeFrameFilter(opt) {
 			const existingIndex = this.filters.findIndex(
 				f => f.Column === this.finalTimeFrame.column
@@ -702,7 +710,6 @@ export default {
 				}
 			} else {
 				this.finalTimeFrame.frame = opt;
-
 				if (existingIndex !== -1) {
 					// Update existing filter
 					this.$set(this.filters, existingIndex, {
@@ -859,8 +866,8 @@ export default {
 				);
 				if (result && result.status === 200) {
 					this.$successToast(
-						"Export Started",
-						"The export process has begun. Please wait... Once completed, you can download it from the Reports/Exports page."
+						"Export In Progress",
+						"It will be available on the Reports/Exports page shortly."
 					);
 				} else {
 					this.$errorToast(
@@ -878,8 +885,8 @@ export default {
 
 			if (exportScope) {
 				this.$successToast(
-					"Export Started",
-					"The export process has begun. Please wait... Once completed, you can download it from the Reports/Exports page."
+					"Export In Progress",
+					"It will be available on the Reports/Exports page shortly."
 				);
 			}