pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 10:59:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v7.3.0' of https://github.com/ONLYOFFICE/web-apps into release/v7.3.0

Browse Source
This commit is contained in:
maxkadushkin
2023-01-19 18:31:15 +03:00
parent ac119df42f 189b0fe87b
commit 96271cf672
10 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/DocumentHolder.js
View File

@ -1127,7 +1127,7 @@ define([
parentEl: $('#id-document-holder-btn-special-paste'),
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-paste',
caption : Common.Utils.String.platformKey('Ctrl', '({0})'),
caption : Common.Utils.String.format('({0})', Common.Utils.String.textCtrl),
menu : new Common.UI.Menu({items: []})
});
me.initSpecialPasteEvents();

8
apps/documenteditor/main/app/controller/FormsTab.js
View File

@ -201,11 +201,13 @@ define([
} else if (type == 'combobox' || type == 'dropdown')
this.api.asc_AddContentControlList(type == 'combobox', oPr, oFormPr);
else if (type == 'datetime'){
var props = new AscCommon.CContentControlPr();
var props = new AscCommon.CContentControlPr(),
datePr = new AscCommon.CSdtDatePickerPr();
oPr = new AscCommon.CSdtTextFormPr();
props.put_TextFormPr(oPr);
props.put_FormPr(oFormPr);
props.put_DateTimePr(new AscCommon.CSdtDatePickerPr());
props.put_DateTimePr(datePr);
props.put_PlaceholderText(datePr.get_String());
this.api.asc_AddContentControlDatePicker(props);
} else if (type == 'text') {
var props = new AscCommon.CContentControlPr();
@ -354,7 +356,7 @@ define([
allowMerge: false,
allowSignature: false,
allowProtect: false,
rightMenu: {clear: disable, disable: true},
rightMenu: {clear: false, disable: true},
statusBar: true,
leftMenu: {disable: false, previewMode: true},
fileMenu: {info: true},

5
apps/documenteditor/main/app/view/FormSettings.js
View File

@ -645,7 +645,7 @@ define([
cls: 'input-group-nr',
menuCls: 'menu-absolute',
menuStyle: 'min-width: 195px; max-height: 190px;',
editable: true,
editable: false,
data: [],
dataHint: '1',
dataHintDirection: 'bottom',
@ -1482,7 +1482,7 @@ define([
}
this.updateDateFormats(this.cmbLang.getValue());
var format = datePr.get_DateFormat();
this.cmbDateFormat.setValue(format);
this.cmbDateFormat.setValue(format, datePr.get_String());
this._state.DateFormat=format;
}
@ -1770,6 +1770,7 @@ define([
formDatePr.put_DateFormat(this.cmbDateFormat.getValue());
formDatePr.put_LangId(this.cmbLang.getValue());
props.put_DateTimePr(formDatePr);
props.put_PlaceholderText(formDatePr.get_String());
this.api.asc_SetContentControlProperties(props, this.internalId);
this.fireEvent('editcomplete', this);
} else {

7
apps/documenteditor/mobile/src/controller/add/AddLink.jsx
View File

@ -59,7 +59,12 @@ class AddLinkController extends Component {
props.put_ToolTip(tip);
api.add_Hyperlink(props);
this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal();
if(this.props.isNavigate) {
f7.views.current.router.back();
} else {
this.closeModal();
}
}
componentDidMount() {

2
apps/presentationeditor/main/app/controller/DocumentHolder.js
View File

@ -1213,7 +1213,7 @@ define([
parentEl: $('#id-document-holder-btn-special-paste'),
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-paste',
caption : Common.Utils.String.platformKey('Ctrl', '({0})'),
caption : Common.Utils.String.format('({0})', Common.Utils.String.textCtrl),
menu : new Common.UI.Menu({items: []})
});
me.initSpecialPasteEvents();

7
apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
View File

@ -112,7 +112,12 @@ class AddLinkController extends Component {
props.put_Text(null);
api.add_Hyperlink(props);
this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal();
if(this.props.isNavigate) {
f7.views.current.router.back();
} else {
this.closeModal();
}
}
getTextDisplay () {

9
apps/spreadsheeteditor/main/app/controller/DataTab.js
View File

@ -523,7 +523,10 @@ define([
data = {path: item.asc_getData()};
break;
case Asc.c_oAscExternalReferenceType.referenceData:
data = {referenceData: item.asc_getData()};
data = {
referenceData: item.asc_getData(),
path: item.asc_getPath()
};
break;
}
data && me.externalData.stackRequests.push({data: data, id: item.asc_getId(), isExternal: item.asc_isExternalLink()});
@ -586,9 +589,7 @@ define([
},
onNeedUpdateExternalReference: function() {
var val = Common.localStorage.getBool("sse-hide-add-external-warn");
!val && Common.NotificationCenter.trigger('showmessage', {msg: this.textAddExternalData});
Common.localStorage.setBool("sse-hide-add-external-warn", true);
Common.NotificationCenter.trigger('showmessage', {msg: this.textAddExternalData});
},
onWorksheetLocked: function(index,locked) {

5
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View File

@ -3046,7 +3046,7 @@ define([
parentEl: $('#id-document-holder-btn-special-paste'),
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-paste',
caption : Common.Utils.String.platformKey('Ctrl', '({0})'),
caption : Common.Utils.String.format('({0})', Common.Utils.String.textCtrl),
menu : new Common.UI.Menu({items: []})
});
me.initSpecialPasteEvents();
@ -3264,10 +3264,13 @@ define([
Common.util.Shortcuts.delegateShortcuts({shortcuts:keymap});
Common.util.Shortcuts.suspendEvents(str, undefined, true);
var pasteContainer = me.documentHolder.cmpEl.find('#special-paste-container');
me.btnSpecialPaste.menu.on('show:after', function(menu) {
Common.util.Shortcuts.resumeEvents(str);
pasteContainer.addClass('has-open-menu');
}).on('hide:after', function(menu) {
Common.util.Shortcuts.suspendEvents(str, undefined, true);
pasteContainer.removeClass('has-open-menu');
});
},

7
apps/spreadsheeteditor/main/resources/less/toolbar.less
View File

@ -116,6 +116,10 @@
background-color: @background-toolbar;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
&.has-open-menu {
z-index: @zindex-navbar + 1;
}
}
#equation-container {
@ -123,9 +127,6 @@
.separator {
height: 20px;
}
&.has-open-menu {
z-index: @zindex-navbar + 1;
}
}
#slot-field-fontsize {

7
apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
View File

@ -111,7 +111,12 @@ class AddLinkController extends Component {
link.asc_setTooltip(args.tooltip);
api.asc_insertHyperlink(link);
this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal();
if(this.props.isNavigate) {
f7.views.current.router.back();
} else {
this.closeModal();
}
}
closeModal () {