remove extra old code + fix middleware JS set layout (#82)
Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
parent
ea85ed42fa
commit
049649a81e
|
@ -100,13 +100,10 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequest
|
||||||
|
|
||||||
// Date field
|
// Date field
|
||||||
'properties.*.with_time' => 'boolean|nullable',
|
'properties.*.with_time' => 'boolean|nullable',
|
||||||
'properties.*.use_am_pm' => 'boolean|nullable',
|
|
||||||
'properties.*.date_range' => 'boolean|nullable',
|
'properties.*.date_range' => 'boolean|nullable',
|
||||||
'properties.*.prefill_today' => 'boolean|nullable',
|
'properties.*.prefill_today' => 'boolean|nullable',
|
||||||
'properties.*.disable_past_dates' => 'boolean|nullable',
|
'properties.*.disable_past_dates' => 'boolean|nullable',
|
||||||
'properties.*.disable_future_dates' => 'boolean|nullable',
|
'properties.*.disable_future_dates' => 'boolean|nullable',
|
||||||
'properties.*.simple_date_input' => 'boolean|nullable',
|
|
||||||
'properties.*.simple_date_input_format' => 'string|nullable',
|
|
||||||
|
|
||||||
// Select / Multi Select field
|
// Select / Multi Select field
|
||||||
'properties.*.allow_creation' => 'boolean|nullable',
|
'properties.*.allow_creation' => 'boolean|nullable',
|
||||||
|
|
|
@ -435,9 +435,6 @@ export default {
|
||||||
} else if (field.date_range) {
|
} else if (field.date_range) {
|
||||||
inputProperties.dateRange = true
|
inputProperties.dateRange = true
|
||||||
}
|
}
|
||||||
if (field.use_am_pm) {
|
|
||||||
inputProperties.amPm = true
|
|
||||||
}
|
|
||||||
if (field.disable_past_dates) {
|
if (field.disable_past_dates) {
|
||||||
inputProperties.disablePastDates = true
|
inputProperties.disablePastDates = true
|
||||||
} else if (field.disable_future_dates) {
|
} else if (field.disable_future_dates) {
|
||||||
|
|
|
@ -419,9 +419,6 @@ export default {
|
||||||
if (['text', 'number', 'url', 'email', 'phone_number'].includes(this.field.type) && !this.field.max_char_limit) {
|
if (['text', 'number', 'url', 'email', 'phone_number'].includes(this.field.type) && !this.field.max_char_limit) {
|
||||||
this.field.max_char_limit = 2000
|
this.field.max_char_limit = 2000
|
||||||
}
|
}
|
||||||
if (this.field.type == 'date' && !this.field.simple_date_input_format) {
|
|
||||||
this.field.simple_date_input_format = this.dateFormatOptions[0]['value']
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -463,14 +460,12 @@ export default {
|
||||||
if (this.field.date_range) {
|
if (this.field.date_range) {
|
||||||
this.$set(this.field, 'with_time', false)
|
this.$set(this.field, 'with_time', false)
|
||||||
this.$set(this.field, 'prefill_today', false)
|
this.$set(this.field, 'prefill_today', false)
|
||||||
this.$set(this.field, 'simple_date_input', false)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onFieldWithTimeChange(val) {
|
onFieldWithTimeChange(val) {
|
||||||
this.$set(this.field, 'with_time', val)
|
this.$set(this.field, 'with_time', val)
|
||||||
if (this.field.with_time) {
|
if (this.field.with_time) {
|
||||||
this.$set(this.field, 'date_range', false)
|
this.$set(this.field, 'date_range', false)
|
||||||
this.$set(this.field, 'simple_date_input', false)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onFieldGenUIdChange(val) {
|
onFieldGenUIdChange(val) {
|
||||||
|
@ -538,13 +533,6 @@ export default {
|
||||||
this.$set(this.field, 'disable_past_dates', false)
|
this.$set(this.field, 'disable_past_dates', false)
|
||||||
this.$set(this.field, 'prefill_today', false)
|
this.$set(this.field, 'prefill_today', false)
|
||||||
}
|
}
|
||||||
},
|
|
||||||
onFieldSimpleDateInputChange(val) {
|
|
||||||
this.$set(this.field, 'simple_date_input', val)
|
|
||||||
if (this.field.simple_date_input) {
|
|
||||||
this.$set(this.field, 'with_time', false)
|
|
||||||
this.$set(this.field, 'date_range', false)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -237,10 +237,6 @@ function scrollBehavior (to, from, savedPosition) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {Object} requireContext
|
|
||||||
* @return {Object}
|
|
||||||
*/
|
|
||||||
/**
|
/**
|
||||||
* @param {Object} requireContext
|
* @param {Object} requireContext
|
||||||
* @return {Object}
|
* @return {Object}
|
||||||
|
|
Loading…
Reference in New Issue