@syncfusion/ej2-schedule 20.3.57 → 20.3.61
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/CHANGELOG.md +12 -2
- 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 +49 -10
- package/dist/es6/ej2-schedule.es2015.js.map +1 -1
- package/dist/es6/ej2-schedule.es5.js +53 -10
- 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/package.json +12 -12
- package/src/schedule/actions/touch.js +13 -5
- package/src/schedule/base/interface.d.ts +2 -0
- package/src/schedule/base/resource.js +1 -1
- package/src/schedule/exports/print.js +39 -4
|
@@ -1635,7 +1635,9 @@ class ScheduleTouch {
|
|
|
1635
1635
|
this.renderPanel(NEXT_PANEL_CLASS, 'next');
|
|
1636
1636
|
this.nextPanel = {
|
|
1637
1637
|
element: this.parent.activeView.getPanel(),
|
|
1638
|
-
selectedDate: new Date(this.parent.selectedDate.getTime())
|
|
1638
|
+
selectedDate: new Date(this.parent.selectedDate.getTime()),
|
|
1639
|
+
renderDates: this.parent.activeView.renderDates,
|
|
1640
|
+
colLevels: this.parent.activeView.colLevels
|
|
1639
1641
|
};
|
|
1640
1642
|
this.setDimensions(this.nextPanel.element);
|
|
1641
1643
|
}
|
|
@@ -1648,7 +1650,9 @@ class ScheduleTouch {
|
|
|
1648
1650
|
this.renderPanel(PREVIOUS_PANEL_CLASS, 'previous');
|
|
1649
1651
|
this.previousPanel = {
|
|
1650
1652
|
element: this.parent.activeView.getPanel(),
|
|
1651
|
-
selectedDate: new Date(this.parent.selectedDate.getTime())
|
|
1653
|
+
selectedDate: new Date(this.parent.selectedDate.getTime()),
|
|
1654
|
+
renderDates: this.parent.activeView.renderDates,
|
|
1655
|
+
colLevels: this.parent.activeView.colLevels
|
|
1652
1656
|
};
|
|
1653
1657
|
this.setDimensions(this.previousPanel.element);
|
|
1654
1658
|
prevWidth = this.previousPanel.element.offsetWidth;
|
|
@@ -1697,7 +1701,9 @@ class ScheduleTouch {
|
|
|
1697
1701
|
if (!this.currentPanel) {
|
|
1698
1702
|
this.currentPanel = {
|
|
1699
1703
|
element: this.parent.activeView.getPanel(),
|
|
1700
|
-
selectedDate: new Date(this.parent.selectedDate.getTime())
|
|
1704
|
+
selectedDate: new Date(this.parent.selectedDate.getTime()),
|
|
1705
|
+
renderDates: this.parent.activeView.renderDates,
|
|
1706
|
+
colLevels: this.parent.activeView.colLevels
|
|
1701
1707
|
};
|
|
1702
1708
|
this.setDimensions(this.currentPanel.element);
|
|
1703
1709
|
}
|
|
@@ -1745,6 +1751,8 @@ class ScheduleTouch {
|
|
|
1745
1751
|
else {
|
|
1746
1752
|
translateX = swipeDirection === this.touchLeftDirection ? -this.currentPanel.element.offsetLeft : 0;
|
|
1747
1753
|
}
|
|
1754
|
+
this.parent.activeView.renderDates = this.currentPanel.renderDates;
|
|
1755
|
+
this.parent.activeView.colLevels = this.currentPanel.colLevels;
|
|
1748
1756
|
addClass([this.element], TRANSLATE_CLASS);
|
|
1749
1757
|
this.element.style.transform = 'translatex(' + translateX + 'px)';
|
|
1750
1758
|
if (this.parent.headerModule) {
|
|
@@ -1758,8 +1766,8 @@ class ScheduleTouch {
|
|
|
1758
1766
|
cancelSwipe() {
|
|
1759
1767
|
this.parent.activeView.setPanel(this.currentPanel.element);
|
|
1760
1768
|
this.parent.setProperties({ selectedDate: this.currentPanel.selectedDate }, true);
|
|
1761
|
-
this.parent.activeView.
|
|
1762
|
-
this.parent.activeView.
|
|
1769
|
+
this.parent.activeView.renderDates = this.currentPanel.renderDates;
|
|
1770
|
+
this.parent.activeView.colLevels = this.currentPanel.colLevels;
|
|
1763
1771
|
addClass([this.element], TRANSLATE_CLASS);
|
|
1764
1772
|
const prevWidth = this.previousPanel ? this.previousPanel.element.offsetWidth : 0;
|
|
1765
1773
|
this.element.style.transform = 'translatex(' + (this.parent.enableRtl ? prevWidth : -this.currentPanel.element.offsetLeft) + 'px)';
|
|
@@ -15063,7 +15071,7 @@ class ResourceBase {
|
|
|
15063
15071
|
this.parent.on(documentClick, this.documentClick, this);
|
|
15064
15072
|
}
|
|
15065
15073
|
resourceTreeCreated() {
|
|
15066
|
-
if (this.parent.portals) {
|
|
15074
|
+
if (this.parent.activeViewOptions.resourceHeaderTemplate && this.parent.portals && this.treeViewObj.portals) {
|
|
15067
15075
|
this.parent.portals = this.parent.portals.concat(this.treeViewObj.portals);
|
|
15068
15076
|
this.parent.renderTemplates();
|
|
15069
15077
|
}
|
|
@@ -26134,16 +26142,22 @@ class Print {
|
|
|
26134
26142
|
'dateFormat', 'enableRtl', 'endHour', 'eventSettings', 'firstDayOfWeek',
|
|
26135
26143
|
'firstMonthOfYear', 'group', 'height', 'locale', 'maxDate', 'minDate', 'readonly',
|
|
26136
26144
|
'resources', 'rowAutoHeight', 'selectedDate', 'showHeaderBar', 'showTimeIndicator', 'showWeekNumber',
|
|
26137
|
-
'showWeekend', 'startHour', 'timeFormat', 'timeScale', 'timezone', 'views', 'width', 'workDays', 'workHours'
|
|
26145
|
+
'showWeekend', 'startHour', 'timeFormat', 'timeScale', 'timezone', 'views', 'width', 'workDays', 'workHours',
|
|
26146
|
+
'dateHeaderTemplate', 'dateRangeTemplate', 'cellHeaderTemplate', 'dayHeaderTemplate', 'monthHeaderTemplate',
|
|
26147
|
+
'cellTemplate', 'resourceHeaderTemplate', 'headerIndentTemplate'
|
|
26138
26148
|
];
|
|
26149
|
+
const scheduleTemplates = ['cellHeaderTemplate', 'dayHeaderTemplate', 'monthHeaderTemplate', 'cellTemplate',
|
|
26150
|
+
'dateHeaderTemplate', 'dateRangeTemplate', 'eventTemplate', 'resourceHeaderTemplate', 'headerIndentTemplate'];
|
|
26139
26151
|
let eventSettings;
|
|
26140
26152
|
let group;
|
|
26153
|
+
let timeScale;
|
|
26154
|
+
let views;
|
|
26141
26155
|
for (const key of scheduleProps) {
|
|
26142
26156
|
switch (key) {
|
|
26143
26157
|
case 'eventSettings':
|
|
26144
26158
|
eventSettings = Object.assign({}, this.parent.eventSettings.properties);
|
|
26145
26159
|
eventSettings.dataSource = this.parent.eventsData;
|
|
26146
|
-
eventSettings.template = null;
|
|
26160
|
+
eventSettings.template = typeof (eventSettings.template) === 'function' ? null : eventSettings.template;
|
|
26147
26161
|
printModel.eventSettings = eventSettings;
|
|
26148
26162
|
break;
|
|
26149
26163
|
case 'group':
|
|
@@ -26151,9 +26165,34 @@ class Print {
|
|
|
26151
26165
|
group.headerTooltipTemplate = null;
|
|
26152
26166
|
printModel.group = group;
|
|
26153
26167
|
break;
|
|
26168
|
+
case 'timeScale':
|
|
26169
|
+
timeScale = isNullOrUndefined(printOptions.timeScale) ? this.parent.timeScale : printOptions.timeScale;
|
|
26170
|
+
timeScale.majorSlotTemplate = typeof (timeScale.majorSlotTemplate) === 'function' ? null : timeScale.majorSlotTemplate;
|
|
26171
|
+
timeScale.minorSlotTemplate = typeof (timeScale.minorSlotTemplate) === 'function' ? null : timeScale.minorSlotTemplate;
|
|
26172
|
+
printOptions.timeScale = timeScale;
|
|
26173
|
+
break;
|
|
26174
|
+
case 'views':
|
|
26175
|
+
views = isNullOrUndefined(printOptions.views) ? this.parent.views : printOptions.views;
|
|
26176
|
+
if (views && views.length > 0 && typeof (views[0]) === 'object') {
|
|
26177
|
+
for (const view of views) {
|
|
26178
|
+
scheduleTemplates.forEach((x) => {
|
|
26179
|
+
if (!isNullOrUndefined(view[`${x}`])) {
|
|
26180
|
+
view[`${x}`] = typeof (view[`${x}`]) === 'function' ? null : view[`${x}`];
|
|
26181
|
+
}
|
|
26182
|
+
});
|
|
26183
|
+
}
|
|
26184
|
+
}
|
|
26185
|
+
printModel.views = views;
|
|
26186
|
+
break;
|
|
26154
26187
|
default:
|
|
26155
|
-
|
|
26156
|
-
|
|
26188
|
+
if (scheduleTemplates.indexOf(key) > -1) {
|
|
26189
|
+
printModel[`${key}`] = isNullOrUndefined(printOptions[`${key}`]) ?
|
|
26190
|
+
(typeof (this.parent[`${key}`]) === 'function' ? null : this.parent[`${key}`]) :
|
|
26191
|
+
(typeof (printOptions[`${key}`]) === 'function' ? null : printOptions[`${key}`]);
|
|
26192
|
+
break;
|
|
26193
|
+
}
|
|
26194
|
+
printModel[`${key}`] = isNullOrUndefined(printOptions[`${key}`]) ?
|
|
26195
|
+
this.parent[`${key}`] : printOptions[`${key}`];
|
|
26157
26196
|
break;
|
|
26158
26197
|
}
|
|
26159
26198
|
}
|