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

Merge pull request #729 from dyosick/modbus-gui-fix

Browse Source 
Modbus GUI configuration fix
This commit is contained in:
Andrew Shvayka 2018-04-28 00:15:01 +03:00 committed by GitHub
commit d03ac971b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/app/extension/extensions-forms/extension-form-modbus.directive.js
View File

@ -102,7 +102,16 @@ export default function ExtensionFormModbusDirective($compile, $templateCache, $
scope.theForm.$setDirty(); scope.theForm.$setDirty();
}; };
scope.onTransportChanged = function(server) {
var type = server.transport.type;
server.transport = {};
server.transport.type = type;
server.transport.timeout = 3000;
scope.theForm.$setDirty();
};
$compile(element.contents())(scope); $compile(element.contents())(scope);

48
ui/src/app/extension/extensions-forms/extension-form-modbus.tpl.html
View File

@ -58,6 +58,7 @@
<md-select required <md-select required
name="transportType_{{serverIndex}}" name="transportType_{{serverIndex}}"
ng-model="server.transport.type" ng-model="server.transport.type"
ng-change="onTransportChanged(server)"
> >
<md-option ng-value="transportType" <md-option ng-value="transportType"
ng-repeat="(transportType, transportValue) in types.extensionModbusTransports" ng-repeat="(transportType, transportValue) in types.extensionModbusTransports"
@ -71,53 +72,8 @@
</md-input-container> </md-input-container>
</div> </div>
<div layout="row" ng-if="server.transport.type == 'tcp'">
<md-input-container flex="33" class="md-block">
<label translate>extension.host</label>
<input required name="transportHost_{{serverIndex}}" ng-model="server.transport.host">
<div ng-messages="theForm['transportHost_' + serverIndex].$error">
<div translate ng-message="required">extension.field-required</div>
</div>
</md-input-container>
<md-input-container flex="33" class="md-block">
<label translate>extension.port</label>
<input type="number"
required
name="transportPort_{{serverIndex}}"
ng-model="server.transport.port"
min="1"
max="65535"
>
<div ng-messages="theForm['transportPort_' + serverIndex].$error">
<div translate
ng-message="required"
>extension.field-required</div>
<div translate
ng-message="min"
>extension.port-range</div>
<div translate
ng-message="max"
>extension.port-range</div>
</div>
</md-input-container>
<md-input-container flex="33" class="md-block">
<label translate>extension.timeout</label>
<input type="number"
required name="transportTimeout_{{serverIndex}}"
ng-model="server.transport.timeout"
>
<div ng-messages="theForm['transportTimeout_' + serverIndex].$error">
<div translate
ng-message="required"
>extension.field-required</div>
</div>
</md-input-container>
</div>
<div layout="row" ng-if="server.transport.type == 'udp'"> <div layout="row" ng-if="server.transport.type == 'tcp' || server.transport.type == 'udp'">
<md-input-container flex="33" class="md-block"> <md-input-container flex="33" class="md-block">
<label translate>extension.host</label> <label translate>extension.host</label>
<input required name="transportHost_{{serverIndex}}" ng-model="server.transport.host"> <input required name="transportHost_{{serverIndex}}" ng-model="server.transport.host">