Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
89468bf375
|
@ -1,5 +1,5 @@
|
|||
<div style="position: relative;">
|
||||
<div style="position: absolute; top: 0; left: 0; padding: .5em; z-index: 1">
|
||||
<div style="position: absolute; top: 0; left: 0; padding: .3em; z-index: 1">
|
||||
<vn-icon-button
|
||||
icon="menu"
|
||||
style="font-size: .4em;"
|
||||
|
@ -15,14 +15,16 @@
|
|||
<div pad-medium>
|
||||
<vn-horizontal ng-repeat="field in fields">
|
||||
<vn-check
|
||||
vn-one label="{{field}}"
|
||||
vn-one label="{{titles[field]}}"
|
||||
field="tableConfiguration.configuration[field]">
|
||||
</vn-check>
|
||||
</vn-horizontal>
|
||||
<vn-button
|
||||
label="Save"
|
||||
ng-click="$ctrl.saveConfiguration(tableConfiguration)">
|
||||
</vn-button>
|
||||
<vn-horizontal>
|
||||
<vn-button
|
||||
label="Save"
|
||||
ng-click="$ctrl.saveConfiguration(tableConfiguration)">
|
||||
</vn-button>
|
||||
</vn-horizontal>
|
||||
</div>
|
||||
</tpl-body>
|
||||
</vn-dialog>
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import ngModule from '../module';
|
||||
import template from './uvc.html';
|
||||
import './uvc.scss';
|
||||
|
||||
directive.$inject = ['$http', '$compile', 'vnApp', '$translate'];
|
||||
export function directive($http, $compile, vnApp, $translate) {
|
||||
|
@ -7,12 +8,16 @@ export function directive($http, $compile, vnApp, $translate) {
|
|||
let allHeaders = $element[0].querySelectorAll(`vn-th[field], vn-th[th-id]`);
|
||||
let headerList = Array.from(allHeaders);
|
||||
let ids = [];
|
||||
let titles = {};
|
||||
|
||||
headerList.forEach(header => {
|
||||
ids.push(header.getAttribute('th-id') || header.getAttribute('field'));
|
||||
let id = header.getAttribute('th-id') || header.getAttribute('field');
|
||||
ids.push(id);
|
||||
titles[id] = header.innerText || id;
|
||||
});
|
||||
|
||||
$scope.fields = ids;
|
||||
$scope.titles = titles;
|
||||
|
||||
return headerList;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
vn-table vn-dialog[vn-id="uvc"]{
|
||||
& > div {
|
||||
min-width: 18em;
|
||||
align-items: center;
|
||||
|
||||
}
|
||||
|
||||
vn-button[label="Save"] {
|
||||
margin: 0 auto;
|
||||
}
|
||||
}
|
|
@ -61,7 +61,7 @@
|
|||
<vn-td>{{::item.intrastat}}</vn-td>
|
||||
<vn-td>{{::item.origin}}</vn-td>
|
||||
<vn-td>{{::item.userNickname}}</vn-td>
|
||||
<vn-td>{{::item.density}}</vn-td>
|
||||
<vn-td number>{{::item.density}}</vn-td>
|
||||
<vn-td>{{::item.taxClass}}</vn-td>
|
||||
<vn-td>
|
||||
<vn-check
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
picture: Foto
|
|
@ -96,7 +96,8 @@
|
|||
<vn-check
|
||||
vn-one
|
||||
label="My team"
|
||||
field="filter.myTeam">
|
||||
field="filter.myTeam"
|
||||
triple-state="true">
|
||||
</vn-check>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal margin-large-top>
|
||||
|
|
Loading…
Reference in New Issue