Skip to content

N
najiu-admin-template
Commit efb27aff authored by Vben's avatar Vben
Browse files
Options

style(table): remove unless style

parent fcee7d4e
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 93 deletions
build/vite/plugin/imagemin.ts
View file @ efb27aff
...@@ -16,10 +16,10 @@ export function configImageminPlugin() { ...@@ -16,10 +16,10 @@ export function configImageminPlugin() {
quality: 75, quality: 75,
}, },
mozjpeg: { mozjpeg: {
quality: 65, quality: 8,
}, },
pngquant: { pngquant: {
quality: [0.65, 0.9], quality: [0.8, 0.9],
speed: 4, speed: 4,
}, },
svgo: { svgo: {
......
src/components/Table/src/components/TableFooter.vue
View file @ efb27aff
...@@ -75,12 +75,15 @@ ...@@ -75,12 +75,15 @@
Reflect.deleteProperty(columns[index], 'customRender'); Reflect.deleteProperty(columns[index], 'customRender');
} }
} }
if (table.getRowSelection() && hasRowSummary) { if (table.getRowSelection() && hasRowSummary) {
const isFixed = columns.some((col) => col.fixed === 'left');
columns.unshift({ columns.unshift({
width: 60, width: 60,
title: 'selection', title: 'selection',
key: 'selectionKey', key: 'selectionKey',
align: 'center', align: 'center',
...(isFixed ? { fixed: 'left' } : {}),
customRender: ({ record }) => record[SUMMARY_ROW_KEY], customRender: ({ record }) => record[SUMMARY_ROW_KEY],
}); });
} }
......
src/components/Table/src/hooks/useTableScroll.ts
View file @ efb27aff
...@@ -75,7 +75,7 @@ export function useTableScroll( ...@@ -75,7 +75,7 @@ export function useTableScroll(
// Table height from bottom height-custom offset // Table height from bottom height-custom offset
const paddingHeight = 32; const paddingHeight = 32;
const borderHeight = 2 * 2; const borderHeight = 0;
// Pager height // Pager height
let paginationHeight = 2; let paginationHeight = 2;
if (!isBoolean(pagination)) { if (!isBoolean(pagination)) {
......
src/components/Table/src/style/index.less
View file @ efb27aff
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
border-radius: 4px; border-radius: 4px;
} }
.ant-table-wrapper { // .ant-table-wrapper {
border-radius: 2px; // border-radius: 2px;
} // }
} }
&-row__striped { &-row__striped {
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
.ant-table-wrapper { .ant-table-wrapper {
padding: 8px; padding: 8px;
background: #fff; background: #fff;
border-radius: 4px; border-radius: 2px;
.ant-table-title { .ant-table-title {
padding: 0 0 8px 0 !important; padding: 0 0 8px 0 !important;
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
// //
.ant-table { .ant-table {
width: 100%; // width: 100%;
overflow-x: hidden; // overflow-x: hidden;
border: none; // border: none;
&-title { &-title {
display: flex; display: flex;
...@@ -62,50 +62,50 @@ ...@@ -62,50 +62,50 @@
align-items: center; align-items: center;
} }
.ant-table-thead > tr > th, // .ant-table-thead > tr > th,
.ant-table-header { // .ant-table-header {
background: #f1f3f4; // background: #f1f3f4;
background-color: #f1f3f4 !important; // background-color: #f1f3f4 !important;
} // }
.ant-table-tbody > tr.ant-table-row-selected td { .ant-table-tbody > tr.ant-table-row-selected td {
background: fade(@primary-color, 8%) !important; background: fade(@primary-color, 8%) !important;
} }
} }
.ant-table-bordered .ant-table-header > table, // .ant-table-bordered .ant-table-header > table,
.ant-table-bordered .ant-table-body > table, // .ant-table-bordered .ant-table-body > table,
.ant-table-bordered .ant-table-fixed-left table, // .ant-table-bordered .ant-table-fixed-left table,
.ant-table-bordered .ant-table-fixed-right table { // .ant-table-bordered .ant-table-fixed-right table {
border: 1px solid @border-color !important; // border: 1px solid @border-color !important;
} // }
.ant-table-thead { // .ant-table-thead {
tr { // tr {
border: none; // border: none;
} // }
th { // th {
border: none; // border: none;
} // }
} // }
.ant-table-bordered .ant-table-tbody > tr > td { // .ant-table-bordered .ant-table-tbody > tr > td {
border-bottom: 1px solid @border-color !important; // border-bottom: 1px solid @border-color !important;
&:last-child { // &:last-child {
border-right: none !important; // border-right: none !important;
} // }
} // }
.ant-table.ant-table-bordered .ant-table-footer, // .ant-table.ant-table-bordered .ant-table-footer,
.ant-table.ant-table-bordered .ant-table-title { // .ant-table.ant-table-bordered .ant-table-title {
border: 1px solid @border-color !important; // border: 1px solid @border-color !important;
} // }
.ant-table-bordered.ant-table-empty .ant-table-placeholder { // .ant-table-bordered.ant-table-empty .ant-table-placeholder {
border: 1px solid @border-color !important; // border: 1px solid @border-color !important;
} // }
.ant-table-tbody > tr > td, .ant-table-tbody > tr > td,
.ant-table-tbody > tr > th, .ant-table-tbody > tr > th,
...@@ -114,61 +114,61 @@ ...@@ -114,61 +114,61 @@
white-space: pre; white-space: pre;
} }
.ant-table-row-cell-last { // .ant-table-row-cell-last {
border-right: none !important; // border-right: none !important;
} // }
.ant-table-bordered .ant-table-thead > tr > th, // .ant-table-bordered .ant-table-thead > tr > th,
.ant-table-bordered .ant-table-tbody > tr > td { // .ant-table-bordered .ant-table-tbody > tr > td {
border-right: 1px solid @border-color !important; // border-right: 1px solid @border-color !important;
} // }
.ant-pagination { .ant-pagination {
margin: 10px 0 0 0; margin: 10px 0 0 0;
} }
.ant-table-body { // .ant-table-body {
overflow-x: auto !important; // overflow-x: auto !important;
overflow-y: scroll !important; // overflow-y: scroll !important;
} // }
.ant-table-header { // .ant-table-header {
margin-bottom: 0 !important; // margin-bottom: 0 !important;
overflow-x: hidden !important; // overflow-x: hidden !important;
overflow-y: scroll !important; // overflow-y: scroll !important;
} // }
.ant-table-fixed-right { // .ant-table-fixed-right {
right: -1px; // right: -1px;
.ant-table-header { // .ant-table-header {
border-left: 1px solid @border-color !important; // border-left: 1px solid @border-color !important;
.ant-table-fixed { // .ant-table-fixed {
border-bottom: none; // border-bottom: none;
.ant-table-thead th { // .ant-table-thead th {
background: rgb(241, 243, 244); // background: rgb(241, 243, 244);
} // }
} // }
} // }
} // }
.ant-table-fixed-left { // .ant-table-fixed-left {
.ant-table-header { // .ant-table-header {
overflow-y: hidden !important; // overflow-y: hidden !important;
} // }
.ant-table-fixed { // .ant-table-fixed {
border-bottom: none; // border-bottom: none;
} // }
} // }
.ant-table-bordered .ant-table-thead > tr:not(:last-child) > th, // .ant-table-bordered .ant-table-thead > tr:not(:last-child) > th,
.ant-table-tbody > tr > td { // .ant-table-tbody > tr > td {
word-break: break-word; // word-break: break-word;
border-color: @border-color !important; // border-color: @border-color !important;
} // }
.ant-table-footer { .ant-table-footer {
padding: 0; padding: 0;
......
src/design/public.less
View file @ efb27aff
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
// ================================= // =================================
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 8px; width: 7px;
height: 10px; height: 8px;
} }
// ::-webkit-scrollbar-track { // ::-webkit-scrollbar-track {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment