dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix didn't disable timewindow button (#2312)

Browse Source 
* Add support import label

* Fix didn't disable timewindow button
This commit is contained in:
Vladyslav 2020-01-06 16:39:51 +02:00 committed by Igor Kulikov
parent 168f0d6481
commit 3ba310dff0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/app/components/timewindow.directive.js
View File

@ -212,7 +212,7 @@ function Timewindow($compile, $templateCache, $filter, $mdPanel, $document, $mdM
} }
} }
scope.isTimewindowDisabled = function () { function isTimewindowDisabled () {
return scope.disabled || (!scope.isEdit && scope.model.hideInterval && scope.model.hideAggregation && scope.model.hideAggInterval); return scope.disabled || (!scope.isEdit && scope.model.hideInterval && scope.model.hideAggregation && scope.model.hideAggInterval);
} }
@ -247,10 +247,16 @@ function Timewindow($compile, $templateCache, $filter, $mdPanel, $document, $mdM
model.hideAggregation = value.hideAggregation; model.hideAggregation = value.hideAggregation;
model.hideAggInterval = value.hideAggInterval; model.hideAggInterval = value.hideAggInterval;
} }
scope.timewindowDisabled = scope.isTimewindowDisabled(); scope.timewindowDisabled = isTimewindowDisabled();
scope.updateDisplayValue(); scope.updateDisplayValue();
}; };
scope.$watchGroup(['disabled', 'isEdit'], function(newValue, oldValue) {
if (!angular.equals(newValue, oldValue)) {
scope.timewindowDisabled = isTimewindowDisabled();
}
});
$compile(element.contents())(scope); $compile(element.contents())(scope);
} }