Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix Bug 53916

Browse source
This commit is contained in:
Julia Radzhabova 2021-11-26 15:54:27 +03:00
parent 592f1cfcd2
commit 4c26c97ef7
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -186,6 +186,7 @@ define([
} }
this._settings[Common.Utils.documentSettingsType.Signature].locked = false; this._settings[Common.Utils.documentSettingsType.Signature].locked = false;
var locktext = false;
for (i=0; i<SelectedObjects.length; ++i) for (i=0; i<SelectedObjects.length; ++i)
{ {
var eltype = SelectedObjects[i].asc_getObjectType(), var eltype = SelectedObjects[i].asc_getObjectType(),
@ -195,6 +196,7 @@ define([
var value = SelectedObjects[i].asc_getObjectValue(); var value = SelectedObjects[i].asc_getObjectValue();
if (settingsType == Common.Utils.documentSettingsType.Image) { if (settingsType == Common.Utils.documentSettingsType.Image) {
locktext = locktext || value.asc_getProtectionLockText();
if (value.asc_getChartProperties() !== null) { if (value.asc_getChartProperties() !== null) {
settingsType = Common.Utils.documentSettingsType.Chart; settingsType = Common.Utils.documentSettingsType.Chart;
this._settings[settingsType].btn.updateHint(this.rightmenu.txtChartSettings); this._settings[settingsType].btn.updateHint(this.rightmenu.txtChartSettings);
@ -203,20 +205,23 @@ define([
if (value.asc_getShapeProperties().asc_getTextArtProperties()) { if (value.asc_getShapeProperties().asc_getTextArtProperties()) {
this._settings[Common.Utils.documentSettingsType.TextArt].props = value; this._settings[Common.Utils.documentSettingsType.TextArt].props = value;
this._settings[Common.Utils.documentSettingsType.TextArt].hidden = 0; this._settings[Common.Utils.documentSettingsType.TextArt].hidden = 0;
this._settings[Common.Utils.documentSettingsType.TextArt].locked = value.asc_getLocked() || this._state.wsProps['Objects']; this._settings[Common.Utils.documentSettingsType.TextArt].locked = value.asc_getLocked() || this._state.wsProps['Objects'] && value.asc_getProtectionLockText();
} }
} else if (value.asc_getSlicerProperties() !== null) { } else if (value.asc_getSlicerProperties() !== null) {
settingsType = Common.Utils.documentSettingsType.Slicer; settingsType = Common.Utils.documentSettingsType.Slicer;
} }
this._settings[settingsType].locked = value.asc_getLocked() || this._state.wsProps['Objects'] && value.asc_getProtectionLocked();
} else {
this._settings[settingsType].locked = value.asc_getLocked();
} }
this._settings[settingsType].props = value; this._settings[settingsType].props = value;
this._settings[settingsType].hidden = 0; this._settings[settingsType].hidden = 0;
this._settings[settingsType].locked = value.asc_getLocked() || this._state.wsProps['Objects'];
if (!this._settings[Common.Utils.documentSettingsType.Signature].locked) // lock Signature, если хотя бы один объект locked if (!this._settings[Common.Utils.documentSettingsType.Signature].locked) // lock Signature, если хотя бы один объект locked
this._settings[Common.Utils.documentSettingsType.Signature].locked = value.asc_getLocked(); this._settings[Common.Utils.documentSettingsType.Signature].locked = value.asc_getLocked();
if (!this._settings[Common.Utils.documentSettingsType.Paragraph].locked) // lock Paragraph, если хотя бы у одной автофигуры заблокирован текст
this._settings[Common.Utils.documentSettingsType.Paragraph].locked = this._state.wsProps['Objects'] && locktext;
} }
if (formatTableInfo) { if (formatTableInfo) {