Merge pull request '3961-fix(monitor_client): fix scroll' (#962) from 3961-monitor_clients_fix into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #962 Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
commit
d99d2f1e50
|
@ -46,11 +46,13 @@
|
||||||
</div>
|
</div>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<div id="table"></div>
|
<div id="table"></div>
|
||||||
|
<div ng-transclude="pagination">
|
||||||
<vn-pagination
|
<vn-pagination
|
||||||
ng-if="$ctrl.model"
|
ng-if="$ctrl.model"
|
||||||
model="$ctrl.model"
|
model="$ctrl.model"
|
||||||
class="vn-pt-md">
|
class="vn-pt-md">
|
||||||
</vn-pagination>
|
</vn-pagination>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<vn-confirm
|
<vn-confirm
|
||||||
|
|
|
@ -497,7 +497,8 @@ ngModule.vnComponent('smartTable', {
|
||||||
controller: SmartTable,
|
controller: SmartTable,
|
||||||
transclude: {
|
transclude: {
|
||||||
table: '?slotTable',
|
table: '?slotTable',
|
||||||
actions: '?slotActions'
|
actions: '?slotActions',
|
||||||
|
pagination: '?slotPagination'
|
||||||
},
|
},
|
||||||
bindings: {
|
bindings: {
|
||||||
model: '<?',
|
model: '<?',
|
||||||
|
|
|
@ -88,8 +88,16 @@
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
<table>
|
</table>
|
||||||
<slot-table>
|
</slot-table>
|
||||||
|
<slot-pagination>
|
||||||
|
<vn-pagination
|
||||||
|
model="model"
|
||||||
|
class="vn-pt-xs"
|
||||||
|
scroll-selector="vn-monitor-sales-clients smart-table"
|
||||||
|
scroll-offset="100">
|
||||||
|
</vn-pagination>
|
||||||
|
</slot-pagination>
|
||||||
</smart-table>
|
</smart-table>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
<vn-worker-descriptor-popover
|
<vn-worker-descriptor-popover
|
||||||
|
|
Loading…
Reference in New Issue