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

特殊字符无法保存问题/无法移动问题/pal打包/显示xml附件/多行悬浮显示

Browse Source
This commit is contained in:
zhal 2022-10-17 17:59:45 +08:00
parent d37aa0ac68
commit 3351d6daff
11 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

10
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousUpdatePortJob.java
View File

@ -256,7 +256,7 @@ public class SynchronousUpdatePortJob implements IJob {
Map<String, String> idRelationMap = new HashMap<>();
List<RowMap> orgdepartmentList = DBSql.getMaps(conn, "select distinct(DESCR),DEPTNAME from BO_EU_ORG_POSTS WHERE DEPTID=? AND DESCR IS NOT NULL ", departmentId);
List<RowMap> orgdepartmentList = DBSql.getMaps(conn, "select DESCR,DEPTNAME from BO_EU_ORG_POSTS WHERE DEPTID=? AND DESCR IS NOT NULL ", departmentId);
JSONArray shapes = new JSONArray();
@ -284,8 +284,10 @@ public class SynchronousUpdatePortJob implements IJob {
if (!data2.contains(str.get("name").toString().trim())) {//如果存在这个数
RowMap rowMap=DBSql.getMap("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT t WHERE t.RELATIONFILEID='"+uuid+"' and t.RELATIONSHAPETEXT='"+str.get("name")+"'");
RowMap rowMap=DBSql.getMap("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT t WHERE t.FILEID=? and t.RELATIONSHAPETEXT=?",uuid,str.get("name").toString());
if(rowMap==null){
System.out.println("没有关联项为模型id为======"+uuid+"shapid======="+str.get("id")+"名称为==========="+str.get("name"));
BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(uuid, 0);
String define = defineModel.getDefinition();
@ -303,7 +305,7 @@ public class SynchronousUpdatePortJob implements IJob {
}
}else{
System.out.println("存在关联项为模型id为======"+uuid+"shapid======="+str.get("id")+"名称为==========="+str.get("name"));
JSONObject newShape = JSONObject.parseObject(shape.toString());
newShape.put("id", str.get("id"));
@ -405,8 +407,6 @@ public class SynchronousUpdatePortJob implements IJob {
shape.put("props", props);
result.add(shape);
System.out.println("x========"+x);
}

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -2645,7 +2645,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
requiredSpan = "<span class='required'></span>";
}
if ("textarea".equals(type)) {
input = "<textarea class=\"awsui-textbox\" style=\"height:30px;\" name=\"" + id + "\" id=\"" + id + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' onclick=\"openTextareaDialog($(this), '" + attributeModel.getNewTitle() + "', " + readonly + ");\" >" + inputValue + "</textarea>";
input = "<textarea class=\"awsui-textbox\" title="+inputValue+" style=\"height:30px;\" name=\"" + id + "\" id=\"" + id + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' onclick=\"openTextareaDialog($(this), '" + attributeModel.getNewTitle() + "', " + readonly + ");\" >" + inputValue + "</textarea>";
} else if ("select".equals(type) || "select_m".equals(type)) {
if (readonly) {
input = "<input type='text' inputType='" + type + "' objid='" + id + "' name='attribute_name_input_" + id + "' readonly=true " + " id='" + id + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' class='awsui-combobox' value='" + inputValue + "'></input>";
@ -9958,6 +9958,8 @@ public String deleteReply(String replyid, String messageid) {
if (methodModel != null) {
object.put("folder", methodModel.isFolder());
}
object.put("isPublish", model.isPublish());
object.put("desc", model.getDesc());
object.put("isFavorite", CoeProcessLevelUtil.isCommonRepository(_uc, wsId, model.getVersionId()));
object.put("updateUser", SDK.getORGAPI().getUser(model.getModifyUser()) == null ? model.getModifyUser() : SDK.getORGAPI().getUser(model.getModifyUser()).getUserName());

2
com.actionsoft.apps.coe.pal/template/page/main.htm
View File

@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
var wHref = "./w";
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-18ba0bf3.b9b5de63.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-25c1c630.dc8349fb.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3a7599c6.bb861d84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9d1e04c4.d1caea12.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-cad3d8a0.b45b70ca.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-f3e4ff48.721c4dc9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-25c1c630.8933349a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ca03ae9d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.3038704d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.96ada280.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e62adedc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.44cb7f2b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a7599c6.5d555915.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-cad3d8a0.21fb73dd.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.73cf31a1.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.73cf31a1.js></script></body></html>
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-18ba0bf3.b9b5de63.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1a4cabe8.16fbd425.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-25c1c630.dc8349fb.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3a7599c6.bb861d84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9d1e04c4.d1caea12.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-f3e4ff48.721c4dc9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1a4cabe8.70ce9a3a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-25c1c630.8933349a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ca03ae9d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.3038704d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.96ada280.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e62adedc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.44cb7f2b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a7599c6.5d555915.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.068cfa16.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.068cfa16.js></script></body></html>

2
com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm
View File

@ -99,7 +99,7 @@
<!-- <input style="width:350px;float:left;" id="upfileAccessoryName" readonly="readonly" type="text" class="awsui-input">-->
<span style="float:left;" id="upfile" class="button blue" onclick="return false;">选择文件</span>
<div style="padding: 5px; font-size: 12px; color: rgb(120, 120, 120);display: inline-block;">
<span style="word-break:keep-all;">附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt, mp3, mp4, avi, mpeg, flv, swf, wmv</span>
<span style="word-break:keep-all;">附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt, mp3, mp4, avi, mpeg, flv, swf, wmv, xml</span>
</div>
</div>
</div>

2
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
View File

@ -2886,7 +2886,7 @@
<div id="attribute-table-window1" style="width:500px;height:325px;display:none;">
<div style='margin:0px;height:235px;width:500px;'>
<div style="height: 225px;width: 493px;overflow:auto;">
<table style="width: 100%;border-collapse:collapse;border-top: 2px solid #928d8d;border-bottom: 2px solid #928d8d">
<table style="width: 100%;border-collapse:collapse;border-top: 2px solid #928d8d;border-bottom: 2px solid #928d8d">
<tbody class="dialogTableTbody" id='attribute-table-content1'>
</tbody>

6
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js
View File

@ -580,7 +580,7 @@ function saveDialogTableValue(tableValue,id,dom) {
url : "./w?sid=" + encodeURIComponent(sid)
+ "&cmd=com.actionsoft.apps.coe.pal_processlevel_more_attr_content_save",
data : "uuid=" + uuid + "&josnKey=" + encodeURIComponent(id)
+ "&josnContent=" + encodeURI(jsonContent),
+ "&josnContent=" + encodeURIComponent(jsonContent),
success : function(msg) {
if(awsui.decode(msg).result == "error") {
$.simpleAlert(awsui.decode(msg).msg, "error");
@ -662,7 +662,7 @@ function saveContent(obj) {
url : "./w?sid=" + encodeURIComponent(sid)
+ "&cmd=com.actionsoft.apps.coe.pal_processlevel_more_attr_content_save",
data : "uuid=" + uuid + "&josnKey=" + encodeURIComponent(id)
+ "&josnContent=" + encodeURI(jsonContent),
+ "&josnContent=" + encodeURIComponent(jsonContent),
success : function(msg) {
if(awsui.decode(msg).result == "error") {
$.simpleAlert(awsui.decode(msg).msg, "error");
@ -680,7 +680,7 @@ function saveContent(obj) {
content : {
iframe : "file_attribute",
id : id,
value : jsonContent
value : encodeURIComponent(jsonContent)
}
};
var messagesStr = JSON.stringify(changeItems);

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-cad3d8a0.b45b70ca.css → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-1a4cabe8.16fbd425.css
View File

File diff suppressed because one or more lines are too long

4
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/app.73cf31a1.js → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/app.068cfa16.js
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-1a4cabe8.70ce9a3a.js Normal file
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-cad3d8a0.21fb73dd.js
View File

File diff suppressed because one or more lines are too long