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

Fix disable on condition and errors displaying

Browse Source
This commit is contained in:
Chantsova Ekaterina 2019-11-12 13:31:45 +02:00 committed by Andrew Shvayka
parent 6f2c1deca8
commit 25a6927b6e
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/src/app/widget/lib/multiple-input-widget.js
View File

@ -198,7 +198,7 @@ function MultipleInputWidgetController($q, $scope, $translate, attributeService,
var datasource = vm.datasources[0]; var datasource = vm.datasources[0];
if (datasource.type === types.datasourceType.entity) { if (datasource.type === types.datasourceType.entity) {
for (var i = 0; i < datasource.dataKeys.length; i++) { for (var i = 0; i < datasource.dataKeys.length; i++) {
if ((datasource.entityType !== types.entityType.device) && (datasource.dataKeys[i].settings.dataKeyType !== 'server')) { if ((datasource.entityType !== types.entityType.device) && (datasource.dataKeys[i].settings.dataKeyType == 'shared')) {
vm.isAllParametersValid = false; vm.isAllParametersValid = false;
} }
vm.data.push(datasource.dataKeys[i]); vm.data.push(datasource.dataKeys[i]);
@ -234,18 +234,18 @@ function MultipleInputWidgetController($q, $scope, $translate, attributeService,
currentValue: value, currentValue: value,
originalValue: value originalValue: value
}; };
}
if (vm.data[i].settings.isEditable === 'editable' && vm.data[i].settings.disabledOnDataKey) { if (vm.data[i].settings.isEditable === 'editable' && vm.data[i].settings.disabledOnDataKey) {
var conditions = data.filter((item) => { var conditions = data.filter((item) => {
return item.dataKey.name === vm.data[i].settings.disabledOnDataKey; return item.dataKey.name === vm.data[i].settings.disabledOnDataKey;
}); });
if (conditions && conditions.length) { if (conditions && conditions.length) {
if (conditions[0].data.length) { if (conditions[0].data.length) {
if (conditions[0].data[0][1] === 'false') { if (conditions[0].data[0][1] === 'false') {
vm.data[i].settings.disabledOnCondition = true; vm.data[i].settings.disabledOnCondition = true;
} else { } else {
vm.data[i].settings.disabledOnCondition = !conditions[0].data[0][1]; vm.data[i].settings.disabledOnCondition = !conditions[0].data[0][1];
}
} }
} }
} }

1
ui/src/app/widget/lib/multiple-input-widget.scss
View File

@ -34,6 +34,7 @@
md-switch { md-switch {
margin-top: 20px; margin-top: 20px;
white-space: normal;
} }
.md-icon-button md-icon { .md-icon-button md-icon {

25
ui/src/app/widget/lib/multiple-input-widget.tpl.html
View File

@ -16,8 +16,8 @@
--> -->
<form class="tb-multiple-input" name="multipleInputForm" ng-submit="vm.save()" novalidate autocomplete="off"> <form class="tb-multiple-input" name="multipleInputForm" ng-submit="vm.save()" novalidate autocomplete="off">
<div style="padding: 0 8px; margin: auto 0;"> <div style="padding: 0 8px;" ng-if="vm.entityDetected && vm.isAllParametersValid">
<div ng-show="vm.entityDetected" layout="row" layout-wrap ng-class="{'vertical-alignment': vm.isVerticalAlignment || vm.changeAlignment}"> <div layout="row" layout-wrap ng-class="{'vertical-alignment': vm.isVerticalAlignment || vm.changeAlignment}">
<div ng-repeat="key in vm.data" ng-style="{'width': (vm.isVerticalAlignment || vm.changeAlignment) ? '100%' : vm.inputWidthSettings}"> <div ng-repeat="key in vm.data" ng-style="{'width': (vm.isVerticalAlignment || vm.changeAlignment) ? '100%' : vm.inputWidthSettings}">
<div class="input-field" ng-if="(key.settings.dataKeyValueType === 'string') && !key.settings.dataKeyHidden"> <div class="input-field" ng-if="(key.settings.dataKeyValueType === 'string') && !key.settings.dataKeyHidden">
<md-input-container class="md-block"> <md-input-container class="md-block">
@ -129,7 +129,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="md-padding" layout="row" layout-align="end center" ng-if="vm.entityDetected && vm.settings.showActionButtons">
<md-button class="md-primary" ng-click="vm.discardAll()" style="max-height: 50px; margin-right:20px;" ng-disabled="!multipleInputForm.$dirty">
{{ 'action.undo' | translate }}
</md-button>
<md-button class="md-raised md-primary" type="submit" value="Submit" style="max-height: 50px; margin-right:20px;"
ng-disabled="!multipleInputForm.$dirty || multipleInputForm.$invalid" ng-click="vm.isFocused = false">
{{ 'action.save' | translate }}
</md-button>
</div>
</div>
<div class="tb-multiple-input__errors" layout="column" layout-align="center center" style="height: 100%;" ng-if="!vm.entityDetected || !vm.isAllParametersValid">
<div style="text-align: center; font-size: 18px; color: #a0a0a0;" ng-hide="vm.entityDetected"> <div style="text-align: center; font-size: 18px; color: #a0a0a0;" ng-hide="vm.entityDetected">
{{ 'widgets.input-widgets.no-entity-selected' | translate }} {{ 'widgets.input-widgets.no-entity-selected' | translate }}
</div> </div>
@ -137,13 +147,4 @@
{{ 'widgets.input-widgets.not-allowed-entity' | translate }} {{ 'widgets.input-widgets.not-allowed-entity' | translate }}
</div> </div>
</div> </div>
<div class="md-padding" layout="row" layout-align="end center" ng-if="vm.entityDetected && vm.settings.showActionButtons">
<md-button class="md-primary" ng-click="vm.discardAll()" style="max-height: 50px; margin-right:20px;" ng-disabled="!multipleInputForm.$dirty">
{{ 'action.undo' | translate }}
</md-button>
<md-button class="md-raised md-primary" type="submit" value="Submit" style="max-height: 50px; margin-right:20px;"
ng-disabled="!multipleInputForm.$dirty || multipleInputForm.$invalid" ng-click="vm.isFocused = false">
{{ 'action.save' | translate }}
</md-button>
</div>
</form> </form>