diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue index 31622c6e..2915ac87 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue @@ -23,7 +23,7 @@ :rowspan="c.rowspan" :colspan="c.colspan" :style="thStyleHandler(c)" - :class="c.classes" + :class="thClassHandle(c)" :props="tools.titleFM.multiTitleThPropsHandle(c, props.scope)" style="font-weight: bold" :title="c.title" @@ -54,7 +54,7 @@ @@ -228,6 +228,13 @@ const thStyleHandler = (c: any) => { return style; }; +const thClassHandle = (c: any) => { + if (tools.titleFM.lastNames.value.includes(c.name)) { + return c.classes ? c.classes + ' no-right-border' : 'no-right-border'; + } + return c.classes; +}; + /** * 复选框 th 样式 */ 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 d1b34d5b..b825dfa9 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 @@ -102,7 +102,6 @@ watch( (newVal, oldVal) => { tools.table.originalColumns = newVal; tools.table.columns = Init.initColumn(tools.table.originalColumns, props); - tools.table.store.multiHeaderLastNames = Init.getMultiHeaderLastNames(props.columns); if (tools.table.columns && tools.table.columns.length > tools.table.originalColumns.length) { tools.titleFM.handleColumnTitle(); } diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css b/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css index 51a3402f..496b7e2d 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css +++ b/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css @@ -50,6 +50,9 @@ .w-grid .q-table--vertical-separator tbody tr td:last-child { border-right: 0; } +.w-grid .q-table--vertical-separator th.no-right-border { + border-right: 0; +} /* * vertical * 数据最后一行底部边框 @@ -78,6 +81,12 @@ border-left: 0; border-right: 1px solid rgba(0, 0, 0, 0.12); } +.w-grid .q-table--cell-separator tbody tr td:last-child { + border-right: 0; +} +.w-grid .q-table--cell-separator th.no-right-border { + border-right: 0; +} /* * cell * 数据最后一行底部边框 diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/DisplayColumn.vue b/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/DisplayColumn.vue index e2ced940..38f296e2 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/DisplayColumn.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/DisplayColumn.vue @@ -5,10 +5,10 @@ @@ -18,6 +18,7 @@