From bc55b92c9b6cecb01a55f5e5893297ae43857e1e Mon Sep 17 00:00:00 2001 From: quyanan <929188726@qq.com> Date: Thu, 7 Jul 2022 15:42:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(expandtable):=20=E6=81=A2=E5=A4=8D=E5=8F=AF?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E8=A1=A8=E6=A0=BCDemo,=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=8F=AF=E5=B1=95=E5=BC=80=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=90=8E=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#2050)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jinmao88 <50581550+jinmao88@users.noreply.github.com> --- src/components/Table/src/BasicTable.vue | 6 +- src/views/demo/table/ExpandTable.vue | 3 +- yarn.lock | 10049 ++++++++++++++++++++++ 3 files changed, 10054 insertions(+), 4 deletions(-) create mode 100644 yarn.lock diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 621ec1175..64d1db468 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/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; diff --git a/src/views/demo/table/ExpandTable.vue b/src/views/demo/table/ExpandTable.vue index 2875a4f4a..3b76f9fe1 100644 --- a/src/views/demo/table/ExpandTable.vue +++ b/src/views/demo/table/ExpandTable.vue @@ -1,7 +1,7 @@