lxm_front/vxe-table
1
0
Fork 0
mirror of https://gitee.com/xuliangzhan_admin/vxe-table.git synced 2026-01-21 05:27:57 +08:00
Code Issues Projects Releases Wiki Activity

修复样式问题 #2096

Browse Source
This commit is contained in:
xuliangzhan
2023-06-27 08:16:28 +08:00
parent 538ceccff9
commit 2bca6360ff
8 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "3.6.14",
"version": "3.6.15",
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
"scripts": {
"update": "npm install --legacy-peer-deps",

10
packages/form/src/form.js
View File

@@ -468,7 +468,15 @@ export default {
}
} else {
const isArrType = type === 'array'
const hasEmpty = isArrType || XEUtils.isArray(itemValue) ? (!XEUtils.isArray(itemValue) || !itemValue.length) : eqEmptyValue(itemValue)
const isArrVal = XEUtils.isArray(itemValue)
let hasEmpty = true
if (isArrType || isArrVal) {
hasEmpty = !isArrVal || !itemValue.length
} else if (XEUtils.isString(itemValue)) {
hasEmpty = eqEmptyValue(itemValue.trim())
} else {
hasEmpty = eqEmptyValue(itemValue)
}
if (required ? (hasEmpty || validErrorRuleValue(rule, itemValue)) : (!hasEmpty && validErrorRuleValue(rule, itemValue))) {
errorRules.push(new Rule(rule))
}

10
packages/validator/src/mixin.js
View File

@@ -278,7 +278,15 @@ export default {
}
} else {
const isArrType = type === 'array'
const hasEmpty = isArrType || XEUtils.isArray(cellValue) ? (!XEUtils.isArray(cellValue) || !cellValue.length) : eqEmptyValue(cellValue)
const isArrVal = XEUtils.isArray(cellValue)
let hasEmpty = true
if (isArrType || isArrVal) {
hasEmpty = !isArrVal || !cellValue.length
} else if (XEUtils.isString(cellValue)) {
hasEmpty = eqEmptyValue(cellValue.trim())
} else {
hasEmpty = eqEmptyValue(cellValue)
}
if (required ? (hasEmpty || validErrorRuleValue(rule, cellValue)) : (!hasEmpty && validErrorRuleValue(rule, cellValue))) {
this.validRuleErr = true
errorRules.push(new Rule(rule))

8
styles/form.scss
View File

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

6
styles/input.scss
View File

@@ -819,7 +819,7 @@ $iconWidth: 1.6em;
}
.vxe-input--date-picker-body table,
.vxe-input--time-picker-body {
height: calc(nth($timeWeekRowHeightList, $sizeIndex) * 6 + nth($titleRowHeightList, $sizeIndex));
height: nth($timeWeekRowHeightList, $sizeIndex) * 6 + nth($titleRowHeightList, $sizeIndex);
}
.vxe-input--time-picker-body {
$ulWidthList: 48px, 48px, 44px, 42px;
@@ -839,7 +839,7 @@ $iconWidth: 1.6em;
left: nth($ulWidthList, $sizeIndex);
}
.vxe-input--time-picker-second-list {
left: calc(nth($ulWidthList, $sizeIndex) * 2);
left: nth($ulWidthList, $sizeIndex) * 2;
}
}
.vxe-input--date-day-view,
@@ -870,7 +870,7 @@ $iconWidth: 1.6em;
padding: 0 10px - $sizeIndex;
}
.vxe-input--date-label {
line-height: calc(nth($fontSizeList, $sizeIndex) + 1px);
line-height: nth($fontSizeList, $sizeIndex) + 1px;
}
}

8
styles/radio.scss
View File

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

2
styles/table.scss
View File

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

2
types/v-x-e-table/renderer.d.ts vendored
View File

@@ -59,7 +59,9 @@ export interface RendererMapOptions {
renderExpand?(h: CreateElement, renderOpts: ColumnContentRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
// 工具栏-按钮渲染
toolbarButtonClassName?: string | ((params: ToolbarButtonRenderParams) => string | VNodeClassName)
renderToolbarButton?(h: CreateElement, renderOpts: ToolbarButtonRenderOptions, params: ToolbarButtonRenderParams): SlotVNodeType | SlotVNodeType[];
toolbarToolClassName?: string | ((params: ToolbarToolRenderParams) => string | VNodeClassName)
renderToolbarTool?(h: CreateElement, renderOpts: ToolbarToolRenderOptions, params: ToolbarToolRenderParams): SlotVNodeType | SlotVNodeType[];
// 表单-项渲染