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

Merge branch 'develop' into feature/insert-image

Browse Source 
# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/models/file_model.rb
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
This commit is contained in:
Alexandr Fedorov
2021-01-28 15:12:36 +03:00
parent 15580ee144 e74811a755
commit 6e81fa8996
18 changed files with 226 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/documentserver-example/csharp/DocEditor.aspx
View File

@ -115,6 +115,10 @@
})
};
var onRequestCompareFile = function () {
docEditor.setRevisedFile(<%= compareFileData%>);
};
var onMakeActionLink = function (event) {
var actionData = event.data;
var linkParam = JSON.stringify(actionData);
@ -142,6 +146,7 @@
'onMakeActionLink': onMakeActionLink,
'onMetaChange': onMetaChange,
'onRequestInsertImage': onRequestInsertImage,
'onRequestCompareFile': onRequestCompareFile,
};
<% if (!string.IsNullOrEmpty(History) && !string.IsNullOrEmpty(HistoryData))

18
web/documentserver-example/csharp/DocEditor.aspx.cs
View File

@ -56,6 +56,7 @@ namespace OnlineEditorsExample
protected string History { get; private set; }
protected string HistoryData { get; private set; }
protected string InsertImageConfig { get; private set; }
protected string compareFileData { get; private set; }
public static string CallbackUrl
{
get
@ -213,6 +214,23 @@ namespace OnlineEditorsExample
tmp = tmp.Replace("}", "");
InsertImageConfig = tmp;
var compareFileUrl = _Default.Host;
compareFileUrl.Path =
HttpRuntime.AppDomainAppVirtualPath
+ (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+ "webeditor.ashx";
compareFileUrl.Query = "type=download" + "&fileName=" + HttpUtility.UrlEncode("demo.docx");
var dataCompareFile = new Dictionary<string, object>
{
{ "fileType", "docx" },
{ "url", compareFileUrl.ToString() }
};
if (JwtManager.Enabled)
{
var compareFileToken = JwtManager.Encode(dataCompareFile);
dataCompareFile.Add("token", compareFileToken);
}
compareFileData = jss.Serialize(dataCompareFile);
Dictionary<string, object> hist;
Dictionary<string, object> histData;

16
web/documentserver-example/csharp/WebEditor.ashx.cs
View File

@ -48,6 +48,9 @@ namespace OnlineEditorsExample
case "remove":
Remove(context);
break;
case "download":
Download(context);
break;
}
}
@ -237,7 +240,18 @@ namespace OnlineEditorsExample
}
}
}
private static void Download(HttpContext context)
{
var filename = context.Request["filename"];
var csvPath = HttpRuntime.AppDomainAppPath + "app_data/" + filename;
FileInfo fileinf = new FileInfo(csvPath);
context.Response.AddHeader("Content-Length", "" + fileinf.Length);
context.Response.AddHeader("Content-Type", MimeMapping.GetMimeMapping(csvPath));
var tmp = HttpUtility.UrlEncode(csvPath);
tmp = tmp.Replace("+", "%20");
context.Response.AddHeader("Content-Disposition", "attachment; filename*=UTF-8\'\'" + tmp);
context.Response.TransmitFile(csvPath);
}
public bool IsReusable
{
get { return false; }