diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue index 500faf9f..801330bd 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue @@ -50,6 +50,8 @@ :cols="childColsHandler(child)" :level="props.level + 1" :grid-props="gridProps" + :row-key="props.rowKey" + :selection="props.selection" > @@ -82,6 +84,7 @@ const props = defineProps({ }, }, rowKey: { type: String, default: 'rowKey_' }, + selection: { type: String, default: 'single' }, }); const table = inject('table'); @@ -242,6 +245,10 @@ const childColsHandler = (child) => { }; const click = (el, row, rowIndex) => { - selectedFun(!row.selected, row); + table.rows.forEach((item) => { + selectedFun(false, item); + }); + table.selected.splice(0, table.selected.length); + selectedFun(true, row); }; diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue index 57f5893b..862bbe17 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue @@ -13,9 +13,7 @@ separator="cell" :rows="table.rows" :columns="extractTableColumns" - :rows-per-page-options=" - table.pagination.rowsPerPage && pagination.rowsPerPage && table.refHeightWidth.middleWidth > 600 ? table.pagination.rowsPerPageOptions : [] - " + :rows-per-page-options="pageable && table.refHeightWidth.middleWidth > 600 ? table.pagination.rowsPerPageOptions : []" :loading="table.loading" :class="tableClassComputed" :table-style="tableHeightComputed" @@ -82,7 +80,7 @@ > - + {{ col.label }} @@ -91,7 +89,14 @@