{
const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties();
const chartType = chartProperties && chartProperties.getType();
- const disableSetting = (
+ const disableEditAxis = (
chartType == Asc.c_oAscChartTypeSettings.pie ||
chartType == Asc.c_oAscChartTypeSettings.doughnut ||
chartType == Asc.c_oAscChartTypeSettings.pie3d
);
+ const disableAxisPos = (
+ chartType == Asc.c_oAscChartTypeSettings.barNormal3d ||
+ chartType == Asc.c_oAscChartTypeSettings.barStacked3d ||
+ chartType == Asc.c_oAscChartTypeSettings.barStackedPer3d ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarNormal3d ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarStacked3d ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarStackedPer3d ||
+ chartType == Asc.c_oAscChartTypeSettings.barNormal3dPerspective
+ );
+
+ const needReverse = (
+ chartType == Asc.c_oAscChartTypeSettings.hBarNormal ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarStacked ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarStackedPer ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarNormal3d ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarStacked3d ||
+ chartType == Asc.c_oAscChartTypeSettings.hBarStackedPer3d
+ );
+
return (
@@ -1393,11 +1416,21 @@ const EditChart = props => {
onBorderSize: props.onBorderSize
}}>
- {
onVerAxisTickMinor: props.onVerAxisTickMinor,
onVerAxisLabelPos: props.onVerAxisLabelPos
}}>
-
{
const PageSheet = ({curSheet, sheets, changeSheet, storeFocusObjects}) => {
const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true});
- const [stateSheet, setSheet] = useState(curSheet.value);
+ const [stateSheet, setSheet] = useState(curSheet);
const settings = !storeFocusObjects.focusOn ? [] : (storeFocusObjects.focusOn === 'obj' ? storeFocusObjects.objects : storeFocusObjects.selections);
if (storeFocusObjects.focusOn === 'obj' || settings.indexOf('hyperlink') === -1) {
@@ -59,10 +59,10 @@ const PageSheet = ({curSheet, sheets, changeSheet, storeFocusObjects}) => {
key={`sheet-${sheet.value}`}
title={sheet.caption}
radio
- checked={stateSheet === sheet.value}
- onClick={() => {
- setSheet(sheet.value);
- changeSheet(sheet);
+ checked={stateSheet === sheet.caption}
+ onChange={() => {
+ setSheet(sheet.caption);
+ changeSheet(sheet.caption);
}}
/>
)
@@ -80,13 +80,15 @@ const EditLink = props => {
const linkInfo = props.linkInfo;
const isLock = props.isLock;
const sheets = props.sheets;
- const activeSheet = props.activeSheet;
const currentSheet = props.currentSheet;
- const valueLinkInfo = linkInfo.asc_getType();
- const linkSheet = (valueLinkInfo == Asc.c_oAscHyperlinkType.RangeLink) ? linkInfo.asc_getSheet() : currentSheet;
-
- const [typeLink, setTypeLink] = useState(valueLinkInfo);
+ const valueTypeLink = linkInfo.asc_getType();
+ const valueLinkSheet = linkInfo.asc_getSheet();
+ const getLinkSheet = () => sheets.find(sheet => sheet.caption === valueLinkSheet);
+ const linkSheet = (valueTypeLink == Asc.c_oAscHyperlinkType.RangeLink) ? getLinkSheet() ? getLinkSheet().caption : '' : currentSheet;
+
+ const [typeLink, setTypeLink] = useState(valueTypeLink);
const textType = typeLink != Asc.c_oAscHyperlinkType.RangeLink ? _t.textExternalLink : _t.textInternalDataRange;
+
const changeType = (newType) => {
setTypeLink(newType);
};
@@ -98,7 +100,8 @@ const EditLink = props => {
const [screenTip, setScreenTip] = useState(linkInfo.asc_getTooltip());
- const [curSheet, setSheet] = useState(activeSheet);
+ const [curSheet, setSheet] = useState(linkSheet);
+
const changeSheet = (sheet) => {
setSheet(sheet);
};
@@ -123,8 +126,8 @@ const EditLink = props => {
/>
}
{typeLink == Asc.c_oAscHyperlinkType.RangeLink &&
-
@@ -156,10 +159,10 @@ const EditLink = props => {
{props.onEditLink(typeLink === 1 ?
{type: 1, url: link, text: stateDisplayText, tooltip: screenTip} :
- {type: 2, url: range, sheet: curSheet.caption, text: stateDisplayText, tooltip: screenTip})}}
+ {type: 2, url: range, sheet: curSheet, text: stateDisplayText, tooltip: screenTip})}}
/>