Skip to content

Commit

Permalink
releases 4.10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Jan 18, 2025
1 parent 8aff2ae commit 6527663
Show file tree
Hide file tree
Showing 9 changed files with 122 additions and 93 deletions.
3 changes: 2 additions & 1 deletion examples/views/table/TableTest9.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<vxe-button @click="loadData(0)">加载0条</vxe-button>
<vxe-button @click="loadData(5)">加载5条</vxe-button>
<vxe-button @click="loadData(50)">加载50条</vxe-button>
<vxe-button @click="loadData(100)">加载100条</vxe-button>
<vxe-button @click="loadData(5000)">加载5k条</vxe-button>
<vxe-button @click="loadData(10000)">加载1w条</vxe-button>
<vxe-button @click="loadData(30000)">加载3w条</vxe-button>
Expand Down Expand Up @@ -200,5 +201,5 @@ const loadData = (rowSize: number) => {
}, 350)
}
loadData(16)
loadData(50)
</script>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.10.6-beta.20",
"version": "4.10.6-beta.21",
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、拖拽排序,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down
2 changes: 1 addition & 1 deletion packages/table/src/body.ts
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ export default defineComponent({
$xeTable.triggerBodyScrollEvent(evnt, fixedType)
}
}
if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
if (leftFixedWidth || rightFixedWidth) {
ons.onWheel = $xeTable.triggerBodyWheelEvent
}

Expand Down
176 changes: 111 additions & 65 deletions packages/table/src/table.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/ui/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ VxeUI.setConfig({
oSize: 2
},
scrollbarConfig: {
width: 10,
height: 10
// width: 0,
// height: 0
}
},
// export: {
Expand Down
24 changes: 2 additions & 22 deletions styles/components/table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -457,26 +457,6 @@

/*scroll*/
.vxe-table {
&.is--scroll-x {
&:hover {
& > .vxe-table--scroll-x-virtual {
.vxe-table--scroll-x-handle {
overflow-x: scroll;
}
}
}
}
&.is--scroll-y {
&:hover {
& > .vxe-table--layout-wrapper {
& > .vxe-table--scroll-y-virtual {
.vxe-table--scroll-y-handle {
overflow-y: scroll;
}
}
}
}
}
&.is--loading {
& > .vxe-table--scroll-x-virtual {
visibility: hidden;
Expand Down Expand Up @@ -518,7 +498,7 @@
}
.vxe-table--scroll-x-handle {
overflow-y: hidden;
overflow-x: auto;
overflow-x: scroll;
height: 18px;
}
.vxe-table--scroll-x-wrapper {
Expand All @@ -532,7 +512,7 @@
top: 0;
}
.vxe-table--scroll-y-handle {
overflow-y: auto;
overflow-y: scroll;
overflow-x: hidden;
width: 18px;
height: 100%;
Expand Down
1 change: 1 addition & 0 deletions styles/theme/dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

/*table*/
--vxe-ui-table-header-background-color: #28282a;
--vxe-ui-table-column-to-row-background-color: #28282a;
--vxe-ui-table-border-color: #37373a;
--vxe-ui-table-row-hover-background-color: #262727;
--vxe-ui-table-row-striped-background-color: #1D1D1D;
Expand Down
1 change: 1 addition & 0 deletions styles/theme/light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

/*table*/
--vxe-ui-table-header-background-color: #{light_variable.$vxe-ui-table-header-background-color};
--vxe-ui-table-column-to-row-background-color: #{light_variable.$vxe-ui-table-column-to-row-background-color};
--vxe-ui-table-border-color: #{light_variable.$vxe-ui-table-border-color};
--vxe-ui-table-row-hover-background-color: #{light_variable.$vxe-ui-table-row-hover-background-color};
--vxe-ui-table-row-striped-background-color: #{light_variable.$vxe-ui-table-row-striped-background-color};
Expand Down
2 changes: 1 addition & 1 deletion styles/variable.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ $vxe-ui-loading-background-color: rgba(255, 255, 255, 0.5) !default;

/*table*/
$vxe-ui-table-header-background-color: #f8f8f9 !default;
$vxe-ui-table-column-to-row-background-color: #f8f8f9 !default;
$vxe-ui-table-border-color: #e8eaec !default;
$vxe-ui-table-row-hover-background-color: #f5f7fa !default;
$vxe-ui-table-row-striped-background-color: #fafafa !default;
Expand All @@ -37,4 +38,3 @@ $vxe-ui-table-row-current-background-color: #e6f7ff !default;
$vxe-ui-table-row-hover-current-background-color: #d7effb !default;
$vxe-ui-table-fixed-scrolling-box-shadow-color: rgba(0, 0, 0, 0.12) !default;
$vxe-ui-table-drag-over-background-color:rgba(255,255,200,0.3) !default;

0 comments on commit 6527663

Please sign in to comment.