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

Merge branch hotfix/v7.1.1 into master

Browse source
This commit is contained in:
papacarlo 2022-07-11 09:02:50 +00:00
parent da62161344 03afbac58f
commit 9026fc0c29
6 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/mobile/src/store/appOptions.js
View file

@ -86,6 +86,7 @@ export class storeAppOptions {
&& (!!(config.customization.goback.url) || config.customization.goback.requestClose && this.canRequestClose);
this.canBack = this.canBackToFolder === true;
this.canPlugins = false;
this.canFeatureForms = !!Common.EditorApi.get().asc_isSupportFeature("forms");
AscCommon.UserInfoParser.setParser(true);
AscCommon.UserInfoParser.setCurrentName(this.user.fullname);

5
apps/documenteditor/mobile/src/view/settings/Download.jsx
View file

@ -8,6 +8,7 @@ const Download = props => {
const _t = t("Settings", { returnObjects: true });
const storeDocumentInfo = props.storeDocumentInfo;
const dataDoc = storeDocumentInfo.dataDoc;
const canFeatureForms = props.storeAppOptions.canFeatureForms;
return (
<Page>
@ -17,7 +18,7 @@ const Download = props => {
<ListItem title="DOCX" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.DOCX)}>
<Icon slot="media" icon="icon-format-docx"></Icon>
</ListItem>
{dataDoc.fileType === 'docxf' || dataDoc.fileType === 'docx' ? [
{canFeatureForms && (dataDoc.fileType === 'docxf' || dataDoc.fileType === 'docx') ? [
<ListItem title="DOCXF" key="DOCXF" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.DOCXF)}>
<Icon slot="media" icon="icon-format-docxf"></Icon>
</ListItem>,
@ -58,4 +59,4 @@ const Download = props => {
)
}
export default inject('storeDocumentInfo')(observer(Download));
export default inject('storeDocumentInfo', 'storeAppOptions')(observer(Download));

2
apps/presentationeditor/main/locale/ru.json
View file

@ -114,7 +114,7 @@
"Common.define.effectData.textFloatIn": "Плавное приближение",
"Common.define.effectData.textFloatOut": "Плавное удаление",
"Common.define.effectData.textFloatUp": "Плавное перемещение вверх",
"Common.define.effectData.textFlyIn": "Влет",
"Common.define.effectData.textFlyIn": "Вылет",
"Common.define.effectData.textFlyOut": "Вылет за край листа",
"Common.define.effectData.textFontColor": "Цвет шрифта",
"Common.define.effectData.textFootball": "Овал",

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1387,7 +1387,7 @@ define([
this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
var printController = app.getController('Print');
printController && this.api && printController.setApi(this.api);
printController && this.api && printController.setApi(this.api).setMode(this.appOptions);
}

7
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -119,12 +119,19 @@ define([
this.printSettings.$previewBox.on(eventname, _.bind(this.onPreviewWheel, this));
},
setMode: function (mode) {
this.mode = mode;
this.printSettings && this.printSettings.setMode(mode);
},
setApi: function(o) {
this.api = o;
this.api.asc_registerCallback('asc_onSheetsChanged', _.bind(this.updateSheetsInfo, this));
this.api.asc_registerCallback('asc_onPrintPreviewSheetChanged', _.bind(this.onApiChangePreviewSheet, this));
this.api.asc_registerCallback('asc_onPrintPreviewPageChanged', _.bind(this.onApiChangePreviewPage, this));
this.api.asc_registerCallback('asc_onPrintPreviewSheetDataChanged', _.bind(this.onApiPreviewSheetDataChanged, this));
return this;
},
updateSheetsInfo: function() {

9
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -2317,7 +2317,7 @@ define([
'<tr><td class="padding-small"><label class="header"><%= scope.txtGridlinesAndHeadings %></label></td></tr>',
'<tr><td class="padding-small"><div id="print-chb-grid" style="width: 248px;"></div></td></tr>',
'<tr><td class="padding-large"><div id="print-chb-rows" style="width: 248px;"></div></td></tr>',
'<tr><td class="padding-large"><label class="link" id="print-header-footer-settings" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtHeaderFooterSettings %></label></td></tr>',
'<tr class="header-settings"><td class="padding-large"><label class="link" id="print-header-footer-settings" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtHeaderFooterSettings %></label></td></tr>',
//'<tr><td class="padding-large"><button type="button" class="btn btn-text-default" id="print-apply-all" style="width: 118px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtApplyToAllSheets %></button></td></tr>',
'<tr class="fms-btn-apply"><td>',
'<div class="footer justify">',
@ -2648,8 +2648,11 @@ define([
this.$el = $(node).html($markup);
this.$el.on('click', '#print-header-footer-settings', _.bind(this.openHeaderSettings, this));
this.$headerSettings = $('#print-header-footer-settings');
if (!this.mode.isEdit) {
$markup.find('.header-settings').hide();
} else {
this.$el.on('click', '#print-header-footer-settings', _.bind(this.openHeaderSettings, this));
}
this.$previewBox = $('#print-preview-box');
this.$previewEmpty = $('#print-preview-empty');