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

UI: Minor improvements.

Browse Source
This commit is contained in:
Igor Kulikov 2017-08-17 16:38:13 +03:00
parent 41d34fe4a4
commit 467e6399fc
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dao/src/main/resources/sql/schema.sql
View File

@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS attribute_kv (
attribute_type varchar(255),
attribute_key varchar(255),
bool_v boolean,
str_v varchar,
str_v varchar(10000000),
long_v bigint,
dbl_v double precision,
last_update_ts bigint,
@ -197,7 +197,7 @@ CREATE TABLE IF NOT EXISTS ts_kv (
key varchar(255) NOT NULL,
ts bigint NOT NULL,
bool_v boolean,
str_v varchar,
str_v varchar(10000000),
long_v bigint,
dbl_v double precision,
CONSTRAINT ts_kv_unq_key UNIQUE (entity_type, entity_id, key, ts)

2
ui/src/app/dashboard/states/default-state-controller.js
View File

@ -210,7 +210,7 @@ export default function DefaultStateController($scope, $location, $state, $state
function updateLocation() {
if (vm.stateObject[0].id) {
$location.search({state : utils.objToBase64(vm.stateObject)});
$location.search('state', utils.objToBase64(vm.stateObject));
}
}
}

4
ui/src/app/dashboard/states/entity-state-controller.js
View File

@ -288,9 +288,9 @@ export default function EntityStateController($scope, $location, $state, $stateP
function updateLocation() {
if (vm.stateObject[vm.stateObject.length-1].id) {
if (isDefaultState()) {
$location.search({state : null});
$location.search('state', null);
} else {
$location.search({state : utils.objToBase64(vm.stateObject)});
$location.search('state', utils.objToBase64(vm.stateObject));
}
}
}

8
ui/src/app/entity/attribute/attribute-table.scss
View File

@ -27,6 +27,14 @@ md-toolbar.md-table-toolbar.alternate {
}
.md-table {
&.tb-attribute-table {
table-layout: fixed;
td.md-cell {
&.tb-value-cell {
overflow: auto;
}
}
}
.md-cell {
ng-md-icon {
fill: $md-edit-icon-fill;

4
ui/src/app/entity/attribute/attribute-table.tpl.html
View File

@ -125,7 +125,7 @@
</div>
</md-toolbar>
<md-table-container ng-show="mode!='widget'">
<table md-table md-row-select multiple="" ng-model="selectedAttributes" md-progress="attributesDeferred.promise">
<table class="tb-attribute-table" md-table md-row-select multiple="" ng-model="selectedAttributes" md-progress="attributesDeferred.promise">
<thead md-head md-order="query.order" md-on-reorder="onReorder">
<tr md-row>
<th md-column md-order-by="lastUpdateTs"><span translate>attribute.last-update-time</span></th>
@ -137,7 +137,7 @@
<tr md-row md-select="attribute" md-select-id="key" md-auto-select ng-repeat="attribute in attributes.data">
<td md-cell>{{attribute.lastUpdateTs | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td md-cell>{{attribute.key}}</td>
<td md-cell ng-click="editAttribute($event, attribute)">
<td md-cell class="tb-value-cell" ng-click="editAttribute($event, attribute)">
<span>{{attribute.value}}</span>
<span ng-show="!attributeScope.clientSide"><ng-md-icon size="16" icon="edit"></ng-md-icon></span>
</td>