dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13221 from dataease/pr@dev-v2@fix_table_normal_row_col_freeze

Browse Source 
fix(图表): 修复汇总表冻结列无法编辑
This commit is contained in:
wisonic-s 2024-11-08 15:44:39 +08:00 committed by GitHub
commit 563712dbfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue
View File

@ -322,7 +322,7 @@ onMounted(() => {
<el-checkbox
size="small"
:effect="themes"
:disabled="state.tableCellForm.mergeCells"
:disabled="showProperty('mergeCells') && state.tableCellForm.mergeCells"
v-model="state.tableCellForm.tableFreeze"
@change="changeTableCell('tableFreeze')"
>
@ -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')"