Browse Source

fix(expandtable): 恢复可展开表格Demo,修复开启可展开表格后横向滚动失效问题 (#2050)

Co-authored-by: jinmao88 <50581550+jinmao88@users.noreply.github.com>
pull/2053/head
quyanan 4 years ago
committed by GitHub
parent
commit
bc55b92c9b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/components/Table/src/BasicTable.vue
  2. 3
      src/views/demo/table/ExpandTable.vue
  3. 10049
      yarn.lock

6
src/components/Table/src/BasicTable.vue

@ -253,9 +253,9 @@
footer: unref(getFooterProps),
...unref(getExpandOption),
};
if (slots.expandedRowRender) {
propsData = omit(propsData, 'scroll');
}
// if (slots.expandedRowRender) {
// propsData = omit(propsData, 'scroll');
// }
propsData = omit(propsData, ['class', 'onChange']);
return propsData;

3
src/views/demo/table/ExpandTable.vue

@ -1,7 +1,7 @@
<template>
<PageWrapper
title="可展开表格"
content="不可与scroll共用。TableAction组件可配置stopButtonPropagation来阻止操作按钮的点击事件冒泡,以便配合Table组件的expandRowByClick"
content="TableAction组件可配置stopButtonPropagation来阻止操作按钮的点击事件冒泡,以便配合Table组件的expandRowByClick"
>
<BasicTable @register="registerTable">
<template #expandedRowRender="{ record }">
@ -56,6 +56,7 @@
width: 160,
title: 'Action',
dataIndex: 'action',
fixed: 'right',
// slots: { customRender: 'action' },
},
});

10049
yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save