From b479c1f87f96c3ad73b5c6bae5bb1b5ab185e6f4 Mon Sep 17 00:00:00 2001 From: KBuild Date: Wed, 8 May 2019 21:19:05 +0900 Subject: [PATCH 1/2] change some date format string for ja(maybe this commit works on other asian lanuages) --- README.md | 3 ++- .../_subs/PickersContainer/_subs/DatePicker/index.vue | 8 ++++++-- .../_subs/PickersContainer/_subs/HeaderPicker.vue | 6 ++++-- src/VueCtkDateTimePicker/_subs/PickersContainer/index.vue | 5 ++++- src/VueCtkDateTimePicker/index.vue | 4 +++- src/VueCtkDateTimePicker/modules/month.js | 2 +- src/assets/scss/helpers/_flex.scss | 3 +++ 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 533ab726..556653e4 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ Here is an example of UMD implementation: https://codepen.io/louismazel/pen/jQWN | no-keyboard (12) | Boolean | no | false | | right (13) | Boolean | no | false | | noClearButton | Boolean | no | false | +| reverseYMOrder | Boolean | no | false | (1) hint : Is a text that replaces the label/placeholder (Ex : Error designation) @@ -240,4 +241,4 @@ This project is licensed under [MIT License](http://en.wikipedia.org/wiki/MIT_Li # Credit -Open source time proudly sponsored by [Chronotruck](https://www.chronotruck.com) \ No newline at end of file +Open source time proudly sponsored by [Chronotruck](https://www.chronotruck.com) diff --git a/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/DatePicker/index.vue b/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/DatePicker/index.vue index cb5cad42..a505dc28 100644 --- a/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/DatePicker/index.vue +++ b/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/DatePicker/index.vue @@ -29,10 +29,12 @@
import moment from 'moment' + const YEAR_REGEX = new RegExp('([/, -]+)?(YYYYY?|YY|Yr)[年년年]?([/, -]+)?') export default { name: 'HeaderPicker', @@ -116,6 +117,7 @@ onlyTime: { type: Boolean, default: Boolean }, transitionName: { type: String, default: String }, format: { type: String, default: String }, + locale: { type: String, default: String }, timeFormat: { type: String, default: String }, noTime: { type: Boolean, default: Boolean }, range: { type: Boolean, default: Boolean }, @@ -139,10 +141,10 @@ return date }, year () { - return this.dateTime.format('YYYY') + return this.dateTime.year() }, getDateFormatted () { - return this.dateTime.format('ddd D MMM') + return this.dateTime.format(moment.localeData(this.locale).longDateFormat('LL').replace(YEAR_REGEX, '')) }, isFormatTwelve () { return this.format ? (this.format.indexOf('a') > -1) || (this.format.indexOf('A') > -1) : false diff --git a/src/VueCtkDateTimePicker/_subs/PickersContainer/index.vue b/src/VueCtkDateTimePicker/_subs/PickersContainer/index.vue index e37f83d1..0f8165ac 100644 --- a/src/VueCtkDateTimePicker/_subs/PickersContainer/index.vue +++ b/src/VueCtkDateTimePicker/_subs/PickersContainer/index.vue @@ -22,6 +22,7 @@ :only-time="onlyTime" :format="format" :time-format="timeFormat" + :locale="locale" :transition-name="transitionName" :no-time="onlyDate" :dark="dark" @@ -51,6 +52,7 @@ :custom-shortcuts="customShortcuts" :no-keyboard="noKeyboard" :locale="locale" + :reverse-y-m-order="reverseYMOrder" @change-month="changeMonth" @change-year-month="changeYearMonth" @close="$emit('close')" @@ -137,7 +139,8 @@ firstDayOfWeek: { type: Number, default: Number }, customShortcuts: { type: Array, default: Array }, noKeyboard: { type: Boolean, default: false }, - right: { type: Boolean, default: false } + right: { type: Boolean, default: false }, + reverseYMOrder: { type: Boolean, default: false } }, data () { return { diff --git a/src/VueCtkDateTimePicker/index.vue b/src/VueCtkDateTimePicker/index.vue index a4a4f9ff..281fd048 100644 --- a/src/VueCtkDateTimePicker/index.vue +++ b/src/VueCtkDateTimePicker/index.vue @@ -63,6 +63,7 @@ :custom-shortcuts="customShortcuts" :no-keyboard="noKeyboard" :right="right" + :reverse-y-m-order="reverseYMOrder" @validate="validate" @close="toggleDatePicker(false)" /> @@ -154,7 +155,8 @@ noValueToCustomElem: { type: Boolean, default: false }, noKeyboard: { type: Boolean, default: false }, right: { type: Boolean, default: false }, - noClearButton: { type: Boolean, default: false } + noClearButton: { type: Boolean, default: false }, + reverseYMOrder: { type: Boolean, default: false } }, data () { return { diff --git a/src/VueCtkDateTimePicker/modules/month.js b/src/VueCtkDateTimePicker/modules/month.js index 4e13e248..54e609fa 100644 --- a/src/VueCtkDateTimePicker/modules/month.js +++ b/src/VueCtkDateTimePicker/modules/month.js @@ -16,7 +16,7 @@ export default class Month { } getFormatted () { - return this.start.format('MMMM') + return this.start.format('MMM') } getYear () { diff --git a/src/assets/scss/helpers/_flex.scss b/src/assets/scss/helpers/_flex.scss index 895928d9..9dacce31 100644 --- a/src/assets/scss/helpers/_flex.scss +++ b/src/assets/scss/helpers/_flex.scss @@ -146,3 +146,6 @@ .flex-grow { flex-grow: 1; } +.flex-direction-reversed { + flex-direction: row-reverse; +} From 07ea5e6081d14fd1391db3fe6ba6fab99d32b995 Mon Sep 17 00:00:00 2001 From: KBuild Date: Wed, 8 May 2019 21:42:36 +0900 Subject: [PATCH 2/2] stop with prevent --- src/VueCtkDateTimePicker/_subs/CustomButton.vue | 2 +- .../_subs/PickersContainer/_subs/ButtonValidate.vue | 2 +- src/VueCtkDateTimePicker/_subs/PickersContainer/index.vue | 2 +- src/VueCtkDateTimePicker/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/VueCtkDateTimePicker/_subs/CustomButton.vue b/src/VueCtkDateTimePicker/_subs/CustomButton.vue index 38ed7f72..2e26c116 100644 --- a/src/VueCtkDateTimePicker/_subs/CustomButton.vue +++ b/src/VueCtkDateTimePicker/_subs/CustomButton.vue @@ -10,7 +10,7 @@ }" tabindex="-1" type="button" - @click.stop="$emit('click')" + @click.prevent.stop="$emit('click')" @focus="$emit('focus')" @blur="$emit('blur')" @mouseover="$emit('mouseover')" diff --git a/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/ButtonValidate.vue b/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/ButtonValidate.vue index abf6a8b1..89011e18 100644 --- a/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/ButtonValidate.vue +++ b/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/ButtonValidate.vue @@ -27,7 +27,7 @@ type="button" tabindex="-1" class="datepicker-button validate flex align-center justify-content-center" - @click.stop="$emit('validate')" + @click.prevent.stop="$emit('validate')" >