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

[feature] Add 'spreadsheetLayout' param to convertion api

Browse Source
This commit is contained in:
Sergey Konovalov
2019-11-21 18:55:33 +03:00
parent 4494be4aee
commit 2f7bffcc9c
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Common/sources/commondefines.js
View File

@ -73,6 +73,7 @@ function InputCommand(data, copyExplicit) {
this['userconnectionid'] = data['userconnectionid'];
this['docconnectionid'] = data['docconnectionid'];
this['doctparams'] = data['doctparams'];
this['jsonparams'] = data['jsonparams'];
this['useractionid'] = data['useractionid'];
if (data['forcesave']) {
this['forcesave'] = new CForceSaveData(data['forcesave']);
@ -126,6 +127,7 @@ function InputCommand(data, copyExplicit) {
this['userconnectionid'] = undefined;//string internal
this['docconnectionid'] = undefined;//string internal
this['doctparams'] = undefined;//int doctRenderer
this['jsonparams'] = undefined;//string
this['useractionid'] = undefined;
this['forcesave'] = undefined;
this['userdata'] = undefined;
@ -296,6 +298,12 @@ InputCommand.prototype = {
setDoctParams: function(data) {
this['doctparams'] = data;
},
getJsonParams: function() {
return this['jsonparams'];
},
setJsonParams: function(data) {
this['jsonparams'] = data;
},
getUserActionId: function() {
return this['useractionid'];
},

3
DocService/sources/converterservice.js
View File

@ -203,6 +203,9 @@ function convertRequest(req, res, isJson) {
if(undefined != params.delimiterChar)
cmd.setDelimiterChar(params.delimiterChar);
cmd.setDoctParams(parseIntParam(params.doctparams));
if (params.spreadsheetLayout) {
cmd.setJsonParams(JSON.stringify({'spreadsheetLayout': params.spreadsheetLayout}));
}
cmd.setPassword(params.password);
cmd.setWithAuthorization(true);
var thumbnail = params.thumbnail;

2
FileConverter/sources/converter.js
View File

@ -114,6 +114,7 @@ function TaskQueueDataConvert(task) {
this.mailMergeSend = cmd.mailmergesend;
this.thumbnail = cmd.thumbnail;
this.doctParams = cmd.getDoctParams();
this.jsonParams = cmd.getJsonParams();
this.password = cmd.getPassword();
this.noBase64 = cmd.getNoBase64();
this.timestamp = new Date();
@ -143,6 +144,7 @@ TaskQueueDataConvert.prototype = {
xml += this.serializeThumbnail(this.thumbnail);
}
xml += this.serializeXmlProp('m_nDoctParams', this.doctParams);
xml += this.serializeXmlProp('m_sJsonParams', this.jsonParams);
xml += this.serializeXmlProp('m_oTimestamp', this.timestamp.toISOString());
xml += this.serializeXmlProp('m_bIsNoBase64', this.noBase64);
xml += this.serializeLimit();