@syncfusion/ej2-schedule 26.1.40 → 26.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ej2-schedule.min.js +2 -2
- package/dist/ej2-schedule.umd.min.js +2 -2
- package/dist/ej2-schedule.umd.min.js.map +1 -1
- package/dist/es6/ej2-schedule.es2015.js +257 -120
- package/dist/es6/ej2-schedule.es2015.js.map +1 -1
- package/dist/es6/ej2-schedule.es5.js +258 -120
- package/dist/es6/ej2-schedule.es5.js.map +1 -1
- package/dist/global/ej2-schedule.min.js +2 -2
- package/dist/global/ej2-schedule.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/hotfix/26.1.35_Vol2.txt +1 -0
- package/package.json +15 -15
- package/src/recurrence-editor/date-generator.js +3 -0
- package/src/schedule/actions/drag.d.ts +2 -0
- package/src/schedule/actions/drag.js +45 -17
- package/src/schedule/actions/resize.js +20 -20
- package/src/schedule/actions/touch.js +1 -0
- package/src/schedule/actions/virtual-scroll.d.ts +4 -0
- package/src/schedule/actions/virtual-scroll.js +78 -29
- package/src/schedule/base/interface.d.ts +3 -0
- package/src/schedule/base/schedule.d.ts +25 -0
- package/src/schedule/base/schedule.js +36 -1
- package/src/schedule/base/util.d.ts +10 -5
- package/src/schedule/base/util.js +15 -10
- package/src/schedule/event-renderer/inline-edit.js +4 -4
- package/src/schedule/event-renderer/month.js +3 -3
- package/src/schedule/event-renderer/timeline-view.js +4 -4
- package/src/schedule/event-renderer/vertical-view.js +2 -2
- package/src/schedule/event-renderer/year.js +5 -5
- package/src/schedule/popups/event-window.d.ts +1 -0
- package/src/schedule/popups/event-window.js +13 -10
- package/src/schedule/renderer/timeline-view.js +4 -4
- package/src/schedule/renderer/vertical-view.js +23 -9
- package/src/schedule/renderer/view-base.js +1 -1
- package/styles/fluent2.css +11 -11
- package/styles/recurrence-editor/fluent2.css +10 -10
- package/styles/schedule/fluent2.css +11 -11
|
@@ -10,17 +10,19 @@ export declare const MS_PER_MINUTE: number;
|
|
|
10
10
|
*
|
|
11
11
|
* @param {Element} container Accepts the DOM element
|
|
12
12
|
* @param {string} elementClass Accepts the element class
|
|
13
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
13
14
|
* @returns {number} Returns the height of the element
|
|
14
15
|
*/
|
|
15
|
-
export declare function getElementHeightFromClass(container: Element, elementClass: string): number;
|
|
16
|
+
export declare function getElementHeightFromClass(container: Element, elementClass: string, isTransformed?: boolean): number;
|
|
16
17
|
/**
|
|
17
18
|
* Method to get width from element
|
|
18
19
|
*
|
|
19
20
|
* @param {Element} container Accepts the DOM element
|
|
20
21
|
* @param {string} elementClass Accepts the element class
|
|
22
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
21
23
|
* @returns {number} Returns the width of the element
|
|
22
24
|
*/
|
|
23
|
-
export declare function getElementWidthFromClass(container: Element, elementClass: string): number;
|
|
25
|
+
export declare function getElementWidthFromClass(container: Element, elementClass: string, isTransformed?: boolean): number;
|
|
24
26
|
/**
|
|
25
27
|
* Method to get translateY value
|
|
26
28
|
*
|
|
@@ -242,20 +244,23 @@ export declare function capitalizeFirstWord(inputString: string, type: string):
|
|
|
242
244
|
* Method to get element cell width
|
|
243
245
|
*
|
|
244
246
|
* @param {HTMLElement} element Accepts the DOM element
|
|
247
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
245
248
|
* @returns {number} Returns the width of the given element
|
|
246
249
|
*/
|
|
247
|
-
export declare function getElementWidth(element: HTMLElement): number;
|
|
250
|
+
export declare function getElementWidth(element: HTMLElement, isTransformed?: boolean): number;
|
|
248
251
|
/**
|
|
249
252
|
* Method to get element cell Height
|
|
250
253
|
*
|
|
251
254
|
* @param {HTMLElement} element Accepts the DOM element
|
|
255
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
252
256
|
* @returns {number} Returns the Height of the given element
|
|
253
257
|
*/
|
|
254
|
-
export declare function getElementHeight(element: HTMLElement): number;
|
|
258
|
+
export declare function getElementHeight(element: HTMLElement, isTransformed?: boolean): number;
|
|
255
259
|
/**
|
|
256
260
|
* Method to get element cell Top
|
|
257
261
|
*
|
|
258
262
|
* @param {HTMLElement} element Accepts the DOM element
|
|
263
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
259
264
|
* @returns {number} Returns the top value of the given element
|
|
260
265
|
*/
|
|
261
|
-
export declare function getElementTop(element: HTMLElement): number;
|
|
266
|
+
export declare function getElementTop(element: HTMLElement, isTransformed?: boolean): number;
|
|
@@ -12,15 +12,16 @@ export var MS_PER_MINUTE = 60000;
|
|
|
12
12
|
*
|
|
13
13
|
* @param {Element} container Accepts the DOM element
|
|
14
14
|
* @param {string} elementClass Accepts the element class
|
|
15
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
15
16
|
* @returns {number} Returns the height of the element
|
|
16
17
|
*/
|
|
17
|
-
export function getElementHeightFromClass(container, elementClass) {
|
|
18
|
+
export function getElementHeightFromClass(container, elementClass, isTransformed) {
|
|
18
19
|
var height = 0;
|
|
19
20
|
var el = createElement('div', { className: elementClass }).cloneNode();
|
|
20
21
|
el.style.visibility = 'hidden';
|
|
21
22
|
el.style.position = 'absolute';
|
|
22
23
|
container.appendChild(el);
|
|
23
|
-
height = getElementHeight(el);
|
|
24
|
+
height = getElementHeight(el, isTransformed);
|
|
24
25
|
remove(el);
|
|
25
26
|
return height;
|
|
26
27
|
}
|
|
@@ -29,15 +30,16 @@ export function getElementHeightFromClass(container, elementClass) {
|
|
|
29
30
|
*
|
|
30
31
|
* @param {Element} container Accepts the DOM element
|
|
31
32
|
* @param {string} elementClass Accepts the element class
|
|
33
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
32
34
|
* @returns {number} Returns the width of the element
|
|
33
35
|
*/
|
|
34
|
-
export function getElementWidthFromClass(container, elementClass) {
|
|
36
|
+
export function getElementWidthFromClass(container, elementClass, isTransformed) {
|
|
35
37
|
var width = 0;
|
|
36
38
|
var el = createElement('div', { className: elementClass }).cloneNode();
|
|
37
39
|
el.style.visibility = 'hidden';
|
|
38
40
|
el.style.position = 'absolute';
|
|
39
41
|
container.appendChild(el);
|
|
40
|
-
width = getElementWidth(el);
|
|
42
|
+
width = getElementWidth(el, isTransformed);
|
|
41
43
|
remove(el);
|
|
42
44
|
return width;
|
|
43
45
|
}
|
|
@@ -429,26 +431,29 @@ export function capitalizeFirstWord(inputString, type) {
|
|
|
429
431
|
* Method to get element cell width
|
|
430
432
|
*
|
|
431
433
|
* @param {HTMLElement} element Accepts the DOM element
|
|
434
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
432
435
|
* @returns {number} Returns the width of the given element
|
|
433
436
|
*/
|
|
434
|
-
export function getElementWidth(element) {
|
|
435
|
-
return
|
|
437
|
+
export function getElementWidth(element, isTransformed) {
|
|
438
|
+
return isTransformed ? element.offsetWidth : element.getBoundingClientRect().width;
|
|
436
439
|
}
|
|
437
440
|
/**
|
|
438
441
|
* Method to get element cell Height
|
|
439
442
|
*
|
|
440
443
|
* @param {HTMLElement} element Accepts the DOM element
|
|
444
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
441
445
|
* @returns {number} Returns the Height of the given element
|
|
442
446
|
*/
|
|
443
|
-
export function getElementHeight(element) {
|
|
444
|
-
return
|
|
447
|
+
export function getElementHeight(element, isTransformed) {
|
|
448
|
+
return isTransformed ? element.offsetHeight : element.getBoundingClientRect().height;
|
|
445
449
|
}
|
|
446
450
|
/**
|
|
447
451
|
* Method to get element cell Top
|
|
448
452
|
*
|
|
449
453
|
* @param {HTMLElement} element Accepts the DOM element
|
|
454
|
+
* @param {boolean} isTransformed Accepts the boolean value that indicates the status of the transform style applied to the element
|
|
450
455
|
* @returns {number} Returns the top value of the given element
|
|
451
456
|
*/
|
|
452
|
-
export function getElementTop(element) {
|
|
453
|
-
return
|
|
457
|
+
export function getElementTop(element, isTransformed) {
|
|
458
|
+
return isTransformed ? element.offsetTop : element.getBoundingClientRect().top;
|
|
454
459
|
}
|
|
@@ -108,11 +108,11 @@ var InlineEdit = /** @class */ (function () {
|
|
|
108
108
|
var allDayElements = [].slice.call(this.parent.element.querySelectorAll('.' + cls.ALLDAY_APPOINTMENT_CLASS));
|
|
109
109
|
var allDayLevel = 0;
|
|
110
110
|
if (allDayElements.length > 0) {
|
|
111
|
-
allDayLevel = Math.floor(
|
|
111
|
+
allDayLevel = Math.floor(this.parent.getElementHeight(this.parent.element.querySelector('.' + cls.ALLDAY_ROW_CLASS)) /
|
|
112
112
|
allDayElements[0].offsetHeight) - 1;
|
|
113
113
|
}
|
|
114
114
|
verticalEvent.allDayLevel = allDayLevel;
|
|
115
|
-
var appHeight =
|
|
115
|
+
var appHeight = this.parent.getElementHeightFromClass(this.parent.element.querySelector('.' + cls.ALLDAY_APPOINTMENT_WRAPPER_CLASS), cls.APPOINTMENT_CLASS);
|
|
116
116
|
var cellTop = verticalEvent.allDayElement.length > 0 ? verticalEvent.allDayElement[0].offsetTop : 0;
|
|
117
117
|
verticalEvent.renderAllDayEvents(saveObj, index, resIndex, daysCount, this.parent.allowInline, cellTop, appHeight);
|
|
118
118
|
}
|
|
@@ -140,7 +140,7 @@ var InlineEdit = /** @class */ (function () {
|
|
|
140
140
|
monthEvent.cellWidth = monthEvent.workCells[0].offsetWidth;
|
|
141
141
|
monthEvent.cellHeight = monthEvent.workCells[0].offsetHeight;
|
|
142
142
|
monthEvent.eventHeight =
|
|
143
|
-
|
|
143
|
+
this.parent.getElementHeightFromClass(this.parent.monthModule.element || monthEvent.element, cls.APPOINTMENT_CLASS);
|
|
144
144
|
monthEvent.getSlotDates(workDays);
|
|
145
145
|
var filteredDates = monthEvent.getRenderedDates(renderDates);
|
|
146
146
|
var spannedEvents = monthEvent.splitEvent(saveObject, filteredDates || renderDates);
|
|
@@ -164,7 +164,7 @@ var InlineEdit = /** @class */ (function () {
|
|
|
164
164
|
var dayLength = this.parent.element.querySelectorAll('.' + cls.CONTENT_TABLE_CLASS + ' tbody tr').length === 0 ?
|
|
165
165
|
0 : this.parent.element.querySelectorAll('.' + cls.CONTENT_TABLE_CLASS + ' tbody tr')[0].children.length;
|
|
166
166
|
timelineView.slotsPerDay = dayLength / timelineView.dateRender.length;
|
|
167
|
-
timelineView.eventHeight =
|
|
167
|
+
timelineView.eventHeight = this.parent.getElementHeightFromClass(timelineView.element, cls.APPOINTMENT_CLASS);
|
|
168
168
|
timelineView.renderEvents(saveObject, resIndex);
|
|
169
169
|
};
|
|
170
170
|
InlineEdit.prototype.getEventDaysCount = function (saveObj) {
|
|
@@ -96,7 +96,7 @@ var MonthEvent = /** @class */ (function (_super) {
|
|
|
96
96
|
this.monthHeaderHeight = wrapper.offsetTop - cellTd.offsetTop;
|
|
97
97
|
cellTd.removeChild(wrapper);
|
|
98
98
|
}
|
|
99
|
-
this.eventHeight =
|
|
99
|
+
this.eventHeight = this.parent.getElementHeightFromClass(this.element, cls.APPOINTMENT_CLASS);
|
|
100
100
|
var selector = '.' + cls.CONTENT_TABLE_CLASS + ' tbody tr';
|
|
101
101
|
this.addCellHeight(selector, this.eventHeight, (this.parent.currentView === 'Month' ? EVENT_GAP : 2), this.monthHeaderHeight, this.moreIndicatorHeight);
|
|
102
102
|
var scrollTop = conWrap.scrollTop;
|
|
@@ -175,8 +175,8 @@ var MonthEvent = /** @class */ (function (_super) {
|
|
|
175
175
|
});
|
|
176
176
|
}
|
|
177
177
|
var cellDetail = this.workCells[this.parent.activeView.isTimelineView() ? 0 : this.workCells.length - 1];
|
|
178
|
-
this.cellWidth =
|
|
179
|
-
this.cellHeight =
|
|
178
|
+
this.cellWidth = this.parent.getElementWidth(cellDetail);
|
|
179
|
+
this.cellHeight = this.parent.getElementHeight(cellDetail);
|
|
180
180
|
this.dateRender = dateRender;
|
|
181
181
|
var filteredDates = this.getRenderedDates(dateRender);
|
|
182
182
|
this.getSlotDates(workDays || this.parent.activeViewOptions.workDays);
|
|
@@ -48,7 +48,7 @@ var TimelineEvent = /** @class */ (function (_super) {
|
|
|
48
48
|
this.parent.activeViewOptions.headerRows.slice(-1)[0].option !== 'Hour') {
|
|
49
49
|
this.renderType = 'day';
|
|
50
50
|
var workCell = this.content.querySelector('.' + cls.WORK_CELLS_CLASS);
|
|
51
|
-
this.cellWidth =
|
|
51
|
+
this.cellWidth = this.parent.getElementWidth(workCell) / +(workCell.getAttribute('colspan') || 1);
|
|
52
52
|
this.slotsPerDay = 1;
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
@@ -218,14 +218,14 @@ var TimelineEvent = /** @class */ (function (_super) {
|
|
|
218
218
|
this.wireAppointmentEvents(appointmentElement, event);
|
|
219
219
|
if (this.parent.rowAutoHeight) {
|
|
220
220
|
var conWrap = this.parent.element.querySelector('.' + cls.CONTENT_WRAP_CLASS);
|
|
221
|
-
var conWidth =
|
|
221
|
+
var conWidth = this.parent.getElementWidth(conWrap);
|
|
222
222
|
var isWithoutScroll = conWrap.offsetHeight === conWrap.clientHeight &&
|
|
223
223
|
conWrap.offsetWidth === conWrap.clientWidth;
|
|
224
224
|
this.renderEventElement(event, appointmentElement, cellTd);
|
|
225
225
|
var firstChild = this.getFirstChild(resIndex);
|
|
226
226
|
this.updateCellHeight(firstChild, height);
|
|
227
227
|
if (isWithoutScroll &&
|
|
228
|
-
(conWrap.offsetWidth > conWrap.clientWidth || conWidth !==
|
|
228
|
+
(conWrap.offsetWidth > conWrap.clientWidth || conWidth !== this.parent.getElementWidth(conWrap))) {
|
|
229
229
|
this.adjustAppointments(conWidth);
|
|
230
230
|
}
|
|
231
231
|
}
|
|
@@ -344,7 +344,7 @@ var TimelineEvent = /** @class */ (function (_super) {
|
|
|
344
344
|
TimelineEvent.prototype.adjustAppointments = function (conWidth) {
|
|
345
345
|
var _this = this;
|
|
346
346
|
var tr = this.parent.element.querySelector('.' + cls.CONTENT_TABLE_CLASS + ' tbody tr');
|
|
347
|
-
var actualCellWidth =
|
|
347
|
+
var actualCellWidth = this.parent.getElementWidth(this.workCells[0]);
|
|
348
348
|
this.cellWidth = actualCellWidth / +(this.workCells[0].getAttribute('colspan') || 1);
|
|
349
349
|
var currentPercentage = (actualCellWidth * tr.children.length) / (conWidth / 100);
|
|
350
350
|
var apps = [].slice.call(this.parent.element.querySelectorAll('.' + cls.APPOINTMENT_CLASS));
|
|
@@ -129,7 +129,7 @@ var VerticalEvent = /** @class */ (function (_super) {
|
|
|
129
129
|
this.resources = this.parent.resourceBase.renderedResources;
|
|
130
130
|
}
|
|
131
131
|
this.cellHeight =
|
|
132
|
-
parseFloat(
|
|
132
|
+
parseFloat(this.parent.getElementHeight(this.parent.element.querySelector('.e-content-wrap tbody tr')).toFixed(2));
|
|
133
133
|
this.dateRender[0] = this.parent.activeView.renderDates;
|
|
134
134
|
if (this.parent.activeViewOptions.group.resources.length > 0) {
|
|
135
135
|
for (var i = 0, len = this.resources.length; i < len; i++) {
|
|
@@ -215,7 +215,7 @@ var VerticalEvent = /** @class */ (function (_super) {
|
|
|
215
215
|
var resources = this.getResourceList();
|
|
216
216
|
var dateCount = this.getStartCount();
|
|
217
217
|
var isRender;
|
|
218
|
-
var appHeight = eventType === 'allDayEvents' ?
|
|
218
|
+
var appHeight = eventType === 'allDayEvents' ? this.parent.getElementHeightFromClass(this.element.querySelector('.' + cls.ALLDAY_APPOINTMENT_WRAPPER_CLASS), cls.APPOINTMENT_CLASS) : 0;
|
|
219
219
|
var allDayRowTop = eventType === 'allDayEvents' && this.allDayElement.length > 0 ? this.allDayElement[0].offsetTop : 0;
|
|
220
220
|
var _loop_1 = function (resource) {
|
|
221
221
|
isRender = true;
|
|
@@ -89,10 +89,10 @@ var YearEvent = /** @class */ (function (_super) {
|
|
|
89
89
|
YearEvent.prototype.timelineYearViewEvents = function () {
|
|
90
90
|
var _this = this;
|
|
91
91
|
var workCell = this.parent.element.querySelector('.' + cls.WORK_CELLS_CLASS + ':not(.' + cls.OTHERMONTH_CLASS + ')');
|
|
92
|
-
this.cellWidth =
|
|
92
|
+
this.cellWidth = this.parent.getElementWidth(workCell);
|
|
93
93
|
this.cellHeader = util.getOuterHeight(workCell.querySelector('.' + cls.DATE_HEADER_CLASS));
|
|
94
94
|
var eventTable = this.parent.element.querySelector('.' + cls.EVENT_TABLE_CLASS);
|
|
95
|
-
this.eventHeight =
|
|
95
|
+
this.eventHeight = this.parent.getElementHeightFromClass(eventTable, cls.APPOINTMENT_CLASS);
|
|
96
96
|
var selector = "." + cls.MONTH_HEADER_WRAPPER + " tbody tr,." + cls.RESOURCE_COLUMN_TABLE_CLASS + " tbody tr,." + cls.CONTENT_TABLE_CLASS + " tbody tr";
|
|
97
97
|
this.addCellHeight(selector, this.eventHeight, EVENT_GAP, this.cellHeader, this.moreIndicatorHeight);
|
|
98
98
|
var wrapperCollection = [].slice.call(this.parent.element.querySelectorAll('.' + cls.APPOINTMENT_CONTAINER_CLASS));
|
|
@@ -248,10 +248,10 @@ var YearEvent = /** @class */ (function (_super) {
|
|
|
248
248
|
var contentTable = this.parent.element.querySelector('.' + cls.CONTENT_WRAP_CLASS);
|
|
249
249
|
var isVerticalScrollbarAvail = contentTable.offsetWidth > contentTable.clientWidth;
|
|
250
250
|
var workCell = this.parent.element.querySelector('.' + cls.WORK_CELLS_CLASS);
|
|
251
|
-
this.cellWidth =
|
|
251
|
+
this.cellWidth = this.parent.getElementWidth(workCell);
|
|
252
252
|
this.cellHeader = 0;
|
|
253
253
|
var eventTable = this.parent.element.querySelector('.' + cls.EVENT_TABLE_CLASS);
|
|
254
|
-
this.eventHeight =
|
|
254
|
+
this.eventHeight = this.parent.getElementHeightFromClass(eventTable, cls.APPOINTMENT_CLASS);
|
|
255
255
|
var selector = "." + cls.MONTH_HEADER_WRAPPER + " tbody tr,." + cls.RESOURCE_COLUMN_TABLE_CLASS + " tbody tr,." + cls.CONTENT_TABLE_CLASS + " tbody tr";
|
|
256
256
|
this.addCellHeight(selector, this.eventHeight, EVENT_GAP, this.cellHeader, this.moreIndicatorHeight);
|
|
257
257
|
var wrapperCollection = [].slice.call(this.parent.element.querySelectorAll('.' + cls.APPOINTMENT_CONTAINER_CLASS));
|
|
@@ -293,7 +293,7 @@ var YearEvent = /** @class */ (function (_super) {
|
|
|
293
293
|
appWrapper.forEach(function (appWrap, cellIndex) {
|
|
294
294
|
var td = row.querySelector("td:nth-child(" + (cellIndex + 1) + ")");
|
|
295
295
|
var app = [].slice.call(appWrap.children);
|
|
296
|
-
var width =
|
|
296
|
+
var width = _this.parent.getElementWidth(td);
|
|
297
297
|
var left = td.offsetLeft;
|
|
298
298
|
if (_this.parent.enableRtl) {
|
|
299
299
|
var right_1 = conTable_1.offsetWidth - left - td.offsetWidth;
|
|
@@ -35,6 +35,7 @@ export declare class EventWindow {
|
|
|
35
35
|
refreshRecurrenceEditor(): void;
|
|
36
36
|
setRecurrenceEditor(recurrenceEditor: RecurrenceEditor): void;
|
|
37
37
|
openEditor(data: Record<string, any>, type: CurrentAction, isEventData?: boolean, repeatType?: number): void;
|
|
38
|
+
private setEditorContent;
|
|
38
39
|
setDialogContent(): void;
|
|
39
40
|
setDialogHeader(): void;
|
|
40
41
|
setDialogFooter(): void;
|
|
@@ -159,8 +159,13 @@ var EventWindow = /** @class */ (function () {
|
|
|
159
159
|
this.addEventHandlers();
|
|
160
160
|
}
|
|
161
161
|
if (!isNullOrUndefined(this.parent.editorTemplate)) {
|
|
162
|
-
this.renderFormElements(this.element.querySelector('.e-schedule-form'), data);
|
|
162
|
+
this.renderFormElements(this.element.querySelector('.e-schedule-form'), data, type, repeatType);
|
|
163
163
|
}
|
|
164
|
+
else {
|
|
165
|
+
this.setEditorContent(data, type, repeatType);
|
|
166
|
+
}
|
|
167
|
+
};
|
|
168
|
+
EventWindow.prototype.setEditorContent = function (data, type, repeatType) {
|
|
164
169
|
if (!this.parent.isAdaptive && isNullOrUndefined(this.parent.editorTemplate)) {
|
|
165
170
|
removeClass([this.dialogObject.element.querySelector('.e-recurrenceeditor')], cls.DISABLE_CLASS);
|
|
166
171
|
}
|
|
@@ -341,7 +346,7 @@ var EventWindow = /** @class */ (function () {
|
|
|
341
346
|
container.appendChild(form);
|
|
342
347
|
return container;
|
|
343
348
|
};
|
|
344
|
-
EventWindow.prototype.renderFormElements = function (form, args) {
|
|
349
|
+
EventWindow.prototype.renderFormElements = function (form, args, type, repeatType) {
|
|
345
350
|
var _this = this;
|
|
346
351
|
if (!isNullOrUndefined(this.parent.editorTemplate)) {
|
|
347
352
|
if (args) {
|
|
@@ -370,15 +375,17 @@ var EventWindow = /** @class */ (function () {
|
|
|
370
375
|
this.parent.renderTemplates(function () {
|
|
371
376
|
if (_this.element) {
|
|
372
377
|
_this.applyFormValidation();
|
|
373
|
-
if (
|
|
374
|
-
_this.
|
|
375
|
-
_this.eventCrudData = null;
|
|
378
|
+
if (args) {
|
|
379
|
+
_this.setEditorContent(args, type, repeatType);
|
|
376
380
|
}
|
|
377
381
|
}
|
|
378
382
|
});
|
|
379
383
|
}
|
|
380
384
|
else {
|
|
381
385
|
form.appendChild(this.getDefaultEventWindowContent());
|
|
386
|
+
if (args) {
|
|
387
|
+
this.setEditorContent(args, type, repeatType);
|
|
388
|
+
}
|
|
382
389
|
}
|
|
383
390
|
};
|
|
384
391
|
EventWindow.prototype.getDefaultEventWindowContent = function () {
|
|
@@ -977,13 +984,9 @@ var EventWindow = /** @class */ (function () {
|
|
|
977
984
|
this.fieldValidator.renderFormValidator(form, rules, this.element, this.parent.locale);
|
|
978
985
|
};
|
|
979
986
|
EventWindow.prototype.showDetails = function (eventData) {
|
|
980
|
-
this.eventData =
|
|
987
|
+
this.eventData = eventData;
|
|
981
988
|
var eventObj = extend({}, eventData, null, true);
|
|
982
989
|
var formElements = this.getFormElements(cls.EVENT_WINDOW_DIALOG_CLASS);
|
|
983
|
-
if (this.parent.isReact && formElements.length < 1 && !this.cellClickAction) {
|
|
984
|
-
this.eventCrudData = eventObj;
|
|
985
|
-
return;
|
|
986
|
-
}
|
|
987
990
|
if ((!this.cellClickAction || this.cellClickAction && !isNullOrUndefined(this.parent.editorTemplate)) &&
|
|
988
991
|
eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
|
|
989
992
|
this.trimAllDay(eventObj);
|
|
@@ -72,7 +72,7 @@ var TimelineViews = /** @class */ (function (_super) {
|
|
|
72
72
|
}
|
|
73
73
|
var scrollLeft;
|
|
74
74
|
if (isNullOrUndefined(hour) || !this.parent.activeViewOptions.timeScale.enable) {
|
|
75
|
-
scrollLeft = index *
|
|
75
|
+
scrollLeft = index * this.parent.getElementWidth(this.element.querySelector('.e-work-cells'));
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
78
78
|
scrollLeft = isNullOrUndefined(scrollDate) ? this.getLeftFromDateTime(null, date) :
|
|
@@ -159,7 +159,7 @@ var TimelineViews = /** @class */ (function (_super) {
|
|
|
159
159
|
if (this.parent.activeView.colLevels[parseInt(index.toString(), 10)] &&
|
|
160
160
|
this.parent.activeView.colLevels[parseInt(index.toString(), 10)][0].colSpan) {
|
|
161
161
|
diffInDates = currentDateIndex[0] * this.parent.activeView.colLevels[parseInt(index.toString(), 10)][0].colSpan *
|
|
162
|
-
|
|
162
|
+
this.parent.getElementWidth(this.element.querySelector('.e-work-cells'));
|
|
163
163
|
}
|
|
164
164
|
else {
|
|
165
165
|
var endHour = this.getEndHour();
|
|
@@ -169,8 +169,8 @@ var TimelineViews = /** @class */ (function (_super) {
|
|
|
169
169
|
}
|
|
170
170
|
}
|
|
171
171
|
}
|
|
172
|
-
return diffInDates + ((diffInMinutes *
|
|
173
|
-
this.parent.activeViewOptions.timeScale.interval);
|
|
172
|
+
return diffInDates + ((diffInMinutes * this.parent.getElementWidth(this.element.querySelector('.e-work-cells'))
|
|
173
|
+
* this.parent.activeViewOptions.timeScale.slotCount) / this.parent.activeViewOptions.timeScale.interval);
|
|
174
174
|
};
|
|
175
175
|
TimelineViews.prototype.renderHeader = function () {
|
|
176
176
|
var tr = createElement('tr');
|
|
@@ -245,11 +245,8 @@ var VerticalView = /** @class */ (function (_super) {
|
|
|
245
245
|
var currentDate = this.parent.getCurrentTime();
|
|
246
246
|
if (this.parent.showTimeIndicator && this.isWorkHourRange(currentDate)) {
|
|
247
247
|
var currentDateIndex = this.getCurrentTimeIndicatorIndex();
|
|
248
|
-
if (currentDateIndex.length > 0) {
|
|
249
|
-
|
|
250
|
-
if (workCells.length > 0) {
|
|
251
|
-
this.changeCurrentTimePosition();
|
|
252
|
-
}
|
|
248
|
+
if (currentDateIndex.length > 0 && !isNullOrUndefined(this.element.querySelector('.' + cls.WORK_CELLS_CLASS))) {
|
|
249
|
+
this.changeCurrentTimePosition();
|
|
253
250
|
if (isNullOrUndefined(this.currentTimeIndicatorTimer)) {
|
|
254
251
|
var interval = util.MS_PER_MINUTE - ((currentDate.getSeconds() * 1000) + currentDate.getMilliseconds());
|
|
255
252
|
if (interval <= (util.MS_PER_MINUTE - 1000)) {
|
|
@@ -351,7 +348,11 @@ var VerticalView = /** @class */ (function (_super) {
|
|
|
351
348
|
}
|
|
352
349
|
for (var _i = 0, currentDateIndex_1 = currentDateIndex; _i < currentDateIndex_1.length; _i++) {
|
|
353
350
|
var day = currentDateIndex_1[_i];
|
|
354
|
-
curTimeWrap
|
|
351
|
+
if (curTimeWrap.length > day) {
|
|
352
|
+
curTimeWrap[parseInt(day.toString(), 10)].appendChild(createElement('div', {
|
|
353
|
+
className: cls.CURRENT_TIMELINE_CLASS, styles: 'top:' + topInPx
|
|
354
|
+
}));
|
|
355
|
+
}
|
|
355
356
|
}
|
|
356
357
|
var currentTimeEle = createElement('div', {
|
|
357
358
|
innerHTML: this.parent.getTimeString(this.parent.getCurrentTime()),
|
|
@@ -374,7 +375,7 @@ var VerticalView = /** @class */ (function (_super) {
|
|
|
374
375
|
this.parent.activeViewOptions.timeScale.interval;
|
|
375
376
|
};
|
|
376
377
|
VerticalView.prototype.getWorkCellHeight = function () {
|
|
377
|
-
return parseFloat(
|
|
378
|
+
return parseFloat(this.parent.getElementHeight(this.element.querySelector('.' + cls.WORK_CELLS_CLASS)).toFixed(2));
|
|
378
379
|
};
|
|
379
380
|
VerticalView.prototype.getTdContent = function (date, type, groupIndex) {
|
|
380
381
|
var cntEle;
|
|
@@ -677,12 +678,25 @@ var VerticalView = /** @class */ (function (_super) {
|
|
|
677
678
|
var rows = [];
|
|
678
679
|
var tr = createElement('tr');
|
|
679
680
|
var td = createElement('td', { attrs: { 'aria-selected': 'false' } });
|
|
681
|
+
var existingGroupIndices = new Set();
|
|
682
|
+
if (this.parent.virtualScrollModule && this.parent.activeViewOptions.group.resources.length > 0 &&
|
|
683
|
+
this.parent.virtualScrollModule.existingDataCollection.length > 0) {
|
|
684
|
+
existingGroupIndices = new Set(this.parent.virtualScrollModule.existingDataCollection.map(function (data) { return data.groupIndex; }));
|
|
685
|
+
}
|
|
680
686
|
var handler = function (r) {
|
|
681
687
|
var ntr = tr.cloneNode();
|
|
682
688
|
for (var _i = 0, _a = _this.colLevels[_this.colLevels.length - 1]; _i < _a.length; _i++) {
|
|
683
689
|
var tdData = _a[_i];
|
|
684
|
-
var
|
|
685
|
-
|
|
690
|
+
var isAllowTdCreation = true;
|
|
691
|
+
if (_this.parent.virtualScrollModule && _this.parent.activeViewOptions.group.resources.length > 0) {
|
|
692
|
+
if (existingGroupIndices.has(tdData.groupIndex)) {
|
|
693
|
+
isAllowTdCreation = false;
|
|
694
|
+
}
|
|
695
|
+
}
|
|
696
|
+
if (isAllowTdCreation) {
|
|
697
|
+
var ntd = _this.createContentTd(tdData, r, td);
|
|
698
|
+
ntr.appendChild(ntd);
|
|
699
|
+
}
|
|
686
700
|
}
|
|
687
701
|
rows.push(ntr);
|
|
688
702
|
return r;
|
|
@@ -493,7 +493,7 @@ var ViewBase = /** @class */ (function () {
|
|
|
493
493
|
if (this.isTimelineView()) {
|
|
494
494
|
var colElements = this.getColElements();
|
|
495
495
|
var contentBody = this.element.querySelector('.' + cls.CONTENT_TABLE_CLASS + ' tbody');
|
|
496
|
-
var colWidth_1 = (
|
|
496
|
+
var colWidth_1 = (this.parent.getElementWidth(contentBody) / (colElements.length / 2));
|
|
497
497
|
if (content.offsetHeight !== content.clientHeight) {
|
|
498
498
|
var resourceColumn = this.parent.element.querySelector('.' + cls.RESOURCE_COLUMN_WRAP_CLASS);
|
|
499
499
|
if (!isNullOrUndefined(resourceColumn) && resourceColumn.offsetHeight !== content.clientHeight) {
|
package/styles/fluent2.css
CHANGED
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
--color-sf-flyout-bg-color-pressed: #e0e0e0;
|
|
48
48
|
--color-sf-flyout-bg-color-selected: #ebebeb;
|
|
49
49
|
--color-sf-flyout-bg-color-focus: #f5f5f5;
|
|
50
|
-
--color-sf-overlay-bg-color:
|
|
50
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
51
51
|
--color-sf-table-bg-color-hover: #f5f5f5;
|
|
52
52
|
--color-sf-table-bg-color-pressed: #e0e0e0;
|
|
53
53
|
--color-sf-table-bg-color-selected: #ebf3fc;
|
|
@@ -369,7 +369,7 @@
|
|
|
369
369
|
--color-sf-flyout-bg-color-pressed: var(--color-sf-black);
|
|
370
370
|
--color-sf-flyout-bg-color-selected: #383838;
|
|
371
371
|
--color-sf-flyout-bg-color-focus: var(--color-sf-flyout-bg-color-hover);
|
|
372
|
-
--color-sf-overlay-bg-color: rgba(
|
|
372
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
373
373
|
--color-sf-table-bg-color-hover: #383838;
|
|
374
374
|
--color-sf-table-bg-color-pressed: #2e2e2e;
|
|
375
375
|
--color-sf-table-bg-color-selected: #082338;
|
|
@@ -711,9 +711,9 @@
|
|
|
711
711
|
--color-sf-flyout-bg-color-pressed: var(--color-sf-content-bg-color-hover);
|
|
712
712
|
--color-sf-flyout-bg-color-selected: var(--color-sf-content-bg-color-hover);
|
|
713
713
|
--color-sf-flyout-bg-color-focus: var(--color-sf-content-bg-color-hover);
|
|
714
|
-
--color-sf-overlay-bg-color: rgba(
|
|
715
|
-
--color-sf-table-bg-color-hover:
|
|
716
|
-
--color-sf-table-bg-color-pressed:
|
|
714
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
715
|
+
--color-sf-table-bg-color-hover: #1a3bff;
|
|
716
|
+
--color-sf-table-bg-color-pressed: #1a3bff;
|
|
717
717
|
--color-sf-table-bg-color-selected: #1a3bff;
|
|
718
718
|
--color-sf-content-text-color: #fff;
|
|
719
719
|
--color-sf-content-text-color-alt1: var(--color-sf-content-text-color);
|
|
@@ -732,12 +732,12 @@
|
|
|
732
732
|
--color-sf-flyout-text-color-selected: var(--color-sf-content-text-color-hover);
|
|
733
733
|
--color-sf-flyout-text-color-focus: var(--color-sf-content-text-color-hover);
|
|
734
734
|
--color-sf-flyout-text-color-disabled: var(--color-sf-content-text-color-disabled);
|
|
735
|
-
--color-sf-table-text-color-hover:
|
|
736
|
-
--color-sf-table-text-color-pressed:
|
|
737
|
-
--color-sf-table-text-color-selected:
|
|
735
|
+
--color-sf-table-text-color-hover: #000;
|
|
736
|
+
--color-sf-table-text-color-pressed: #000;
|
|
737
|
+
--color-sf-table-text-color-selected: #000;
|
|
738
738
|
--color-sf-icon-color: #fff;
|
|
739
|
-
--color-sf-icon-color-hover:
|
|
740
|
-
--color-sf-icon-color-pressed:
|
|
739
|
+
--color-sf-icon-color-hover: #000;
|
|
740
|
+
--color-sf-icon-color-pressed: #000;
|
|
741
741
|
--color-sf-icon-color-disabled: var(--color-sf-content-text-color-disabled);
|
|
742
742
|
--color-sf-border-light: #fff;
|
|
743
743
|
--color-sf-border: var(--color-sf-border-light);
|
|
@@ -1737,7 +1737,7 @@
|
|
|
1737
1737
|
padding: 0 0 0 12px;
|
|
1738
1738
|
}
|
|
1739
1739
|
.e-schedule .e-resource-tree-popup-overlay.e-enable {
|
|
1740
|
-
background:
|
|
1740
|
+
background: var(--color-sf-overlay-bg-color);
|
|
1741
1741
|
height: 100%;
|
|
1742
1742
|
left: 0;
|
|
1743
1743
|
opacity: 0.5;
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
--color-sf-flyout-bg-color-pressed: #e0e0e0;
|
|
48
48
|
--color-sf-flyout-bg-color-selected: #ebebeb;
|
|
49
49
|
--color-sf-flyout-bg-color-focus: #f5f5f5;
|
|
50
|
-
--color-sf-overlay-bg-color:
|
|
50
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
51
51
|
--color-sf-table-bg-color-hover: #f5f5f5;
|
|
52
52
|
--color-sf-table-bg-color-pressed: #e0e0e0;
|
|
53
53
|
--color-sf-table-bg-color-selected: #ebf3fc;
|
|
@@ -369,7 +369,7 @@
|
|
|
369
369
|
--color-sf-flyout-bg-color-pressed: var(--color-sf-black);
|
|
370
370
|
--color-sf-flyout-bg-color-selected: #383838;
|
|
371
371
|
--color-sf-flyout-bg-color-focus: var(--color-sf-flyout-bg-color-hover);
|
|
372
|
-
--color-sf-overlay-bg-color: rgba(
|
|
372
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
373
373
|
--color-sf-table-bg-color-hover: #383838;
|
|
374
374
|
--color-sf-table-bg-color-pressed: #2e2e2e;
|
|
375
375
|
--color-sf-table-bg-color-selected: #082338;
|
|
@@ -711,9 +711,9 @@
|
|
|
711
711
|
--color-sf-flyout-bg-color-pressed: var(--color-sf-content-bg-color-hover);
|
|
712
712
|
--color-sf-flyout-bg-color-selected: var(--color-sf-content-bg-color-hover);
|
|
713
713
|
--color-sf-flyout-bg-color-focus: var(--color-sf-content-bg-color-hover);
|
|
714
|
-
--color-sf-overlay-bg-color: rgba(
|
|
715
|
-
--color-sf-table-bg-color-hover:
|
|
716
|
-
--color-sf-table-bg-color-pressed:
|
|
714
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
715
|
+
--color-sf-table-bg-color-hover: #1a3bff;
|
|
716
|
+
--color-sf-table-bg-color-pressed: #1a3bff;
|
|
717
717
|
--color-sf-table-bg-color-selected: #1a3bff;
|
|
718
718
|
--color-sf-content-text-color: #fff;
|
|
719
719
|
--color-sf-content-text-color-alt1: var(--color-sf-content-text-color);
|
|
@@ -732,12 +732,12 @@
|
|
|
732
732
|
--color-sf-flyout-text-color-selected: var(--color-sf-content-text-color-hover);
|
|
733
733
|
--color-sf-flyout-text-color-focus: var(--color-sf-content-text-color-hover);
|
|
734
734
|
--color-sf-flyout-text-color-disabled: var(--color-sf-content-text-color-disabled);
|
|
735
|
-
--color-sf-table-text-color-hover:
|
|
736
|
-
--color-sf-table-text-color-pressed:
|
|
737
|
-
--color-sf-table-text-color-selected:
|
|
735
|
+
--color-sf-table-text-color-hover: #000;
|
|
736
|
+
--color-sf-table-text-color-pressed: #000;
|
|
737
|
+
--color-sf-table-text-color-selected: #000;
|
|
738
738
|
--color-sf-icon-color: #fff;
|
|
739
|
-
--color-sf-icon-color-hover:
|
|
740
|
-
--color-sf-icon-color-pressed:
|
|
739
|
+
--color-sf-icon-color-hover: #000;
|
|
740
|
+
--color-sf-icon-color-pressed: #000;
|
|
741
741
|
--color-sf-icon-color-disabled: var(--color-sf-content-text-color-disabled);
|
|
742
742
|
--color-sf-border-light: #fff;
|
|
743
743
|
--color-sf-border: var(--color-sf-border-light);
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
--color-sf-flyout-bg-color-pressed: #e0e0e0;
|
|
48
48
|
--color-sf-flyout-bg-color-selected: #ebebeb;
|
|
49
49
|
--color-sf-flyout-bg-color-focus: #f5f5f5;
|
|
50
|
-
--color-sf-overlay-bg-color:
|
|
50
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
51
51
|
--color-sf-table-bg-color-hover: #f5f5f5;
|
|
52
52
|
--color-sf-table-bg-color-pressed: #e0e0e0;
|
|
53
53
|
--color-sf-table-bg-color-selected: #ebf3fc;
|
|
@@ -369,7 +369,7 @@
|
|
|
369
369
|
--color-sf-flyout-bg-color-pressed: var(--color-sf-black);
|
|
370
370
|
--color-sf-flyout-bg-color-selected: #383838;
|
|
371
371
|
--color-sf-flyout-bg-color-focus: var(--color-sf-flyout-bg-color-hover);
|
|
372
|
-
--color-sf-overlay-bg-color: rgba(
|
|
372
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
373
373
|
--color-sf-table-bg-color-hover: #383838;
|
|
374
374
|
--color-sf-table-bg-color-pressed: #2e2e2e;
|
|
375
375
|
--color-sf-table-bg-color-selected: #082338;
|
|
@@ -711,9 +711,9 @@
|
|
|
711
711
|
--color-sf-flyout-bg-color-pressed: var(--color-sf-content-bg-color-hover);
|
|
712
712
|
--color-sf-flyout-bg-color-selected: var(--color-sf-content-bg-color-hover);
|
|
713
713
|
--color-sf-flyout-bg-color-focus: var(--color-sf-content-bg-color-hover);
|
|
714
|
-
--color-sf-overlay-bg-color: rgba(
|
|
715
|
-
--color-sf-table-bg-color-hover:
|
|
716
|
-
--color-sf-table-bg-color-pressed:
|
|
714
|
+
--color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
|
|
715
|
+
--color-sf-table-bg-color-hover: #1a3bff;
|
|
716
|
+
--color-sf-table-bg-color-pressed: #1a3bff;
|
|
717
717
|
--color-sf-table-bg-color-selected: #1a3bff;
|
|
718
718
|
--color-sf-content-text-color: #fff;
|
|
719
719
|
--color-sf-content-text-color-alt1: var(--color-sf-content-text-color);
|
|
@@ -732,12 +732,12 @@
|
|
|
732
732
|
--color-sf-flyout-text-color-selected: var(--color-sf-content-text-color-hover);
|
|
733
733
|
--color-sf-flyout-text-color-focus: var(--color-sf-content-text-color-hover);
|
|
734
734
|
--color-sf-flyout-text-color-disabled: var(--color-sf-content-text-color-disabled);
|
|
735
|
-
--color-sf-table-text-color-hover:
|
|
736
|
-
--color-sf-table-text-color-pressed:
|
|
737
|
-
--color-sf-table-text-color-selected:
|
|
735
|
+
--color-sf-table-text-color-hover: #000;
|
|
736
|
+
--color-sf-table-text-color-pressed: #000;
|
|
737
|
+
--color-sf-table-text-color-selected: #000;
|
|
738
738
|
--color-sf-icon-color: #fff;
|
|
739
|
-
--color-sf-icon-color-hover:
|
|
740
|
-
--color-sf-icon-color-pressed:
|
|
739
|
+
--color-sf-icon-color-hover: #000;
|
|
740
|
+
--color-sf-icon-color-pressed: #000;
|
|
741
741
|
--color-sf-icon-color-disabled: var(--color-sf-content-text-color-disabled);
|
|
742
742
|
--color-sf-border-light: #fff;
|
|
743
743
|
--color-sf-border: var(--color-sf-border-light);
|
|
@@ -1737,7 +1737,7 @@
|
|
|
1737
1737
|
padding: 0 0 0 12px;
|
|
1738
1738
|
}
|
|
1739
1739
|
.e-schedule .e-resource-tree-popup-overlay.e-enable {
|
|
1740
|
-
background:
|
|
1740
|
+
background: var(--color-sf-overlay-bg-color);
|
|
1741
1741
|
height: 100%;
|
|
1742
1742
|
left: 0;
|
|
1743
1743
|
opacity: 0.5;
|