Commit bc55b92c9b6cecb01a55f5e5893297ae43857e1e
Committed by
GitHub
1 parent
f1e8e241
fix(expandtable): 恢复可展开表格Demo,修复开启可展开表格后横向滚动失效问题 (#2050)
Co-authored-by: jinmao88 <50581550+jinmao88@users.noreply.github.com>
Showing
2 changed files
with
5 additions
and
4 deletions
Too many changes to show.
To preserve performance only 2 of 3 files are displayed.
src/components/Table/src/BasicTable.vue
@@ -253,9 +253,9 @@ | @@ -253,9 +253,9 @@ | ||
253 | footer: unref(getFooterProps), | 253 | footer: unref(getFooterProps), |
254 | ...unref(getExpandOption), | 254 | ...unref(getExpandOption), |
255 | }; | 255 | }; |
256 | - if (slots.expandedRowRender) { | ||
257 | - propsData = omit(propsData, 'scroll'); | ||
258 | - } | 256 | + // if (slots.expandedRowRender) { |
257 | + // propsData = omit(propsData, 'scroll'); | ||
258 | + // } | ||
259 | 259 | ||
260 | propsData = omit(propsData, ['class', 'onChange']); | 260 | propsData = omit(propsData, ['class', 'onChange']); |
261 | return propsData; | 261 | return propsData; |
src/views/demo/table/ExpandTable.vue
1 | <template> | 1 | <template> |
2 | <PageWrapper | 2 | <PageWrapper |
3 | title="可展开表格" | 3 | title="可展开表格" |
4 | - content="不可与scroll共用。TableAction组件可配置stopButtonPropagation来阻止操作按钮的点击事件冒泡,以便配合Table组件的expandRowByClick" | 4 | + content="TableAction组件可配置stopButtonPropagation来阻止操作按钮的点击事件冒泡,以便配合Table组件的expandRowByClick" |
5 | > | 5 | > |
6 | <BasicTable @register="registerTable"> | 6 | <BasicTable @register="registerTable"> |
7 | <template #expandedRowRender="{ record }"> | 7 | <template #expandedRowRender="{ record }"> |
@@ -56,6 +56,7 @@ | @@ -56,6 +56,7 @@ | ||
56 | width: 160, | 56 | width: 160, |
57 | title: 'Action', | 57 | title: 'Action', |
58 | dataIndex: 'action', | 58 | dataIndex: 'action', |
59 | + fixed: 'right', | ||
59 | // slots: { customRender: 'action' }, | 60 | // slots: { customRender: 'action' }, |
60 | }, | 61 | }, |
61 | }); | 62 | }); |