merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4824 from devansh-webkul/ui-date-component-enhancement 

Date And Datetime Component Enhanced #4816
This commit is contained in:
Glenn Hermans 2021-04-29 18:57:24 +02:00 committed by GitHub
parent d8500435c8 fef39563ef
commit 1027ffce68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=928bc19bf654fa8ff6ee",
"/js/ui.js": "/js/ui.js?id=17cc5cd09cb49a3d8b25",
"/css/ui.css": "/css/ui.css?id=6d93a4a052e38d6aa795"
}

19
packages/Webkul/Ui/src/Resources/assets/js/components/date.vue
View File

@ -2,9 +2,9 @@
<span>
<slot>
<input
class="control"
type="text"
:name="name"
class="control"
:value="value"
data-input
/>
@ -28,6 +28,8 @@ export default {
value: String,
disable: Array,
minDate: String,
maxDate: String,
@ -51,8 +53,11 @@ export default {
setOptions: function() {
let self = this;
let options = {
return {
allowInput: true,
disable: this.disable ?? [],
minDate: this.minDate ?? '',
maxDate: this.maxDate ?? '',
altFormat: "Y-m-d",
dateFormat: "Y-m-d",
weekNumbers: true,
@ -60,16 +65,6 @@ export default {
self.$emit("onChange", dateStr);
}
};
if (this.minDate) {
options.minDate = this.minDate;
}
if (this.maxDate) {
options.maxDate = this.maxDate;
}
return options;
},
activate: function(options) {

19
packages/Webkul/Ui/src/Resources/assets/js/components/datetime.vue
View File

@ -2,9 +2,9 @@
<span>
<slot>
<input
class="control"
type="text"
:name="name"
class="control"
:value="value"
data-input
/>
@ -28,6 +28,8 @@ export default {
value: String,
disable: Array,
minDate: String,
maxDate: String,
@ -51,8 +53,11 @@ export default {
setOptions: function() {
let self = this;
let options = {
return {
allowInput: true,
disable: this.disable ?? [],
minDate: this.minDate ?? '',
maxDate: this.maxDate ?? '',
altFormat: "Y-m-d H:i:S",
dateFormat: "Y-m-d H:i:S",
enableTime: true,
@ -62,16 +67,6 @@ export default {
self.$emit("onChange", dateStr);
}
};
if (this.minDate) {
options.minDate = this.minDate;
}
if (this.maxDate) {
options.maxDate = this.maxDate;
}
return options;
},
activate: function(options) {