From 0f9ffdc05c8ef416c09b229d92561e71a5c017fb Mon Sep 17 00:00:00 2001 From: wisonic Date: Fri, 8 Nov 2024 15:42:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=A1=A8=E5=86=BB=E7=BB=93=E5=88=97=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/table/TableCellSelector.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue index d65bc6a145..d72377dadd 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue @@ -322,7 +322,7 @@ onMounted(() => { @@ -341,7 +341,10 @@ onMounted(() => { :effect="themes" controls-position="right" v-model="state.tableCellForm.tableColumnFreezeHead" - :disabled="!state.tableCellForm.tableFreeze || state.tableCellForm.mergeCells" + :disabled=" + (showProperty('mergeCells') && state.tableCellForm.mergeCells) || + !state.tableCellForm.tableFreeze + " :min="0" :max="100" @change="changeTableCell('tableColumnFreezeHead')" @@ -359,7 +362,10 @@ onMounted(() => { :effect="themes" controls-position="right" v-model="state.tableCellForm.tableRowFreezeHead" - :disabled="!state.tableCellForm.tableFreeze || state.tableCellForm.mergeCells" + :disabled=" + (showProperty('mergeCells') && state.tableCellForm.mergeCells) || + !state.tableCellForm.tableFreeze + " :min="0" :max="100" @change="changeTableCell('tableRowFreezeHead')"