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

画布内锚点图标偶尔不显示问题

Browse Source
This commit is contained in:
446052889@qq.com 2022-08-04 20:41:05 +08:00
parent 11c17c1f65
commit 5406729607
43 changed files with 185 additions and 43 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.

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe609-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 662 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe618-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 836 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe61c-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 569 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe62a-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 893 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe62b-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 908 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe62e-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 893 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe62f-D81E06.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 668 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe635-707070.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 610 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe63d-EA9518.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 556 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe66a-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 645 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe69a-00c853.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 524 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe69b-00c853.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 581 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe726-00c853.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 564 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe773-082E54.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe783-EA9518.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 825 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe802-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 570 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe807-EA9518.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 626 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe80e-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 621 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe80f-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 668 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe810-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 528 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe811-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 618 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe812-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 444 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe813-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 573 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe814-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 577 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe815-7AA7AA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 505 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe819-FA8072.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 660 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe81a-D81E06.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 519 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe829-FA8072.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 686 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe82a-00c853.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 419 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe832-EA9518.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-00C853.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 384 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-082E54.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 422 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-707070.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 414 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-7DABB1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 423 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-88147F.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 426 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-E9433F.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-F4EA2A.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe835-FFAE03.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

BIN
com.actionsoft.apps.coe.pal/resource/anchorImg/xe836-1296DB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 512 B

212
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/util/PalManageUtil.java
View File

@ -134,47 +134,179 @@ public class PalManageUtil {
*/
public static List<String> getShapeConfigIconData() {
List<String> icons = Lists.newArrayList();
icons.add("&#xe609;|#1296DB");//提示
icons.add("&#xe832;|#EA9518");//标签
icons.add("&#xe807;|#EA9518");//反对
icons.add("&#xe61c;|#1296DB");//减少
icons.add("&#xe802;|#1296DB");//播放
icons.add("&#xe63d;|#EA9518");//警告
icons.add("&#xe62f;|#D81E06");//删除
icons.add("&#xe836;|#1296DB");//群组
icons.add("&#xe66a;|#1296DB");//上传
icons.add("&#xe635;|#707070");//提示
icons.add("&#xe81a;|#D81E06");//停止
icons.add("&#xe69b;|#00c853");//完成
icons.add("&#xe829;|#FA8072");//喜欢
icons.add("&#xe69a;|#00c853");//下载
icons.add("&#xe82a;|#00c853");//修改
icons.add("&#xe773;|#082E54");//邮件
icons.add("&#xe783;|#EA9518");//暂停
icons.add("&#xe819;|#FA8072");//赞同
icons.add("&#xe726;|#00c853");//增加
icons.add("&#xe62a;|#1296DB");//上
icons.add("&#xe62b;|#1296DB");//下
icons.add("&#xe618;|#1296DB");//左
icons.add("&#xe62e;|#1296DB");//右
icons.add("&#xe80f;|#7AA7AA");//进度1
icons.add("&#xe80e;|#7AA7AA");//进度2
icons.add("&#xe811;|#7AA7AA");//进度3
icons.add("&#xe813;|#7AA7AA");//进度4
icons.add("&#xe814;|#7AA7AA");//进度5
icons.add("&#xe810;|#7AA7AA");//进度6
icons.add("&#xe815;|#7AA7AA");//进度7
icons.add("&#xe812;|#7AA7AA");//进度8
icons.add("&#xe835;|#E9433F");//红旗帜
icons.add("&#xe835;|#FFAE03");//橙黄旗帜
icons.add("&#xe835;|#F4EA2A");//黄旗帜
icons.add("&#xe835;|#00C853");//绿旗帜
icons.add("&#xe835;|#1296DB");//蓝旗帜
icons.add("&#xe835;|#082E54");//深蓝旗帜
icons.add("&#xe835;|#88147F");//紫旗帜
icons.add("&#xe835;|#7DABB1");//浅蓝旗帜
icons.add("&#xe835;|#707070");//灰旗帜
icons.add("&#xe609;|#1296DB");//提示(xe609-1296DB.png)
icons.add("&#xe832;|#EA9518");//标签(xe832-EA9518.png)
icons.add("&#xe807;|#EA9518");//反对(xe807-EA9518.png)
icons.add("&#xe61c;|#1296DB");//减少(xe61c-1296DB.png)
icons.add("&#xe802;|#1296DB");//播放(xe802-1296DB.png)
icons.add("&#xe63d;|#EA9518");//警告(xe63d-EA9518.png)
icons.add("&#xe62f;|#D81E06");//删除(xe62f-D81E06.png)
icons.add("&#xe836;|#1296DB");//群组(xe836-1296DB.png)
icons.add("&#xe66a;|#1296DB");//上传(xe66a-1296DB.png)
icons.add("&#xe635;|#707070");//提示(xe635-707070.png)
icons.add("&#xe81a;|#D81E06");//停止(xe81a-D81E06.png)
icons.add("&#xe69b;|#00c853");//完成(xe69b-00c853.png)
icons.add("&#xe829;|#FA8072");//喜欢(xe829-FA8072.png)
icons.add("&#xe69a;|#00c853");//下载(xe69a-00c853.png)
icons.add("&#xe82a;|#00c853");//修改(xe82a-00c853.png)
icons.add("&#xe773;|#082E54");//邮件(xe773-082E54.png)
icons.add("&#xe783;|#EA9518");//暂停(xe783-EA9518.png)
icons.add("&#xe819;|#FA8072");//赞同(xe819-FA8072.png)
icons.add("&#xe726;|#00c853");//增加(xe726-00c853.png)
icons.add("&#xe62a;|#1296DB");//上(xe62a-1296DB.png)
icons.add("&#xe62b;|#1296DB");//下(xe62b-1296DB.png)
icons.add("&#xe618;|#1296DB");//左(xe618-1296DB.png)
icons.add("&#xe62e;|#1296DB");//右(xe62e-1296DB.png)
icons.add("&#xe80f;|#7AA7AA");//进度1(xe80f-7AA7AA.png)
icons.add("&#xe80e;|#7AA7AA");//进度2(xe80e-7AA7AA.png)
icons.add("&#xe811;|#7AA7AA");//进度3(xe811-7AA7AA.png)
icons.add("&#xe813;|#7AA7AA");//进度4(xe813-7AA7AA.png)
icons.add("&#xe814;|#7AA7AA");//进度5(xe814-7AA7AA.png)
icons.add("&#xe810;|#7AA7AA");//进度6(xe810-7AA7AA.png)
icons.add("&#xe815;|#7AA7AA");//进度7(xe815-7AA7AA.png)
icons.add("&#xe812;|#7AA7AA");//进度8(xe812-7AA7AA.png)
icons.add("&#xe835;|#E9433F");//红旗帜(xe835-E9433F.png)
icons.add("&#xe835;|#FFAE03");//橙黄旗帜(xe835-FFAE03.png)
icons.add("&#xe835;|#F4EA2A");//黄旗帜(xe835-F4EA2A.png)
icons.add("&#xe835;|#00C853");//绿旗帜(xe835-00C853.png)
icons.add("&#xe835;|#1296DB");//蓝旗帜(xe835-1296DB.png)
icons.add("&#xe835;|#082E54");//深蓝旗帜(xe835-082E54.png)
icons.add("&#xe835;|#88147F");//紫旗帜(xe835-88147F.png)
icons.add("&#xe835;|#7DABB1");//浅蓝旗帜(xe835-7DABB1.png)
icons.add("&#xe835;|#707070");//灰旗帜(xe835-707070.png)
return icons;
}
/**
* 暂时写死，放到配置中或者界面中配置更好 todo
* @param icon
* @return
*/
public static String getShapeConfigIconDataUrl(String icon) {
String dataUrl = "";
switch (icon) {
case "&#xe609;|#1296DB"://提示(xe609-1296DB.png)
dataUrl = "xe609-1296DB.png";
break;
case "&#xe832;|#EA9518"://标签(-.png)
dataUrl = "xe832-EA9518.png";
break;
case "&#xe807;|#EA9518"://反对(-.png)
dataUrl = "xe807-EA9518.png";
break;
case "&#xe61c;|#1296DB"://减少(-.png)
dataUrl = "xe61c-1296DB.png";
break;
case "&#xe802;|#1296DB"://播放(-.png)
dataUrl = "xe802-1296DB.png";
break;
case "&#xe63d;|#EA9518"://警告(-.png)
dataUrl = "xe63d-EA9518.png";
break;
case "&#xe62f;|#D81E06"://删除(-.png)
dataUrl = "xe62f-D81E06.png";
break;
case "&#xe836;|#1296DB"://群组(-.png)
dataUrl = "xe836-1296DB.png";
break;
case "&#xe66a;|#1296DB"://上传(-.png)
dataUrl = "xe66a-1296DB.png";
break;
case "&#xe635;|#707070"://提示(-.png)
dataUrl = "xe635-707070.png";
break;
case "&#xe81a;|#D81E06"://停止(-.png)
dataUrl = "xe81a-D81E06.png";
break;
case "&#xe69b;|#00c853"://完成(-.png)
dataUrl = "xe69b-00c853.png";
break;
case "&#xe829;|#FA8072"://喜欢(-.png)
dataUrl = "xe829-FA8072.png";
break;
case "&#xe69a;|#00c853"://下载(-.png)
dataUrl = "xe69a-00c853.png";
break;
case "&#xe82a;|#00c853"://修改(-.png)
dataUrl = "xe82a-00c853.png";
break;
case "&#xe773;|#082E54"://邮件(-.png)
dataUrl = "xe773-082E54.png";
break;
case "&#xe783;|#EA9518"://暂停(-.png)
dataUrl = "xe783-EA9518.png";
break;
case "&#xe819;|#FA8072"://赞同(-.png)
dataUrl = "xe819-FA8072.png";
break;
case "&#xe726;|#00c853"://增加(-.png)
dataUrl = "xe726-00c853.png";
break;
case "&#xe62a;|#1296DB"://上(-.png)
dataUrl = "xe62a-1296DB.png";
break;
case "&#xe62b;|#1296DB"://下(-.png)
dataUrl = "xe62b-1296DB.png";
break;
case "&#xe618;|#1296DB"://左(-.png)
dataUrl = "xe618-1296DB.png";
break;
case "&#xe62e;|#1296DB"://右(-.png)
dataUrl = "xe62e-1296DB.png";
break;
case "&#xe80f;|#7AA7AA"://进度1(-.png)
dataUrl = "xe80f-7AA7AA.png";
break;
case "&#xe80e;|#7AA7AA"://进度2(-.png)
dataUrl = "xe80e-7AA7AA.png";
break;
case "&#xe811;|#7AA7AA"://进度3(-.png)
dataUrl = "xe811-7AA7AA.png";
break;
case "&#xe813;|#7AA7AA"://进度4(-.png)
dataUrl = "xe813-7AA7AA.png";
break;
case "&#xe814;|#7AA7AA"://进度5(-.png)
dataUrl = "xe814-7AA7AA.png";
break;
case "&#xe810;|#7AA7AA"://进度6(-.png)
dataUrl = "xe810-7AA7AA.png";
break;
case "&#xe815;|#7AA7AA"://进度7(-.png)
dataUrl = "xe815-7AA7AA.png";
break;
case "&#xe812;|#7AA7AA"://进度8(-.png)
dataUrl = "xe812-7AA7AA.png";
break;
case "&#xe835;|#E9433F"://红旗帜(-.png)
dataUrl = "xe835-E9433F.png";
break;
case "&#xe835;|#FFAE03"://橙黄旗帜(-.png)
dataUrl = "xe835-FFAE03.png";
break;
case "&#xe835;|#F4EA2A"://黄旗帜(-.png)
dataUrl = "xe835-F4EA2A.png";
break;
case "&#xe835;|#00C853"://绿旗帜(-.png)
dataUrl = "xe835-00C853.png";
break;
case "&#xe835;|#1296DB"://蓝旗帜(-.png)
dataUrl = "xe835-1296DB.png";
break;
case "&#xe835;|#082E54"://深蓝旗帜(-.png)
dataUrl = "xe835-082E54.png";
break;
case "&#xe835;|#88147F"://紫旗帜(-.png)
dataUrl = "xe835-88147F.png";
break;
case "&#xe835;|#7DABB1"://浅蓝旗帜(-.png)
dataUrl = "xe835-7DABB1.png";
break;
case "&#xe835;|#707070"://灰旗帜(-.png)
dataUrl = "xe835-707070.png";
break;
}
return dataUrl;
}
}

16
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/CoeDesignerShapeAPIManager.java
View File

@ -1,9 +1,12 @@
package com.actionsoft.apps.coe.pal.pal.repository.designer;
import java.io.File;
import java.util.*;
import com.actionsoft.apps.coe.pal.pal.manage.util.PalManageUtil;
import com.actionsoft.bpms.bpmn.engine.cache.ProcessDefCache;
import com.actionsoft.bpms.bpmn.engine.model.def.ProcessDefinition;
import com.actionsoft.bpms.bpmn.modeler.util.pal.PalUtil;
import com.actionsoft.bpms.org.model.DepartmentModel;
import com.actionsoft.bpms.org.model.RoleModel;
import com.actionsoft.bpms.org.model.UserModel;
@ -1148,9 +1151,16 @@ public class CoeDesignerShapeAPIManager {
value = cfgContent;
} else if ("icon".equals(showType)) {
icon = iconContent;
// valueObj.put("icon", icon);// todo
valueObj.put("icon", "");
valueObj.put("iconCavCode", "");// 图标cav todo
String iconCode = PalManageUtil.getShapeConfigIconDataUrl(icon);
if (UtilString.isNotEmpty(iconCode)) {
valueObj.put("icon", icon);
valueObj.put("iconCavCode", iconCode);// 图标cav
} else {
valueObj.put("icon", "");
valueObj.put("iconCavCode", "");// 图标cav
}
// valueObj.put("icon", icon);
// valueObj.put("iconCavCode", dataShowConfigObj.getJSONArray("value").getJSONObject(0).getString("iconCavCode"));// 图标cav
}
valueObj.put("horizontal", horizontal.toLowerCase());
valueObj.put("vertical", verity.toLowerCase());