Skip to content

Commit

Permalink
releases 4.7.96
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Oct 26, 2024
1 parent 6b6a38d commit 7df725c
Show file tree
Hide file tree
Showing 20 changed files with 52 additions and 54 deletions.
2 changes: 1 addition & 1 deletion examples/style/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './variable.scss';
@use './variable.scss';

body {
padding: 0;
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.7.95",
"version": "4.7.96",
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down Expand Up @@ -28,7 +28,7 @@
"style": "lib/style.css",
"typings": "types/index.d.ts",
"dependencies": {
"vxe-pc-ui": "^4.2.31"
"vxe-pc-ui": "^4.2.32"
},
"devDependencies": {
"@types/resize-observer-browser": "^0.1.11",
Expand Down Expand Up @@ -61,7 +61,7 @@
"gulp-typescript": "^5.0.1",
"gulp-uglify": "^3.0.2",
"postcss": "^8.4.38",
"sass": "^1.79.3",
"sass": "^1.80.4",
"sass-loader": "^14.2.0",
"typescript": "~4.5.5",
"vue": "3.5.5",
Expand Down
12 changes: 6 additions & 6 deletions styles/all.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import './base.scss';
@use './base.scss';

@import './components/column.scss';
@import './components/colgroup.scss';
@import './components/table.scss';
@import './components/grid.scss';
@import './components/toolbar.scss';
@use './components/column.scss';
@use './components/colgroup.scss';
@use './components/table.scss';
@use './components/grid.scss';
@use './components/toolbar.scss';
4 changes: 2 additions & 2 deletions styles/base.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import './theme/light.scss';
@import './theme/dark.scss';
@use './theme/light.scss';
@use './theme/dark.scss';

%boxSizing {
box-sizing: border-box;
Expand Down
12 changes: 7 additions & 5 deletions styles/components/icon.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@import './old-icon.scss';
@use "sass:map";
@use "sass:list";
@use './old-icon.scss';

@font-face {
font-family: "vxetableiconfont";
Expand Down Expand Up @@ -69,10 +71,10 @@ $btnThemeList: (
&.roll {
animation: rollCircle 1s infinite linear;
}
@for $index from 0 to length($btnThemeList) {
$item: nth($btnThemeList, $index + 1);
&.theme--#{map-get($item, name)} {
color: map-get($item, textColor);
@for $index from 0 to list.length($btnThemeList) {
$item: list.nth($btnThemeList, $index + 1);
&.theme--#{map.get($item, name)} {
color: map.get($item, textColor);
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions styles/components/old-icon.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '../helpers/mixin.scss';

[class*="vxe-icon--"] {
display: inline-block;
vertical-align: middle;
Expand Down
14 changes: 7 additions & 7 deletions styles/components/table-module/all.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import './custom.scss';
@import './edit.scss';
@import './export.scss';
@import './filter.scss';
@import './keyboard.scss';
@import './menu.scss';
@import './validator.scss';
@use './custom.scss';
@use './edit.scss';
@use './export.scss';
@use './filter.scss';
@use './keyboard.scss';
@use './menu.scss';
@use './validator.scss';
4 changes: 2 additions & 2 deletions styles/components/table-module/custom.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../helpers/mixin.scss';
@use '../../helpers/baseMixin.scss';

.vxe-table-custom--option {
position: relative;
Expand Down Expand Up @@ -148,7 +148,7 @@
}

.vxe-table-custom--checkbox-option {
@include createCheckboxIcon();
@include baseMixin.createCheckboxIcon();
}
.vxe-table-custom--checkbox-option,
.vxe-table-custom--sort-option {
Expand Down
4 changes: 2 additions & 2 deletions styles/components/table-module/export.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../helpers/mixin.scss';
@use '../../helpers/baseMixin.scss';

.vxe-export--panel-column > ul {
list-style-type: none;
Expand Down Expand Up @@ -123,5 +123,5 @@
}

.vxe-export--panel-column-option {
@include createCheckboxIcon();
@include baseMixin.createCheckboxIcon();
}
4 changes: 2 additions & 2 deletions styles/components/table-module/filter.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../helpers/mixin.scss';
@use '../../helpers/baseMixin.scss';

.vxe-cell--filter {
padding: 0 0.1em 0 0.2em;
Expand Down Expand Up @@ -108,5 +108,5 @@
}

.vxe-table--filter-option {
@include createCheckboxIcon();
@include baseMixin.createCheckboxIcon();
}
16 changes: 8 additions & 8 deletions styles/components/table.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../helpers/mixin.scss';
@import './icon.scss';
@import './table-module/all.scss';
@use '../helpers/baseMixin.scss';
@use './icon.scss';
@use './table-module/all.scss';

%DefaultColumnHeight {
height: var(--vxe-ui-table-row-height-default);
Expand Down Expand Up @@ -427,7 +427,7 @@
.vxe-filter--btn {
&:before,
&:after {
@include createAnimationTransition(border);
@include baseMixin.createAnimationTransition(border);
}
}

Expand Down Expand Up @@ -953,10 +953,10 @@

// 单选框和复选框
.vxe-cell--radio {
@include createRadioIcon();
@include baseMixin.createRadioIcon();
}
.vxe-cell--checkbox {
@include createCheckboxIcon();
@include baseMixin.createCheckboxIcon();
}

.fixed--hidden {
Expand Down Expand Up @@ -1111,7 +1111,7 @@
.vxe-tree--node-btn {
display: block;
color: var(--vxe-ui-font-lighten-color);
@include createAnimationTransition(transform);
@include baseMixin.createAnimationTransition(transform);
&:hover {
color: var(--vxe-ui-font-color);
}
Expand Down Expand Up @@ -1142,7 +1142,7 @@
text-align: center;
user-select: none;
color: var(--vxe-ui-font-lighten-color);
@include createAnimationTransition(transform);
@include baseMixin.createAnimationTransition(transform);
&:hover {
color: var(--vxe-ui-font-color);
}
Expand Down
2 changes: 0 additions & 2 deletions styles/components/toolbar.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '../helpers/mixin.scss';

/*toolbar*/
.vxe-toolbar {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion styles/cssvar.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*已废弃*/

@import './base.scss';
@use './base.scss';
2 changes: 1 addition & 1 deletion styles/default.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 该文件已废弃,请使用 vxe-table/styles/all.scss

@import './modules.scss';
@use './modules.scss';
File renamed without changes.
4 changes: 2 additions & 2 deletions styles/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 该文件已废弃,请使用 vxe-table/style/all.scss

@import './variable.scss';
@import './default.scss';
@use './variable.scss';
@use './default.scss';
10 changes: 5 additions & 5 deletions styles/modules.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*已废弃*/

@import './components/column.scss';
@import './components/colgroup.scss';
@import './components/table.scss';
@import './components/grid.scss';
@import './components/toolbar.scss';
@use './components/column.scss';
@use './components/colgroup.scss';
@use './components/table.scss';
@use './components/grid.scss';
@use './components/toolbar.scss';
2 changes: 1 addition & 1 deletion styles/theme/dark.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './base.scss';
@use './base.scss';

[data-vxe-ui-theme="dark"] {
color-scheme: dark;
Expand Down
2 changes: 1 addition & 1 deletion styles/theme/light.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './base.scss';
@use './base.scss';

[data-vxe-ui-theme="light"] {
/*font color*/
Expand Down
2 changes: 1 addition & 1 deletion styles/variable.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*已废弃*/

@import './base.scss';
@use './base.scss';

0 comments on commit 7df725c

Please sign in to comment.