cronapp-framework-js 2.9.5 → 2.9.6-SP.10
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/components/templates/cron-calendar.designtime.html +2 -2
- package/components/templates/cron-grid.designtime.html +2 -2
- package/css/themes/custom/aquamarine/custom-aquamarine.css +1 -0
- package/css/themes/custom/fuse/custom-fuse.css +0 -1
- package/css/themes/custom/material/custom-material.css +1 -0
- package/css/themes/custom/slate/custom-slate.css +1 -0
- package/css/themes/custom/theme-general/menu-vertical-retratil.css +2 -3
- package/css/themes/custom/united/custom-united.css +1 -0
- package/css/themes/custom/yeti/custom-yeti.css +1 -0
- package/dist/components/templates/cron-calendar.designtime.html +1 -1
- package/dist/components/templates/cron-grid.designtime.html +1 -1
- package/dist/css/themes/custom/aquamarine/custom-aquamarine.css +1 -1
- package/dist/css/themes/custom/fuse/custom-fuse.css +1 -1
- package/dist/css/themes/custom/material/custom-material.css +1 -1
- package/dist/css/themes/custom/slate/custom-slate.css +1 -1
- package/dist/css/themes/custom/theme-general/menu-vertical-retratil.css +1 -1
- package/dist/css/themes/custom/united/custom-united.css +1 -1
- package/dist/css/themes/custom/yeti/custom-yeti.css +1 -1
- package/dist/js/directives.js +3 -3
- package/js/directives.js +17 -7
- package/package.json +1 -1
package/js/directives.js
CHANGED
|
@@ -117,7 +117,8 @@
|
|
|
117
117
|
selectDates: selectDates,
|
|
118
118
|
disableDates: disableDates,
|
|
119
119
|
min: min,
|
|
120
|
-
max: max
|
|
120
|
+
max: max,
|
|
121
|
+
start: options.startView
|
|
121
122
|
});
|
|
122
123
|
|
|
123
124
|
let calendar = cronCalendarElement.data('kendoCalendar');
|
|
@@ -4615,7 +4616,7 @@
|
|
|
4615
4616
|
scope.$watchCollection(function(){return ngModelCtrl.$modelValue}, function(value, old){
|
|
4616
4617
|
var silent = $(combobox).data('silent');
|
|
4617
4618
|
|
|
4618
|
-
if (value.length === 0) {
|
|
4619
|
+
if (value && value.length === 0) {
|
|
4619
4620
|
$(`#${attrs.id}`).addClass('ng-empty');
|
|
4620
4621
|
attrs.ngRequired && eval(attrs.ngRequired) && $(`#${attrs.id}`).attr('required', 'required');
|
|
4621
4622
|
}
|
|
@@ -5107,7 +5108,7 @@
|
|
|
5107
5108
|
items.forEach(function (item) {
|
|
5108
5109
|
|
|
5109
5110
|
var security = (item.security && item.security != null) ? ` cronapp-security="${item.security }" ` : '';
|
|
5110
|
-
var action = (item.action && item.action != null) ? ` ng-click="${item.action}" ` : '';
|
|
5111
|
+
var action = (item.action && item.action != null) ? ` ng-click="cronapi.internal.lastCronappMenuClick('${item.id}');${item.action}" ` : '';
|
|
5111
5112
|
var hide = (item.hide && item.hide != null) ? ` ng-hide="${item.hide}" ` : '';
|
|
5112
5113
|
var iconClass = (item.iconClass && item.iconClass != null) ? `<i class="${item.iconClass}" id="menu-tag-i-${item.id}"></i> ` : '';
|
|
5113
5114
|
var title = `<span id="menu-tag-span-${item.id}"></span>`;
|
|
@@ -5234,7 +5235,7 @@
|
|
|
5234
5235
|
};
|
|
5235
5236
|
}])
|
|
5236
5237
|
|
|
5237
|
-
.directive('cronBreadcrumbs', function () {
|
|
5238
|
+
.directive('cronBreadcrumbs', function ($rootScope) {
|
|
5238
5239
|
'use strict';
|
|
5239
5240
|
return {
|
|
5240
5241
|
restrict: 'E',
|
|
@@ -5344,12 +5345,17 @@
|
|
|
5344
5345
|
}
|
|
5345
5346
|
|
|
5346
5347
|
if (items[i].menuItems.length > 0) {
|
|
5347
|
-
inicio(items[i].menuItems);
|
|
5348
|
+
let result = inicio(items[i].menuItems);
|
|
5349
|
+
if (result && result.length > 0) {
|
|
5350
|
+
break;
|
|
5351
|
+
}
|
|
5348
5352
|
|
|
5349
5353
|
} else {
|
|
5350
5354
|
if (action) {
|
|
5351
5355
|
if (action[action.length - 1] === page[page.length - 1] || action[action.length - 1] === page) {
|
|
5352
|
-
|
|
5356
|
+
if (!$rootScope.__lastCronappMenuClick || $rootScope.__lastCronappMenuClick === items[i].id) {
|
|
5357
|
+
x = true;
|
|
5358
|
+
}
|
|
5353
5359
|
}
|
|
5354
5360
|
}
|
|
5355
5361
|
}
|
|
@@ -5383,7 +5389,6 @@
|
|
|
5383
5389
|
})
|
|
5384
5390
|
}
|
|
5385
5391
|
}
|
|
5386
|
-
|
|
5387
5392
|
return breadcrumb
|
|
5388
5393
|
}
|
|
5389
5394
|
}
|
|
@@ -6545,6 +6550,10 @@ app.kendoHelper = {
|
|
|
6545
6550
|
this.options.fromRead = false;
|
|
6546
6551
|
delete this.options.cronappDatasource.reloadedFromCronapi;
|
|
6547
6552
|
}
|
|
6553
|
+
if (type === "overRideRefresh") {
|
|
6554
|
+
this.options.refComponent.dataSource._page = 1;
|
|
6555
|
+
this.options.refComponent.dataSource._skip = 0;
|
|
6556
|
+
}
|
|
6548
6557
|
this.options.refComponent.dataSource.read();
|
|
6549
6558
|
}
|
|
6550
6559
|
}
|
|
@@ -6914,6 +6923,7 @@ app.kendoHelper = {
|
|
|
6914
6923
|
dataSource: dataSource,
|
|
6915
6924
|
headerTemplate: (options.headerTemplate == null ? undefined : options.headerTemplate),
|
|
6916
6925
|
template: (options.template == null ? undefined : options.template),
|
|
6926
|
+
tagTemplate : (options.tagTemplate == null ? undefined : options.tagTemplate),
|
|
6917
6927
|
placeholder: (options.placeholder == null ? undefined : options.placeholder),
|
|
6918
6928
|
footerTemplate: (options.footerTemplate == null ? undefined : options.footerTemplate),
|
|
6919
6929
|
filter: (options.filter == null ? undefined : options.filter),
|