From f8068259acbd246ec906af1bc9b3917069ffb5c1 Mon Sep 17 00:00:00 2001 From: Dmitry-Ilyushechkin Date: Wed, 8 Oct 2025 13:08:36 +0300 Subject: [PATCH] Revert "[DE, PDFE, PE] fix: reset data labels state before setting position" This reverts commit 122095eb64aeda9ec7b58771d28d69df314e35a0. --- .../main/app/controller/DocumentHolderExt.js | 9 --------- .../main/app/controller/DocumentHolderExt.js | 11 +---------- .../main/app/controller/DocumentHolderExt.js | 11 +---------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/apps/documenteditor/main/app/controller/DocumentHolderExt.js b/apps/documenteditor/main/app/controller/DocumentHolderExt.js index f6129837ff..9f271d2879 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolderExt.js +++ b/apps/documenteditor/main/app/controller/DocumentHolderExt.js @@ -956,39 +956,30 @@ define([], function () { chartProps.setDisplayChartTitle(true, true); break; case 'CenterData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.ctr); break; case 'InnerBottomData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.inBase); break; case 'InnerTopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.inEnd); break; case 'OuterTopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.outEnd); break; case 'TopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.t); break; case 'LeftData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.l); break; case 'RightData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.r); break; case 'BottomData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.b); break; case 'FitWidthData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.bestFit); break; case 'bShowDataLabels': diff --git a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js index 5fe6e69327..d7ecb0fa27 100644 --- a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js +++ b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js @@ -2782,39 +2782,30 @@ define([], function () { chartProps.setDisplayChartTitle(true, true); break; case 'CenterData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.ctr); break; case 'InnerBottomData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.inBase); break; case 'InnerTopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.inEnd); break; case 'OuterTopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.outEnd); break; case 'TopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.t); break; case 'LeftData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.l); break; case 'RightData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.r); break; case 'BottomData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.b); break; case 'FitWidthData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.bestFit); break; case 'bShowDataLabels': @@ -3067,7 +3058,7 @@ define([], function () { me.isRtlSheet = me.api ? Common.UI.isRTL() : false; if (me.chartProps) { - + if (!me.btnChartElement) { me.btnChartElement = new Common.UI.Button({ parentEl: $('#id-document-holder-btn-chart-element'), diff --git a/apps/presentationeditor/main/app/controller/DocumentHolderExt.js b/apps/presentationeditor/main/app/controller/DocumentHolderExt.js index d36eaed486..b41c3855c4 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolderExt.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolderExt.js @@ -911,39 +911,30 @@ define([], function () { chartProps.setDisplayChartTitle(true, true); break; case 'CenterData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.ctr); break; case 'InnerBottomData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.inBase); break; case 'InnerTopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.inEnd); break; case 'OuterTopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.outEnd); break; case 'TopData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.t); break; case 'LeftData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.l); break; case 'RightData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.r); break; case 'BottomData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.b); break; case 'FitWidthData': - if (chartProps.getDataLabelsPos() === 0) chartProps.setDisplayDataLabels(false, false); chartProps.setDisplayDataLabels(true, Asc.c_oAscChartDataLabelsPos.bestFit); break; case 'bShowDataLabels': @@ -1210,7 +1201,7 @@ define([], function () { me.isRtlSheet = me.api ? Common.UI.isRTL() : false; if (me.chartProps) { - + if (!me.btnChartElement) { me.btnChartElement = new Common.UI.Button({ parentEl: $('#id-document-holder-btn-chart-element'),