diff --git a/examples/views/table/TableTest9.vue b/examples/views/table/TableTest9.vue
index 4d84a2e61a..48d6a91422 100644
--- a/examples/views/table/TableTest9.vue
+++ b/examples/views/table/TableTest9.vue
@@ -1,66 +1,188 @@
+ 加载5k条
+ 加载1w条
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
diff --git a/package.json b/package.json
index d3cd31e79e..c62046f29d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vxe-table",
- "version": "4.9.9",
+ "version": "4.9.10",
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
diff --git a/packages/table/module/export/import-panel.ts b/packages/table/module/export/import-panel.ts
index 376b8c4657..8251c78315 100644
--- a/packages/table/module/export/import-panel.ts
+++ b/packages/table/module/export/import-panel.ts
@@ -225,7 +225,7 @@ export default defineComponent({
VxeUIButtonComponent
? h(VxeUIButtonComponent, {
status: 'primary',
- disabled: !hasFile || reactData.loading, //没有文件或者正在导入时禁用
+ disabled: !hasFile || reactData.loading,
content: getI18n('vxe.import.impConfirm'),
onClick: importEvent
})
diff --git a/packages/table/src/columnInfo.ts b/packages/table/src/columnInfo.ts
index e980ad6a83..868c709329 100644
--- a/packages/table/src/columnInfo.ts
+++ b/packages/table/src/columnInfo.ts
@@ -13,6 +13,7 @@ export class ColumnInfo {
const $xeGrid = $xeTable.xegrid
const formatter: string | any[] = _vm.formatter
const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
+ const { props: tableProps } = $xeTable
if (process.env.VUE_APP_VXE_ENV === 'development') {
const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
@@ -29,7 +30,6 @@ export class ColumnInfo {
warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render'])
}
if (_vm.type === 'expand') {
- const { props: tableProps } = $xeTable
const { treeConfig } = tableProps
const { computeTreeOpts } = $xeTable.getComputeMaps()
const treeOpts = computeTreeOpts.value
diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
index bcc5f89541..76538abb1e 100644
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -2491,7 +2491,7 @@ export default defineComponent({
* @param {Array} datas 数据
*/
const loadTableData = (datas: any[]) => {
- const { keepSource, treeConfig } = props
+ const { keepSource, treeConfig, showOverflow } = props
const { editStore, scrollYLoad: oldScrollYLoad } = reactData
const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData
const treeOpts = computeTreeOpts.value
@@ -2556,8 +2556,15 @@ export default defineComponent({
if (keepSource) {
tablePrivateMethods.cacheSourceMap(fullData)
}
- if (process.env.VUE_APP_VXE_ENV === 'development') {
- if (sYLoad) {
+ if (sYLoad) {
+ if (showOverflow) {
+ const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+ if (errColumn) {
+ errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+ }
+ }
+
+ if (process.env.VUE_APP_VXE_ENV === 'development') {
if (!(props.height || props.maxHeight)) {
errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
}