From b8dd53d906dfaa5fc2864d775dd7b316f55dfdca Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 22 Dec 2022 17:55:34 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E8=A7=86=E5=9B=BE):=20=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=90=8E=E7=A6=81=E6=AD=A2=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/table/TableNormal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index 71b75c6e52..3610b694b8 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -35,7 +35,7 @@ :key="field.name" :field="field.child ? '' : field.dataeaseName" :resizable="true" - :sortable="(!field.child || !field.child.length)" + :sortable="(!mergeCells || !mergeCells.length) && (!field.child || !field.child.length)" :title="field.name" :width="columnWidth" >