diff --git a/core/core-frontend/src/components/grid-table/src/GridTable.vue b/core/core-frontend/src/components/grid-table/src/GridTable.vue index ed6527d99d..02f8549d40 100644 --- a/core/core-frontend/src/components/grid-table/src/GridTable.vue +++ b/core/core-frontend/src/components/grid-table/src/GridTable.vue @@ -16,7 +16,8 @@ const props = defineProps({ emptyDesc: propTypes.string, emptyImg: propTypes.string, border: propTypes.bool.def(false), - showEmptyImg: propTypes.bool.def(true) + showEmptyImg: propTypes.bool.def(true), + dataLoading: propTypes.bool.def(false) }) const attrs = useAttrs() @@ -129,8 +130,9 @@ defineExpose({ :border="border" v-bind="state.tableAttrs" :data="tableData" - :style="{ width: '100%' }" + :style="{ width: '100%', height: '100%' }" v-on="state.tableEvent" + v-loading="props.dataLoading" > @@ -141,6 +143,7 @@ defineExpose({ :description="props.emptyDesc ? props.emptyDesc : $t('data_set.no_data')" :img-type="imgType || 'noneWhite'" /> +
diff --git a/de-xpack b/de-xpack index e10a7861f0..7adfed5005 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit e10a7861f03fe589cd0da1f65b0511967cb05a2c +Subproject commit 7adfed5005e81ecf01d2715b357df44c58eb75d5