EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsove76d77e7038c
diff --git a/client/src/views/fields/base.js b/client/src/views/fields/base.jsindex 97459c97ba..969754723b 100644--- a/client/src/views/fields/base.js+++ b/client/src/views/fields/base.js@@ -299,13 +299,22 @@ class BaseFieldView extends View {$label = null/**- * A form element.+ * A main form element. Use `mainInputElement` instead.** @type {JQuery|null}* @protected*/$element = null+ /**+ * A main form element.+ *+ * @protected+ * @type {HTMLInputElement|HTMLTextAreaElement|HTMLSelectElement|null}+ * @since 9.2.0+ */+ mainInputElement = null+/*** Is searchable once a search filter is added (no need to type or selecting anything).* Actual for search mode.@@ -1168,15 +1177,11 @@ class BaseFieldView extends View {* @protected*/initElement() {- this.$element = this.$el.find('[data-name="' + this.name + '"]');+ this.mainInputElement = this.element?.querySelector(`[data-name="${this.name}"]`) ??+ this.element?.querySelector(`[name="${this.name}"]`) ??+ this.element?.querySelector('.main-element');- if (!this.$element.length) {- this.$element = this.$el.find('[name="' + this.name + '"]');- }-- if (!this.$element.length) {- this.$element = this.$el.find('.main-element');- }+ this.$element = this.mainInputElement ? $(this.mainInputElement) : $();if (this.isEditMode()) {this.$element.on('change', () => {diff --git a/client/src/views/fields/date.js b/client/src/views/fields/date.jsindex 69917bfc85..692bbfaf10 100644--- a/client/src/views/fields/date.js+++ b/client/src/views/fields/date.js@@ -237,7 +237,11 @@ class DateFieldView extends BaseFieldView {setupSearch() {this.addHandler('change', 'select.search-type', (e, /** HTMLSelectElement */target) => {this.handleSearchType(target.value);++ this.trigger('change');});++ this.addHandler('change', 'input.number', () => this.trigger('change'));}stringifyDateValue(value) {@@ -345,13 +349,10 @@ class DateFieldView extends BaseFieldView {}afterRender() {- if (this.mode === this.MODE_EDIT || this.mode === this.MODE_SEARCH) {+ if (this.isEditMode() || this.isSearchMode()) {+ this.mainInputElement = this.element?.querySelector(`[data-name="${this.name}"]`);-- this.$element = this.$el.find(`[data-name="${this.name}"]`);-- /** @type {HTMLElement} */- const element = this.$element.get(0);+ this.$element = $(this.mainInputElement);const options = {format: this.getDateTime().dateFormat,@@ -362,35 +363,34 @@ class DateFieldView extends BaseFieldView {this.datepicker = undefined;- if (element) {- this.datepicker = new Datepicker(element, {+ if (this.mainInputElement instanceof HTMLInputElement) {+ this.datepicker = new Datepicker(this.mainInputElement, {...options,onChange: () => this.trigger('change'),});}- if (this.mode === this.MODE_SEARCH) {- this.$el.find('select.search-type').on('change', () => this.trigger('change'));- this.$el.find('input.number').on('change', () => this.trigger('change'));-- const element = this.$el.find('.input-group.additional').get(0);+ if (this.isSearchMode()) {+ const additionalGroup = this.element?.querySelector('.input-group.additional');- if (element) {- new Datepicker(element, options)+ if (additionalGroup) {+ new Datepicker(additionalGroup, options)this.initDatePickerEventHandlers('input.filter-from');this.initDatePickerEventHandlers('input.filter-to');}}- this.$element.parent().find('button.date-picker-btn').on('click', () => {- this.datepicker.show();- });+ const button = this.mainInputElement?.parentNode.querySelector('button.date-picker-btn');++ if (button instanceof HTMLElement) {+ button.addEventListener('click', () => this.datepicker.show());+ }- if (this.mode === this.MODE_SEARCH) {- const $searchType = this.$el.find('select.search-type');+ if (this.isSearchMode()) {+ const type = this.fetchSearchType();- this.handleSearchType($searchType.val());+ this.handleSearchType(type);}}}@@ -400,14 +400,18 @@ class DateFieldView extends BaseFieldView {* @param {string} selector*/initDatePickerEventHandlers(selector) {- const $input = this.$el.find(selector);+ const input = this.element?.querySelector(selector);++ if (!(input instanceof HTMLInputElement)) {+ return;+ }- $input.on('change', /** Record */e => {+ $(input).on('change', /** Record */e => {this.trigger('change');if (e.isTrigger) {- if (document.activeElement !== $input.get(0)) {- $input.focus();+ if (document.activeElement !== input) {+ input.focus({preventScroll: true});}}});@@ -470,7 +474,7 @@ class DateFieldView extends BaseFieldView {fetch() {const data = {};- data[this.name] = this.parse(this.$element.val());+ data[this.name] = this.parse(this.mainInputElement?.value ?? '');return data;}