lxm_front/vxe-table
1
0
Fork 0
mirror of synced 2025-12-12 09:10:58 +08:00
Code Issues Projects Releases Wiki Activity

修复渲染逻辑

Browse Source
This commit is contained in:
xuliangzhan
2023-06-07 08:17:13 +08:00
parent af99cd5251
commit 26871e614a
10 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.en.md
View File

@@ -94,7 +94,6 @@ Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.ne
```javascript
import { createApp } from 'vue'
import 'xe-utils'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'

1
README.md
View File

@@ -99,7 +99,6 @@ Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.ne
```javascript
import { createApp } from 'vue'
import 'xe-utils'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'

1
README.zh-TW.md
View File

@@ -93,7 +93,6 @@ Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.ne
```javascript
import { createApp } from 'vue'
import 'xe-utils'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'

4
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.4.2-beta.1",
"version": "4.4.2-beta.2",
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
"scripts": {
"update": "npm install --legacy-peer-deps",
@@ -65,7 +65,7 @@
"vue-i18n": "^9.1.7",
"vue-router": "^4.0.11",
"vuex": "^4.0.2",
"xe-utils": "^3.5.10"
"xe-utils": "^3.5.11"
},
"peerDependencies": {
"vue": "^3.2.28",

2
packages/table/src/cell.ts
View File

@@ -67,7 +67,7 @@ function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams, con
}) : h('span', {
class: 'vxe-cell--title',
...ons
}, content)
}, getSlotVNs(content))
]
}

24
styles/base/checked.scss
View File

@@ -3,31 +3,31 @@
font-size: 1.34em;
}
.vxe-checkbox--icon {
color: $vxe-input-border-color;
color: var(--vxe-input-border-color);
vertical-align: middle;
font-weight: 700;
user-select: none;
}
&.is--checked,
&.is--indeterminate {
color: $vxe-primary-color;
color: var(--vxe-primary-color);
.vxe-checkbox--icon {
color: $vxe-primary-color;
color: var(--vxe-primary-color);
}
}
&:not(.is--disabled) {
cursor: pointer;
&:hover {
.vxe-checkbox--icon {
color: $vxe-primary-color;
color: var(--vxe-primary-color);
}
}
}
&.is--disabled {
color: $vxe-disabled-color;
color: var(--vxe-disabled-color);
cursor: not-allowed;
.vxe-checkbox--icon {
color: $vxe-input-disabled-color;
color: var(--vxe-input-disabled-color);
}
}
.vxe-checkbox--label {
@@ -42,30 +42,30 @@
font-size: 1.4em;
}
.vxe-radio--icon {
color: $vxe-input-border-color;
color: var(--vxe-input-border-color);
vertical-align: middle;
font-weight: 700;
user-select: none;
}
&.is--checked {
color: $vxe-primary-color;
color: var(--vxe-primary-color);
.vxe-radio--icon {
color: $vxe-primary-color;
color: var(--vxe-primary-color);
}
}
&:not(.is--disabled) {
cursor: pointer;
&:hover {
.vxe-radio--icon {
color: $vxe-primary-color;
color: var(--vxe-primary-color);
}
}
}
&.is--disabled {
color: $vxe-disabled-color;
color: var(--vxe-disabled-color);
cursor: not-allowed;
.vxe-radio--icon {
color: $vxe-input-disabled-color;
color: var(--vxe-input-disabled-color);
}
}
.vxe-radio--label {

12
styles/base/common.scss
View File

@@ -19,22 +19,22 @@
}
.vxe-primary-color {
color: $vxe-primary-color;
color: var(--vxe-primary-color);
}
.vxe-success-color {
color: $vxe-success-color;
color: var(--vxe-success-color);
}
.vxe-info-color {
color: $vxe-info-color;
color: var(--vxe-info-color);
}
.vxe-warning-color {
color: $vxe-warning-color;
color: var(--vxe-warning-color);
}
.vxe-danger-color {
color: $vxe-danger-color;
color: var(--vxe-danger-color);
}
.vxe-perfect-color {
color: $vxe-table-header-background-color;
color: var(--vxe-table-header-background-color);
}
// 24 栅格布局

2
styles/form.scss
View File

@@ -226,7 +226,7 @@
}
.vxe-default-input[type="submit"],
.vxe-default-input[type="reset"] {
line-height: var(--vxe-button-height-default) - 2px;
line-height: calc(var(--vxe-button-height-default) - 2px);
background-color: #fff;
cursor: pointer;
&:hover {

8
styles/radio.scss
View File

@@ -74,7 +74,7 @@
}
.vxe-radio--label {
padding: 0 1em;
line-height: var(--vxe-button-height-default) - 2;
line-height: calc(var(--vxe-button-height-default) - 2px);
display: inline-block;
border-style: solid;
border-color: var(--vxe-input-border-color);
@@ -119,17 +119,17 @@
}
&.size--medium {
.vxe-radio--label {
line-height: var(--vxe-button-height-medium) - 2;
line-height: calc(var(--vxe-button-height-medium) - 2px);
}
}
&.size--small {
.vxe-radio--label {
line-height: var(--vxe-button-height-small) - 2;
line-height: calc(var(--vxe-button-height-small) - 2px);
}
}
&.size--mini {
.vxe-radio--label {
line-height: var(--vxe-button-height-mini) - 2;
line-height: calc(var(--vxe-button-height-mini) - 2px);
}
}
}

2
styles/table.scss
View File

@@ -1284,7 +1284,7 @@
}
}
.vxe-textarea {
height: var(--vxe-table-row-line-height) - 1;
height: calc(var(--vxe-table-row-line-height) - 1px);
.vxe-textarea--inner {
border: 0;
}