Skip to content

Commit

Permalink
修复已知问题
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Mar 20, 2020
1 parent ed1e8b4 commit 5e4d0c0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
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": "2.8.29",
"version": "2.8.30",
"description": "vxe-table vue 表格解决方案",
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
8 changes: 4 additions & 4 deletions packages/body/src/body.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
let isDirty
const tdOns = {}
const cellAlign = align || allAlign
const validError = validStore.row === row && validStore.column === column
const hasValidError = validStore.row === row && validStore.column === column
const hasDefaultTip = editRules && (validOpts.message === 'default' ? (height || tableData.length > 1) : validOpts.message === 'inline')
const attrs = { 'data-colid': column.id }
const triggerDblclick = (editRender && editConfig && editOpts.trigger === 'dblclick')
Expand Down Expand Up @@ -215,13 +215,13 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
[`col--${type}`]: type,
'col--last': $columnIndex === columns.length - 1,
'col--tree-node': treeNode,
'col--edit': editRender,
'col--edit': !!editRender,
'col--ellipsis': hasEllipsis,
'edit--visible': editRender && editRender.type === 'visible',
'fixed--hidden': fixedHiddenColumn,
'col--dirty': isDirty,
'col--actived': editConfig && editRender && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
'col--valid-error': validError,
'col--valid-error': hasValidError,
'col--current': currentColumn === column
}, UtilTools.getClass(className, params), UtilTools.getClass(cellClassName, params)],
key: columnKey ? column.id : columnIndex,
Expand Down Expand Up @@ -249,7 +249,7 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
title: showTitle ? UtilTools.getCellLabel(row, column, params) : null
}
}, column.renderCell(h, params)),
hasDefaultTip ? validError ? h('div', {
hasDefaultTip ? hasValidError ? h('div', {
class: 'vxe-cell--valid',
style: validStore.rule && validStore.rule.maxWidth ? {
width: `${validStore.rule.maxWidth}px`
Expand Down
1 change: 0 additions & 1 deletion packages/footer/src/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ export default {
'col--last': $columnIndex === tableColumn.length - 1,
'fixed--hidden': fixedHiddenColumn,
'col--ellipsis': hasEllipsis,
'filter--active': column.filters && column.filters.some(item => item.checked),
'col--current': currentColumn === column
}, UtilTools.getClass(footerClassName, params), UtilTools.getClass(footerCellClassName, params)],
attrs,
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/src/grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default {
const { vSize, isZMax, optimizeOpts } = this
return ['vxe-grid', {
[`size--${vSize}`]: vSize,
't--animat': optimizeOpts.animat,
't--animat': !!optimizeOpts.animat,
'is--maximize': isZMax,
'is--loading': this.isCloak || this.loading || this.tableLoading
}]
Expand Down
2 changes: 1 addition & 1 deletion packages/header/src/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export default {
'col--ellipsis': hasEllipsis,
'fixed--hidden': fixedHiddenColumn,
'is--sortable': column.sortable,
'is--filter': column.filters,
'is--filter': !!column.filters,
'filter--active': hasFilter,
'col--current': currentColumn === column
}, UtilTools.getClass(headerClassName, params), UtilTools.getClass(headerCellClassName, params)],
Expand Down
4 changes: 2 additions & 2 deletions packages/table/src/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ export default {
}
return h('div', {
class: ['vxe-table', `tid_${id}`, vSize ? `size--${vSize}` : '', `border--${tableBorder}`, {
'vxe-editable': editConfig,
'vxe-editable': !!editConfig,
'show--head': showHeader,
'show--foot': showFooter,
'is--group': isGroup,
Expand All @@ -834,7 +834,7 @@ export default {
'fixed--left': leftList.length,
'fixed--right': rightList.length,
'c--highlight': highlightCell,
't--animat': optimizeOpts.animat,
't--animat': !!optimizeOpts.animat,
't--stripe': stripe,
't--selected': mouseConfig && mouseOpts.selected,
't--checked': isMouseChecked,
Expand Down

0 comments on commit 5e4d0c0

Please sign in to comment.