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

Merge branch 'master' of github.com:thingsboard/thingsboard into feature/relation-nodes

Browse Source
This commit is contained in:
ShvaykaD 2019-02-06 10:35:51 +02:00
commit 4513655771
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/entity/entity-subtype-autocomplete.directive.js
View File

@ -40,7 +40,7 @@ export default function EntitySubtypeAutocomplete($compile, $templateCache, $q,
if ((actual === null) || (expected === null)) { if ((actual === null) || (expected === null)) {
return actual === expected; return actual === expected;
} }
return actual.indexOf(expected) !== -1; return actual.startsWith(expected);
}; };
scope.fetchSubTypes = function(searchText) { scope.fetchSubTypes = function(searchText) {
@ -49,6 +49,10 @@ export default function EntitySubtypeAutocomplete($compile, $templateCache, $q,
function success(subTypes) { function success(subTypes) {
var result = $filter('filter')(subTypes, {'$': searchText}, comparator); var result = $filter('filter')(subTypes, {'$': searchText}, comparator);
if (result && result.length) { if (result && result.length) {
if (searchText && searchText.length && result.indexOf(searchText) === -1) {
result.push(searchText);
}
result.sort();
deferred.resolve(result); deferred.resolve(result);
} else { } else {
deferred.resolve([searchText]); deferred.resolve([searchText]);
@ -62,7 +66,7 @@ export default function EntitySubtypeAutocomplete($compile, $templateCache, $q,
} }
scope.subTypeSearchTextChanged = function() { scope.subTypeSearchTextChanged = function() {
scope.subType = scope.subTypeSearchText; //scope.subType = scope.subTypeSearchText;
} }
scope.updateView = function () { scope.updateView = function () {

2
ui/src/app/entity/entity-subtype-autocomplete.tpl.html
View File

@ -29,6 +29,8 @@
placeholder="{{ selectEntitySubtypeText | translate }}" placeholder="{{ selectEntitySubtypeText | translate }}"
md-floating-label="{{ entitySubtypeText | translate }}" md-floating-label="{{ entitySubtypeText | translate }}"
md-select-on-match="false" md-select-on-match="false"
md-autoselect="true"
ng-blur="subType = subTypeSearchText"
md-menu-class="tb-entity-subtype-autocomplete"> md-menu-class="tb-entity-subtype-autocomplete">
<md-item-template> <md-item-template>
<div class="tb-entity-subtype-item"> <div class="tb-entity-subtype-item">