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')"