pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/bug-74235' (#405) from fix/bug-74235 into release/v9.0.0

Browse Source
This commit is contained in:
Julia Radzhabova
2025-05-07 11:35:52 +00:00
parent 334c8ce8a7 57f2a039b4
commit f72c8485e2
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/pdfeditor/main/app/controller/Toolbar.js
View File

@ -571,7 +571,10 @@ define([
annot_lock = false,
page_deleted = false,
page_rotate = false,
page_edit_text = false;
page_edit_text = false,
in_form = false,
in_check_form = false,
in_text_form = false;
while (++i < selectedObjects.length) {
type = selectedObjects[i].get_ObjectType();
@ -619,6 +622,12 @@ define([
page_deleted = pr.asc_getDeleteLock();
page_rotate = pr.asc_getRotateLock();
page_edit_text = pr.asc_getEditLock();
} else if (type == Asc.c_oAscTypeSelectElement.Field) {
let ft = pr.asc_getType();
in_form = true;
no_text = false;
in_text_form = ft===AscPDF.FIELD_TYPES.text || ft===AscPDF.FIELD_TYPES.combobox || ft===AscPDF.FIELD_TYPES.listbox;
in_check_form = ft===AscPDF.FIELD_TYPES.checkbox || ft===AscPDF.FIELD_TYPES.radiobutton;
}
}
@ -644,6 +653,20 @@ define([
toolbar.lockToolbar(Common.enumLock.inAnnotation, in_annot, {array: toolbar.paragraphControls});
}
if (this._state.in_form !== in_form) {
if (this._state.activated) this._state.in_form = in_form;
toolbar.lockToolbar(Common.enumLock.inForm, in_form, {array: toolbar.paragraphControls});
}
if (this._state.in_check_form !== in_check_form) {
if (this._state.activated) this._state.in_check_form = in_check_form;
toolbar.lockToolbar(Common.enumLock.inCheckForm, in_check_form, {array: toolbar.paragraphControls});
}
let cant_align = no_paragraph && !in_text_form;
toolbar.lockToolbar(Common.enumLock.cantAlign, cant_align, {array: [toolbar.btnHorizontalAlign]});
!cant_align && toolbar.btnHorizontalAlign.menu.items[3].setDisabled(in_text_form);
if (this._state.no_object !== no_object ) {
if (this._state.activated) this._state.no_object = no_object;
toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [toolbar.btnVerticalAlign ]});

31
apps/pdfeditor/main/app/view/Toolbar.js
View File

@ -99,6 +99,9 @@ define([
pageRotate: 'page-rotate',
pageDeleted: 'page-deleted',
pageEditText: 'page-edit-text',
inForm: 'in-form',
inCheckForm: 'in-check-form',
cantAlign: 'cant-align',
cantSave: 'cant-save'
};
for (var key in enumLock) {
@ -162,7 +165,7 @@ define([
menuCls: 'scrollable-menu',
menuStyle: 'min-width: 325px;',
hint: this.tipFontName,
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart],
store: new Common.Collections.Fonts(),
dataHint: '1',
dataHintDirection: 'top'
@ -174,7 +177,7 @@ define([
cls: 'input-group-nr',
menuStyle: 'min-width: 55px;',
hint: this.tipFontSize,
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart],
data: [
{value: 8, displayValue: "8"},
{value: 9, displayValue: "9"},
@ -204,7 +207,7 @@ define([
id: 'id-toolbar-btn-incfont',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-incfont',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart],
dataHint: '1',
dataHintDirection: 'top'
});
@ -215,7 +218,7 @@ define([
id: 'id-toolbar-btn-decfont',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-decfont',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart],
dataHint: '1',
dataHintDirection: 'top'
});
@ -226,7 +229,7 @@ define([
id: 'id-toolbar-btn-bold',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-bold',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart],
enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
@ -238,7 +241,7 @@ define([
id: 'id-toolbar-btn-italic',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-italic',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart],
enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
@ -250,7 +253,7 @@ define([
id: 'id-toolbar-btn-underline',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-underline',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart],
enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
@ -262,7 +265,7 @@ define([
id: 'id-toolbar-btn-strikeout',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-strikeout',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart],
enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
@ -274,7 +277,7 @@ define([
id: 'id-toolbar-btn-superscript',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-superscript',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart, _set.inEquation],
enableToggle: true,
toggleGroup: 'superscriptGroup',
dataHint: '1',
@ -287,7 +290,7 @@ define([
id: 'id-toolbar-btn-subscript',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-subscript',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart, _set.inEquation],
enableToggle: true,
toggleGroup: 'superscriptGroup',
dataHint: '1',
@ -303,7 +306,7 @@ define([
enableToggle: true,
allowDepress: true,
split: true,
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inAnnotation],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart, _set.inAnnotation],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -16',
@ -350,7 +353,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-change-case',
action: 'change-case',
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.shapeLock, _set.disableOnStart],
menu: new Common.UI.Menu({
items: [
{caption: this.mniSentenceCase, value: Asc.c_oAscChangeTextCaseType.SentenceCase},
@ -372,7 +375,7 @@ define([
id: 'id-toolbar-btn-clearstyle',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-clearstyle',
lock: [ _set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.disableOnStart],
lock: [ _set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inForm, _set.disableOnStart],
dataHint: '1',
dataHintDirection: 'bottom'
});
@ -431,7 +434,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-align-left',
icls: 'btn-align-left',
lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
lock: [_set.paragraphLock, _set.lostConnect, _set.cantAlign, _set.disableOnStart, _set.inAnnotation],
menu: new Common.UI.Menu({
items: [
{