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

版本差异和epc图编号刷(尚未对接数据)

Browse Source
This commit is contained in:
mrs_12345@163.com 2022-07-01 09:42:26 +08:00
parent 148e5205c7
commit fc02c3e757
7 changed files with 2675 additions and 2526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,8 +80,6 @@
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/scripts/util.js'></script>
<!--扩展设计器的样式-->
<link type='text/css' rel='stylesheet' href='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css' />
<!--针对设计器进行颜色扩展，以及文字扩充-->
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.userdefined.js'></script>
<!-- <script type='text/javascript' charset='UTF-8' src='../apps/_bpm.platform/js/designer/extend/js/designer.extend.userdefined.js'></script>-->
@ -90,7 +88,6 @@
<script type="text/javascript" charset='UTF-8' src="../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/util/json.js"></script>
<script type="text/javascript" src="../commons/js/jquery/scripts/ui/aws.util.js"></script>
<script type='text/javascript' src='../commons/js/public.js'></script>
<script type="text/javascript">
//公共信息
var appId = "<#appId>";
@ -193,11 +190,6 @@
var ext3 = "<#ext3>";
var ext4 = "<#ext4>";
// 帮助工具栏扩展url
var customHelpToolExtMenuUrl = <#customHelpToolExtMenuUrl>;
// 图形定义
var methodObjectDesc = <#methodObjectDesc>;
// 帮助工具栏扩展url
var customHelpToolExtMenuUrl = <#customHelpToolExtMenuUrl>;
//是否需要保存提示
@ -278,7 +270,7 @@
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.ui.js'></script>
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js'></script>
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/coe.designer.extend.events.js'></script>
<!-- <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js'></script>-->
<!-- <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js'></script>-->
<script type="text/javascript" src="../<I18N#COEPATH>/js/coe.pal.processlevel.create.js"></script>
<!-- util -->
<script type="text/javascript" charset='UTF-8' src="../apps/com.actionsoft.apps.coe.pal/js/jquery.base64.js"></script>
@ -298,7 +290,6 @@
if (navigator.userAgent.toLowerCase().match(/chrome/) != null) {
$(function() {
$(".footer_chrome").show();
});
}
</script>
@ -588,8 +579,8 @@
</head>
<body style="overflow:hidden;" onload="updateShapePanel();">
<canvas id="support_canvas" style="display: none;"></canvas>
<div id="designer_header">
<canvas id="support_canvas" style="display: none;"></canvas>
<div id="designer_header">
<div class="row row1">
<div id="title_container" style="width: 100%;">
@ -726,8 +717,8 @@
<div class="ico ico_import"></div>
</div> -->
</div>
</div>
<div id="designer">
</div>
<div id="designer">
<div id="shape_panel" class="layout"></div>
<div id="shape_panel_more_shape" style="display:none;">
<input id="moreShapes" type='button' style='height: 24px;width: 80px;margin-top: 4px;line-height: 24px;' class="designer_button" onclick="UI.showShapesManage()" value="更多图形" />
@ -880,7 +871,7 @@
</div>
<div id="shape_thumb" class="menu">
<canvas width="160px"></canvas>
<div style="width: 180px;"></div>
<div></div>
</div>
<div id="dock">
<div class="dock_header"></div>
@ -1293,9 +1284,9 @@
</div>
</div>
</div>
</div>
<!--
<div id="designer_footer">
</div>
<!--
<div id="designer_footer">
<div class="footer_content">
<div class="left_box">
<input id="moreShapes" type='button' style='height: 24px;width: 80px;margin-top: 4px;line-height: 24px;<#btnShapeStyle>' class="designer_button" onclick="UI.showShapesManage()" value="更多图形" />
@ -1325,9 +1316,9 @@
</ul>
</div>
</div>
</div>
</div>
-->
<div id="ui_container">
<div id="ui_container">
<div id='color_picker' class="menu color_picker" style="display: none;">
<div class="color_items">
<div style="background-color:rgb(255,255,255);"></div>
@ -2310,7 +2301,7 @@
</div>
</div>
</div>
<!--
<!--
<div class="dialog-button-wrap" style="text-align:right">
<div class="dlg-button">
<button type="button" class="button blue" onclick="UI.setLink()">新增</button>
@ -2604,9 +2595,9 @@
<li class="devider"></li>
<li ac="out">退出</li>
</ul>
</div>
</div>
<!-- <div class="share_container">
<!-- <div class="share_container">
<div class="header_right_btn">
@ -2622,26 +2613,26 @@
<div class="ico ico_accordion"></div>
</div>
</div>-->
<div id="link-dialog-normal" class="dialog" style="min-width: 250px; display:none;">
<div id="link-dialog-normal" class="dialog" style="min-width: 250px; display:none;">
<div id="link-content" class="dialog_content" style="padding-top: 30px; text-align: center;">
</div>
</div>
</div>
<!-- dialog -->
<div id="attribute-edit-window" style="width:500px;height:315px;display:none;">
<!-- dialog -->
<div id="attribute-edit-window" style="width:500px;height:315px;display:none;">
<div style='margin:0px;height:225px;width:500px;'>
<textarea rows="" cols="" style="height: 215px; width: 493px;" id='attribute-edit-content'></textarea>
</div>
</div>
<div style="width:510px;display:none;" id="shapes_dialog">
</div>
<div style="width:510px;display:none;" id="shapes_dialog">
<div id="content" class="dlg-content awsui-ux">
<ul id="shape_manage_list">
<#liStr>
</ul>
</div>
</div>
<div id="shapes_dialog2" class="dialog" style="width: 400px; display:none;">
</div>
<div id="shapes_dialog2" class="dialog" style="width: 400px; display:none;">
<div class="dialog_header">图形管理</div>
<div class="dialog_content" style="padding: 0px; max-height: 372px; overflow: auto;">
<li>
@ -2717,8 +2708,8 @@
<span class="designer_button" onclick="UI.saveShapesManage()">确定</span>&nbsp;
<span class="designer_button normal" onclick="$('#shapes_dialog').dlg('close')">取消</span>
</div>
</div>
<div style="width:510px; display:none;" id="custom_define_dialog" title="自定义形状">
</div>
<div style="width:510px; display:none;" id="custom_define_dialog" title="自定义形状">
<div class="dlg-content awsui-ux">
<table class="awsui-ux">
<tr>
@ -2762,10 +2753,10 @@
</tr>
</table>
</div>
</div>
</div>
<!-- 数据属性弹框表格 -->
<div id="attribute-table-window" style="width:500px;height:325px;display:none;">
<!-- 数据属性弹框表格 -->
<div id="attribute-table-window" 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;">
@ -2776,10 +2767,10 @@
<div style="margin-top: 5px" id="attribute-add-content"></div>
</div>
</div>
</div>
</div>
<!-- 文件属性弹框表格 -->
<div id="attribute-table-window1" style="width:500px;height:325px;display:none;">
<!-- 文件属性弹框表格 -->
<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;">
@ -2790,9 +2781,9 @@
<div style="margin-top: 5px" id="attribute-add-content1"></div>
</div>
</div>
</div>
</div>
<div id="checkoutTip">
<div id="checkoutTip">
<div style="width: 36px; float: left;">
<img src="../apps/_bpm.platform/js/designer/extend/images/lock.png" />
</div>
@ -2800,10 +2791,10 @@
<font color="green"><b><#checkouttime></b>
</font>,点击此处<a style="text-decoration: none;" href="#" onclick="BPMNBiz.getCheckoutRight();return false;">强行获取编辑权</a>
</div>
</div>
</div>
<!-- 不支持HTML5的页面显示图片 -->
<div id="mainDiv" style="display: none;">
<!-- 不支持HTML5的页面显示图片 -->
<div id="mainDiv" style="display: none;">
<div class="view_box">
<div id="chartDivBox" style="background: none;">
<div id="chartDiv" style="left: 148.5px; top: 0px;">
@ -2817,9 +2808,9 @@
</div>
</div>
</div>
</div>
</div>
<div id="checkoutTip">
<div id="checkoutTip">
<div style="width: 36px; float: left;">
<img src="../apps/_bpm.platform/js/designer/extend/images/lock.png" />
</div>
@ -2827,15 +2818,15 @@
<font color="green"><b><#checkouttime></b>
</font>,点击此处<a style="text-decoration: none;" href="#" onclick="BPMNBiz.getCheckoutRight();return false;">强行获取编辑权</a>
</div>
</div>
</div>
<div title="" style="width:550px;display:none;" id="upfile-dialog">
<div title="" style="width:550px;display:none;" id="upfile-dialog">
<div id='upfile-content' style='height:330px;'>
<iframe width="100%" id="upfile-content-iframe" name="upfile-content-iframe" frameBorder="0" style="width: 100%; height:100%;"></iframe>
</div>
</div>
</div>
<div id="visio_import_dlg" title="Visio导入" style="display: none;">
<div id="visio_import_dlg" title="Visio导入" style="display: none;">
<table class="awsui-ux" cellspacing="3" cellpadding="0" style="width: 100%; margin: 25px auto;">
<tr>
<td style="width: 250px;"><input id="visio_import_input" type="text" placeholder="请上传visio文件..." class="awsui-input" readonly=true style="width: 240px;" /></td>
@ -2844,9 +2835,9 @@
</td>
</tr>
</table>
</div>
</div>
<div id="shape_import_dlg" title="导入" style="display: none;">
<div id="shape_import_dlg" title="导入" style="display: none;">
<div style="width: 550px;height: 280px;vertical-align: top;">
<button id="upShapeFile" onclick="return false;" type="button" class="awsui-btn awsui-btn-green" style="margin-left: 20px;margin-top:10px">新增</button>
<div style="margin-left: 20px;padding: 5px; font-size: 12px; color: rgb(120, 120, 120);">
@ -2873,10 +2864,10 @@
</table>
</div>
</div>
</div>
</div>
<!--<I18N#流程属性的对话框>-->
<div id="dialog_properties" style="width:525px;display:none;">
<!--<I18N#流程属性的对话框>-->
<div id="dialog_properties" style="width:525px;display:none;">
<div id="dialog_properties_area" style="height:260px;" class="dlg-content">
<iframe id="properties_frame" src="" frameborder="0" width="100%" height="100%"></iframe>
</div>
@ -2887,11 +2878,11 @@
<button class="button" onclick="$('#dialog_properties').dialog('close');return false;"><I18N#取消></button>
</div>
</div>
</div>
</div>
<div id="sameShapeNameAlert" title="提示" style="width:300px;display:none;"></div>
<#batch-dlg>
<form id="openNewModelForm" name="openNewModelForm" method="post" action="./w" target="_blank">
<div id="sameShapeNameAlert" title="提示" style="width:300px;display:none;"></div>
<#batch-dlg>
<form id="openNewModelForm" name="openNewModelForm" method="post" action="./w" target="_blank">
<input type="hidden" name="sid" id="sid" value="<#sid>">
<input type="hidden" name="imgPath" id="imgPath" value="<#imgPath>">
<input type="hidden" name="openType" id="openType" value="<#openType>">
@ -2901,7 +2892,7 @@
<input type="hidden" name="defaultMoreAttrSort" id="defaultMoreAttrSort" value="<#defaultAttrSort>" />
<input type="hidden" name="moreAttrRight" id="moreAttrRight" value="<#moreAttrRight>" />
<input type="hidden" name="appId" id="appId" value="<#appId>">
</form>
</form>
</body>

69
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
View File

@ -201,6 +201,75 @@ $(function() {
intervalRefresh();
}
// 编号刷点击事件
$('#bar_sort').off("click").on("click",function (){
if ($("#saving_tip").text() != "已保存成功" && $("#saving_tip").text() != "保存成功" && $("#saving_tip").text() != "您的文件已经成功保存") {
$.simpleAlert('页面未保存,请先保存', 'error', 1500);
return;
} else {
// $.simpleAlert("正在编号", "loading");
// $.ajax({
// type: "POST",
// url: "./jd",
// data: {
// sid: CLB.sid,
// cmd: "com.actionsoft.apps.coe.pal_repository_process_define_save",
// uuid: ruuid,
// },
// success: function (msg, textStatus, jqXHR) {
// $.simpleAlert("close");
// console.log(msg)
// },
// error: function (jqXHR, textStatus, errorThrown) {
// $.simpleAlert("close");
// $.simpleAlert('编号失败', 'error', 1500);
// }
// })
let numObj = {
brushId: 'number_brush',
orderList: [
{ shapeId: 'obj_c9e1cda208700001132717c019b9a350',order: 1},
{ shapeId: 'obj_c9e1cda2b8a000013b42e5f045db1f01',order: 2},
{ shapeId: 'obj_c9e1cda4ac10000164dd6bb015406b40',order: 3},
{ shapeId: 'obj_c9e1cda3109000015741104116a918a8',order: 4},
{ shapeId: 'obj_c9e1cdab200000014a2eade016e8170d',order: 5},
{ shapeId: 'obj_c9e1cdb266f0000159a7c8afa7701a68',order: 6},
]
}
let obj = Model.define
console.log(obj)
let elements = obj.elements
let orderList = numObj.orderList
for (let j = 0; j < orderList.length; j++) {
for(let i in elements) {
if (orderList[j].shapeId == i) {
for(let a = 0; a < elements[i].dataAttributes.length; a ++ ) {
if(elements[i].dataAttributes[a].attributesJsonArray !== undefined) {
for(let b = 0; b < elements[i].dataAttributes[a].attributesJsonArray.length; b ++) {
if(elements[i].dataAttributes[a].attributesJsonArray[b].id == numObj.brushId) {
elements[i].dataAttributes[a].attributesJsonArray[b].value = orderList[j].order
}
}
}
}
}
}
}
// for(let i in elements) {
// for(let a = 0; a < elements[i].dataAttributes.length; a ++ ) {
// if(elements[i].dataAttributes[a].attributesJsonArray !== undefined) {
// for(let b = 0; b < elements[i].dataAttributes[a].attributesJsonArray.length; b ++) {
// if(elements[i].dataAttributes[a].attributesJsonArray[b].id == 'number_brush') {
// elements[i].dataAttributes[a].attributesJsonArray[b].value = 24
// }
// }
// }
// }
// }
$("#saving_tip").css("color", "rgb(255, 0, 0)");
$("#saving_tip").text("文件已修改，未保存");
}
})
})

7
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
View File

@ -363,6 +363,13 @@ height: 25px;
padding:0 5px;
white-space: normal;
}
.diffTableTbody tr td{
border:1px solid #ccc;
padding:5px;
white-space: normal;
min-height: 25px;
line-height: 20px;
}
.dialogTableTbody tr td{
color: #666666;
border:1px solid #ccc;

76
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.debug.js
View File

@ -3042,6 +3042,82 @@ var Dock = {
}
});
}
else if(this.currentView == 'diff') {
// var html = "<div style=\"font-size: 16px; color: #aaa; text-align: center; vertical-align: middle; line-height: 200px;\">暂无版本差异</div>";
var html = ''
var diffContent = [
{
versionName: 'Ver 2.0',
updateTime: '5月19日 16:00',
updateContent: [
{
title: '文件修改:',
detail: ['[内容]增加了111111111111111111','[责任部门]增加了11111111111111111']
},
{
title: '节点修改:',
detail: ['删除[开始事件]节点','删除[开始]节点','删除[人工]节点']
},
{
title: '[文件]删除11111111111',
detail: []
}
]
},
{
versionName: 'Ver 1.0',
updateTime: '5月14日 15:00',
updateContent: [
{
title: '文件修改',
detail: ['[内容]增加了111111111111 ',]
},
{
title: '节点修改',
detail: ['删除[开始事件]节点','删除[开始]节点','删除[人工]节点','删除[结束]节点']
},
{
title: '[制度]增加了11111111111111',
detail: []
},
{
title: '[文件]删除了11111111111',
detail: []
}
]
}
]
for (var i = 0; i < diffContent.length; i++) {
var diffCount = 0
var content = diffContent[i].updateContent
var diffListHtml = ''
for (var j = 0; j < content.length; j++) {
var diffDetailHtml = ''
var listDetail = content[j].detail
if (listDetail.length == 0) {
diffCount +=1
}
for (var k = 0; k < listDetail.length; k++) {
diffCount +=1
diffDetailHtml += '<div style="margin-left: 10px">' + '·' +listDetail[k]+'</div>'
}
diffListHtml += '<div>' + content[j].title +'</div>'
+ '<div>'+diffDetailHtml+'</div>'
}
html += '<tr>'
+ '<td style="width:50px;">' + diffContent[i].versionName + '</td>'
+ '<td style="width:250px">' + diffContent[i].updateTime + '<span style="padding-left: 10px">' + '(' + diffCount + '处修改)' + '</span>' + '</td>'
+ '</tr>'
+ '<tr>'
+ '<td style="width:50px"></td>'
+ '<td style="width:250px">' + diffListHtml + '</td>'
+ '</tr>'
}
$("#diffTable").empty().html(html)
}
if (this.currentView == "history") {
if (drawNav && Dock.historyVersions == null) {
this.loadHistorys();

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js
View File

File diff suppressed because one or more lines are too long

6
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/diagraming/ui.css
View File

@ -147,6 +147,9 @@ html{
.ico.redo{
background-position: -20px 0px;
}
.ico.sort{
background-position: 1px -637px;
}
.ico.brush{
background-position: -20px -20px;
}
@ -284,6 +287,9 @@ html{
.ico_link{
background-position: -20px -420px;
}
.ico_dock_diff {
background-position: -20px -440px;
}
.ico_risk{
background-position: -40px -620px;
}

BIN
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/images/diagraming/sprite.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 18 KiB