Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
This commit is contained in:
commit
da606cb574
@ -66,7 +66,7 @@ export const request = function (options) {
|
|||||||
if (response.data.hasOwnProperty("total"))
|
if (response.data.hasOwnProperty("total"))
|
||||||
return { total: +response.data.total, items: response.data.response };
|
return { total: +response.data.total, items: response.data.response };
|
||||||
|
|
||||||
return response.data.response;
|
return response.data.response || response.data;
|
||||||
};
|
};
|
||||||
|
|
||||||
const onError = function (error) {
|
const onError = function (error) {
|
||||||
|
@ -76,6 +76,20 @@ export const openDocEditor = async (
|
|||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getDataSaveAs = async (params) => {
|
||||||
|
try {
|
||||||
|
const data = await request({
|
||||||
|
baseURL: combineUrl(AppServerConfig.proxyURL, config.homepage),
|
||||||
|
method: "get",
|
||||||
|
url: `/httphandlers/filehandler.ashx?${params}`,
|
||||||
|
responseType: "text",
|
||||||
|
});
|
||||||
|
|
||||||
|
return data;
|
||||||
|
} catch (e) {
|
||||||
|
console.error("error");
|
||||||
|
}
|
||||||
|
};
|
||||||
export const SaveAs = (title, url, folderId, openNewTab) => {
|
export const SaveAs = (title, url, folderId, openNewTab) => {
|
||||||
const options = {
|
const options = {
|
||||||
action: "create",
|
action: "create",
|
||||||
@ -84,23 +98,20 @@ export const SaveAs = (title, url, folderId, openNewTab) => {
|
|||||||
folderid: folderId,
|
folderid: folderId,
|
||||||
response: openNewTab ? null : "message",
|
response: openNewTab ? null : "message",
|
||||||
};
|
};
|
||||||
|
|
||||||
const params = toUrlParams(options, true);
|
const params = toUrlParams(options, true);
|
||||||
!openNewTab
|
if (!openNewTab) {
|
||||||
? request({
|
return getDataSaveAs(params);
|
||||||
baseURL: combineUrl(AppServerConfig.proxyURL, config.homepage),
|
} else {
|
||||||
method: "get",
|
window.open(
|
||||||
url: `/httphandlers/filehandler.ashx?${params}`,
|
combineUrl(
|
||||||
})
|
AppServerConfig.proxyURL,
|
||||||
.then((data) => console.log("data", data))
|
config.homepage,
|
||||||
.catch((e) => console.error("error", e))
|
`/httphandlers/filehandler.ashx?${params}`
|
||||||
: window.open(
|
),
|
||||||
combineUrl(
|
"_blank"
|
||||||
AppServerConfig.proxyURL,
|
);
|
||||||
config.homepage,
|
}
|
||||||
`/httphandlers/filehandler.ashx?${params}`
|
|
||||||
),
|
|
||||||
"_blank"
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const canConvert = (fileExst) => {
|
export const canConvert = (fileExst) => {
|
||||||
|
@ -637,6 +637,19 @@ const Editor = () => {
|
|||||||
setNewOpenTab(false);
|
setNewOpenTab(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getSavingInfo = async (title, folderId) => {
|
||||||
|
const savingInfo = await SaveAs(
|
||||||
|
title,
|
||||||
|
urlSelectorFolder,
|
||||||
|
folderId,
|
||||||
|
openNewTab
|
||||||
|
);
|
||||||
|
|
||||||
|
if (savingInfo) {
|
||||||
|
const convertedInfo = savingInfo.split(": ").pop();
|
||||||
|
docEditor.showMessage(convertedInfo);
|
||||||
|
}
|
||||||
|
};
|
||||||
const onClickSaveSelectFolder = (e, folderId) => {
|
const onClickSaveSelectFolder = (e, folderId) => {
|
||||||
const currentExst = titleSelectorFolder.split(".").pop();
|
const currentExst = titleSelectorFolder.split(".").pop();
|
||||||
|
|
||||||
@ -645,7 +658,11 @@ const Editor = () => {
|
|||||||
? titleSelectorFolder.concat(`.${extension}`)
|
? titleSelectorFolder.concat(`.${extension}`)
|
||||||
: titleSelectorFolder;
|
: titleSelectorFolder;
|
||||||
|
|
||||||
SaveAs(title, urlSelectorFolder, folderId, openNewTab);
|
if (openNewTab) {
|
||||||
|
SaveAs(title, urlSelectorFolder, folderId, openNewTab);
|
||||||
|
} else {
|
||||||
|
getSavingInfo(title, folderId);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const onChangeInput = (e) => {
|
const onChangeInput = (e) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user