Skip to content

Commit

Permalink
releases 3.8.18
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Aug 7, 2024
1 parent e51c95f commit 3b2bb6f
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 28 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": "3.8.17",
"version": "3.8.18",
"description": "一个基于 vue 的 PC 端表单/表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down
56 changes: 29 additions & 27 deletions packages/table/src/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -1258,33 +1258,35 @@ export default {
ctxMenuOpts
}
}) : _e(),
/**
* 通用提示
*/
hasTip ? h('vxe-tooltip', {
ref: 'commTip',
props: {
isArrow: false,
enterable: false
}
}) : _e(),
/**
* 工具提示
*/
hasTip ? h('vxe-tooltip', {
ref: 'tooltip',
props: Object.assign({}, this.tipConfig, this.tooltipStore.currOpts)
}) : _e(),
/**
* 校验提示
*/
hasTip && this.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? h('vxe-tooltip', {
ref: 'validTip',
class: [{
'old-cell-valid': editRules && GlobalConfig.cellVaildMode === 'obsolete'
}, 'vxe-table--valid-error'],
props: validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : null
}) : _e()
h('div', {}, [
/**
* 通用提示
*/
hasTip ? h('vxe-tooltip', {
ref: 'commTip',
props: {
isArrow: false,
enterable: false
}
}) : _e(),
/**
* 工具提示
*/
hasTip ? h('vxe-tooltip', {
ref: 'tooltip',
props: Object.assign({}, this.tipConfig, this.tooltipStore.currOpts)
}) : _e(),
/**
* 校验提示
*/
hasTip && this.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? h('vxe-tooltip', {
ref: 'validTip',
class: [{
'old-cell-valid': editRules && GlobalConfig.cellVaildMode === 'obsolete'
}, 'vxe-table--valid-error'],
props: validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : null
}) : _e()
])
])
},
methods
Expand Down

0 comments on commit 3b2bb6f

Please sign in to comment.