diff --git a/package.json b/package.json index 5cd5fa8..474c833 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ }, "name": "vue-functional-calendar", "description": "Lightweight, high-performance calendar component based on Vue.js", - "version": "2.7.0", + "version": "2.7.1", "license": "MIT", "repository": { "type": "git", diff --git a/src/components/FunctionalCalendar.vue b/src/components/FunctionalCalendar.vue index f5d75be..ace3c7d 100644 --- a/src/components/FunctionalCalendar.vue +++ b/src/components/FunctionalCalendar.vue @@ -358,11 +358,13 @@ }, setConfigs() { let vm = this; + let globalOptions; if (typeof vm.$getOptions !== "undefined") { // Global Options - Object.keys(vm.$getOptions()).map(function (objectKey) { + globalOptions = vm.$getOptions(); + Object.keys(globalOptions).map(function (objectKey) { if (typeof (vm.fConfigs[objectKey]) !== "undefined") { - vm.$set(vm.fConfigs, objectKey, vm.$getOptions()[objectKey]); + vm.$set(vm.fConfigs, objectKey, globalOptions[objectKey]); } }); } @@ -377,8 +379,7 @@ } else { Object.keys(vm.$props).map(function (objectKey) { if (typeof (vm.fConfigs[objectKey]) !== "undefined" && - typeof (vm.$props[objectKey]) !== "undefined" && - typeof (vm.$getOptions()[objectKey]) === "undefined") { + typeof (vm.$props[objectKey]) !== "undefined") { vm.$set(vm.fConfigs, objectKey, vm.$props[objectKey]); } }); diff --git a/src/mixins/propsAndData.js b/src/mixins/propsAndData.js index 20ca28f..6551922 100644 --- a/src/mixins/propsAndData.js +++ b/src/mixins/propsAndData.js @@ -7,57 +7,57 @@ export const propsAndData = { }, sundayStart: { type: Boolean, - default: () => false + default: () => undefined }, placeholder: { type: [String, Boolean], - default: () => false + default: () => undefined }, dateFormat: { type: String }, isMultiple: { type: Boolean, - default: () => false + default: () => undefined }, isSeparately: { type: Boolean, - default: () => false + default: () => undefined }, isDatePicker: { type: Boolean, - default: () => false + default: () => undefined }, isMultipleDatePicker: { type: Boolean, - default: () => false + default: () => undefined }, isDateRange: { type: Boolean, - default: () => false + default: () => undefined }, withTimePicker: { type: Boolean, - default: () => false + default: () => undefined }, calendarsCount: { type: Number }, isModal: { type: Boolean, - default: () => false + default: () => undefined }, isTypeable: { type: Boolean, - default: () => false + default: () => undefined }, changeMonthFunction: { type: Boolean, - default: () => false + default: () => undefined }, changeYearFunction: { type: Boolean, - default: () => false + default: () => undefined }, changeYearStep: { type: Number, @@ -65,7 +65,7 @@ export const propsAndData = { }, applyStylesheet: { type: Boolean, - default: () => true + default: () => undefined }, newCurrentDate: { type: Date @@ -85,15 +85,15 @@ export const propsAndData = { }, limits: { type: [Object, Boolean], - default: () => false + default: () => undefined }, minSelDays: { type: [Number, Boolean], - default: () => false + default: () => undefined }, maxSelDays: { type: [Number, Boolean], - default: () => false + default: () => undefined }, dayNames: { type: Array, @@ -106,25 +106,25 @@ export const propsAndData = { }, showWeekNumbers: { type: Boolean, - default: () => false + default: () => undefined }, value: { type: Object }, transition: { type: Boolean, - default: () => true + default: () => undefined }, hiddenElements: { type: Array }, isAutoCloseable: { type: Boolean, - default: false, + default: undefined, }, isDark: { type: Boolean, - default: false + default: undefined } }, data() {