yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java
This commit is contained in:
chengli 2022-07-07 18:21:08 +08:00
commit 4d526a3cd2
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java
View File

@ -72,16 +72,16 @@ public class HtmlToWord {
documentPart.addStyledParagraphOfText("Subtitle", em.text());
break;
case "imgurl":
/*String imgSrc = em.attr("src");
String imgSrc = em.attr("src");
File file = new File(imgSrc);
byte[] bytes = convertImageToByteArray(file);
addImageToPackage(wordMLPackage, bytes);*/
addImageToPackage(wordMLPackage, bytes);
break;
case "imgbase64":
break;
case "table":
/*Tbl table = addTable(em);
documentPart.addObject(table);*/
Tbl table = addTable(em);
documentPart.addObject(table);
break;
case "h1":
P tmp = documentPart.addStyledParagraphOfText("Heading1", em.text());

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
View File

@ -2256,7 +2256,6 @@ public class CoeProcessLevelUtil {
attribute.put("name", property.getPropertyName());
attribute.put("key", property.getPropertyId());
//如果是关联属性，增加链接功能
if(attributeModel.getType().equals("relation")){
@ -2264,9 +2263,8 @@ public class CoeProcessLevelUtil {
String relationFileId = JSONObject.parseObject(property.getPropertyValue()).get("relationFileId").toString();
String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?uuid="+relationFileId+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId+"";
String appUrl="<a href='"+url+"' style='color:blue'>"+inputValue+"</a>";
String appUrl="<a href='"+url+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
attribute.put("value", appUrl);
}else{
attribute.put("value", inputValue);