diff --git a/com.actionsoft.apps.coe.pal.processlist/.classpath b/com.actionsoft.apps.coe.pal.processlist/.classpath deleted file mode 100644 index dbda85df..00000000 --- a/com.actionsoft.apps.coe.pal.processlist/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml index 4f118ffc..4fc119db 100644 --- a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml +++ b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_4a62c61b-4812-4212-aee9-1eb134556d72/4a62c61b-4812-4212-aee9-1eb134556d72.xml @@ -4,7 +4,7 @@ admin 2022-07-27 14:42:37 admin - 2022-07-29 00:30:17 + 2022-08-05 11:18:31 tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrSZxfBQPLcrsqkct0Iu+0j/eRcugbUD89XPSXbDhspOrNlUsrZHPAbzKR13hnEzNv false 流程发布权限范围表 @@ -160,8 +160,8 @@ true 200 - AWSUI.Text - {"search":"0"} + AWSUI.Address + {"placeholder":"","addressType":"dept","isLiveSearch":true,"addressSetting":{"delimiter":",","choiceType":"single","leafType":"dept"},"range":"all","isFullDeptPath":false,"deptSourceField":"DEPTID","deptTargetField":"ORGPERM"} true false true diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_c493accc-61ba-4316-bc35-cee75b4db827/c493accc-61ba-4316-bc35-cee75b4db827.xml b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_c493accc-61ba-4316-bc35-cee75b4db827/c493accc-61ba-4316-bc35-cee75b4db827.xml index c693f204..6103e659 100644 --- a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_c493accc-61ba-4316-bc35-cee75b4db827/c493accc-61ba-4316-bc35-cee75b4db827.xml +++ b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_c493accc-61ba-4316-bc35-cee75b4db827/c493accc-61ba-4316-bc35-cee75b4db827.xml @@ -4,7 +4,7 @@ 管理员 2014-08-14 14:45:28 admin - 2022-07-29 02:38:37 + 2022-08-19 11:08:38 DgQSSyFmOqrf7WQa6WFesZuTOnzFe+zevZg0BYW55MuhMOtUylRD92QW2MZY8fzumIIJ5dbdMmSe4Z/+hj7n45Jsb9smthtrG+oWfQ9si6kl1AjP7JL4o/NB/iTn6hmh true 流程发布申请表 @@ -184,7 +184,7 @@ TEXT 128 false - + @departmentName() 100 AWSUI.Text {"search":"0"} @@ -265,11 +265,11 @@ 100 AWSUI.Address - {"addressType":"user","isAdvMode":false} + {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""} true false false - readonly + ENTITY @@ -291,11 +291,11 @@ 100 AWSUI.Address - {"addressType":"user","isAdvMode":false} + {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""} true false false - readonly + ENTITY @@ -317,11 +317,11 @@ 100 AWSUI.Address - {"addressType":"user","isAdvMode":false} + {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""} true false false - readonly + ENTITY @@ -395,7 +395,7 @@ 100 AWSUI.CheckboxGroups - {"num":"3","readonlyDisplayAll":true,"separator":",","data":"流程文件发布|流程文件版本更新|流程文件废止","dataType":"sampleText"} + {"num":"3","readonlyDisplayAll":true,"separator":",","data":"流程制度发布|流程制度版本更新|流程制度废止","dataType":"sampleText"} true false true @@ -529,7 +529,7 @@ true false true - readonly + ENTITY @@ -547,7 +547,7 @@ 适应单位名称 TEXT 128 - true + false 100 AWSUI.GridDictionary @@ -603,7 +603,7 @@ N 100 AWSUI.ComboBox - {"placeholder":"","boItemId":"c493accc-61ba-4316-bc35-cee75b4db827","isAdvance":false,"dataType":"sampleText","data":"N:不需要|Y:需要","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}} + {"placeholder":"","boItemId":"c493accc-61ba-4316-bc35-cee75b4db827","isAdvance":false,"dataType":"sampleText","data":"N:否|Y:是","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}} true false true @@ -625,7 +625,7 @@ 适应区域名称 TEXT 128 - true + false 100 AWSUI.GridDictionary @@ -651,7 +651,7 @@ 适用产品/场景名称 TEXT 128 - true + false 100 AWSUI.GridDictionary @@ -730,7 +730,7 @@ TEXT 128 true - @departmentPathName + @departmentName() 100 AWSUI.Text {"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false} @@ -759,7 +759,7 @@ 100 AWSUI.HTMLEditor - {"htmlHeight":"80","htmlWidth":"","isAdvance":false,"isPasteplain":false,"waterMarkFlag":"","compressFlag":"","isSupportUpFile":true,"isSupportUpImg":true,"isWaterMark":true,"isCompress":true} + {"htmlHeight":"150","htmlWidth":"","isAdvance":false,"isPasteplain":false,"waterMarkFlag":"","compressFlag":"","isSupportUpFile":true,"isSupportUpImg":true,"isWaterMark":true,"isCompress":true} true false true @@ -833,15 +833,15 @@ 内部审核人 TEXT 128 - false + true 100 AWSUI.Address - {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"single"},"deptSourceField":"","deptTargetField":""} + {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":true,"companyList":"","addressSetting":{"rootDetpId":"","teamId":"","isDisplayMap":true,"isMapFormat":false,"hideSubDeptAsCompany":false,"layerFrom":"","layerTo":"","range":"department|team","delimiter":",","choiceType":"multiple","itemDisplayType":"all","leafType":"user","filterClass":"com.actionsoft.apps.coe.pal.publisher.filter.AddressUIFilterTest2","sourceDataClass":""},"sourceField":"UID","targetField":"INTERNAL_AUDITOR"} true false true - readonly + ENTITY @@ -912,7 +912,7 @@ TEXT 128 false - Y + N 100 AWSUI.ComboBox {"placeholder":"","boItemId":"c493accc-61ba-4316-bc35-cee75b4db827","isAdvance":false,"dataType":"sampleText","data":"N:否|Y:是","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}} @@ -964,7 +964,7 @@ TEXT 128 false - Y + N 100 AWSUI.ComboBox {"placeholder":"","boItemId":"c493accc-61ba-4316-bc35-cee75b4db827","isAdvance":false,"dataType":"sampleText","data":"N:否|Y:是","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}} @@ -1071,7 +1071,7 @@ 100 AWSUI.Address - {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""} + {"placeholder":"","addressType":"user","isLiveSearch":false,"isAdvMode":true,"companyList":"","addressSetting":{"rootDetpId":"","teamId":"","isDisplayMap":true,"isMapFormat":false,"hideSubDeptAsCompany":false,"layerFrom":"","layerTo":"","range":"department","delimiter":",","choiceType":"multiple","itemDisplayType":"all","leafType":"user","filterClass":"com.actionsoft.apps.coe.pal.publisher.filter.AddressUIFilterTest2","sourceDataClass":""},"sourceField":"UID","targetField":"PROFESSIONAL_REVIEWER"} true false true @@ -1097,7 +1097,7 @@ 100 AWSUI.Address - {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"single"},"deptSourceField":"","deptTargetField":""} + {"placeholder":"","addressType":"user","isLiveSearch":false,"isAdvMode":true,"companyList":"","addressSetting":{"rootDetpId":"","teamId":"","isDisplayMap":true,"isMapFormat":false,"hideSubDeptAsCompany":false,"layerFrom":"","layerTo":"","range":"department","delimiter":",","choiceType":"multiple","itemDisplayType":"all","leafType":"user","filterClass":"com.actionsoft.apps.coe.pal.publisher.filter.AddressUIFilterTest2","sourceDataClass":""},"sourceField":"UID","targetField":"JOINT_REVIEWER"} true false true @@ -1119,7 +1119,7 @@ 流程经理 TEXT 128 - false + true 100 AWSUI.Address @@ -1175,7 +1175,7 @@ 100 AWSUI.Address - {"placeholder":"","addressType":"dept","isLiveSearch":true,"addressSetting":{"delimiter":",","choiceType":"multiple","leafType":"dept"},"range":"all","isFullDeptPath":false,"deptSourceField":"DEPTID","deptTargetField":"SEND_SCOPE_ORG"} + {"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":true,"companyList":"","addressSetting":{"rootDetpId":"","teamId":"","isDisplayMap":false,"isMapFormat":false,"hideSubDeptAsCompany":false,"layerFrom":"","layerTo":"","range":"department","delimiter":",","choiceType":"multiple","itemDisplayType":"all","leafType":"dept","filterClass":"com.actionsoft.apps.coe.pal.publisher.filter.AddressUIFilterTest","sourceDataClass":""},"sourceField":"DEPTID","targetField":"SEND_SCOPE_ORG"} true false true @@ -1249,7 +1249,7 @@ 是否发送全公司 TEXT 128 - true + false 100 AWSUI.RadioGroups @@ -1353,7 +1353,7 @@ 流程标题 TEXT 128 - true + false 100 AWSUI.Text @@ -1373,6 +1373,32 @@ {} + + d332203d-29a4-45db-909c-a0a99ba15257 + DATAID + DATAID + TEXT + 2000 + true + + 100 + AWSUI.Text + {} + true + false + true + + ENTITY + + + + 0 + + false + + + {} + diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_3a539de210d54139b3dcc3a625869479/obj_3a539de210d54139b3dcc3a625869479.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_3a539de210d54139b3dcc3a625869479/obj_3a539de210d54139b3dcc3a625869479.xml index b45282cf..e5d68340 100644 --- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_3a539de210d54139b3dcc3a625869479/obj_3a539de210d54139b3dcc3a625869479.xml +++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_3a539de210d54139b3dcc3a625869479/obj_3a539de210d54139b3dcc3a625869479.xml @@ -4,7 +4,7 @@ admin 2022-07-28 18:37:26 admin - 2022-07-28 18:37:45 + 2022-08-05 11:17:21 tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrdn+ApwIq8Dsw1xZKdztE+KzfEufixuR4RBw7YEj0gKicTgZCqys3mgfn46GtOvWs false 1.0 @@ -22,32 +22,42 @@ - - -
-
-
- -
-
<#userName>
- -
- 退出 -
- - -
-
- 门 户 - -
-
-
- -
- -
-
- - - +
+ +
+
@@ -282,7 +213,7 @@ input { for (var i = 0; i < portalTabs.length; i++) { var index = i + 2; var tab = portalTabs[i]; - var tabHtml = '' + portalTabs[i].name + ''; + var tabHtml = '' + portalTabs[i].name + ''; $('#tabs').append(tabHtml); var content = ''; content += '
' @@ -292,53 +223,5 @@ input { $('#content').append(content); } - // for (var i = 0; i < portalTabs.length; i++) { - // var index = i + 2; - // var tabHtml = '' + portalTabs[i].name + ''; - // $('#tabs').append(tabHtml); - // var content = ''; - // content += '
' - // // content += '' - // content += '' - // content += '
'; - // $('#content').append(content); - // var object = {}; - // object.id = 'main-frm' + index; - // object.url = portalTabs[i].url; - // object.showWsSelect = portalTabs[i].showWsSelect; - // object.showTabUserType = portalTabs[i].showTabUserType; - // portalTabArray.push(object); - // } - - var navtab; - function getUseNameLength(str_data){ - var temp=0; - for(var i=0;i6){ - $(".middle").css("width",(12+((len-6)/2)+1)+"%"); - } - $(window).resize(); - }); - - function search() { - // 所有类型，搜索框内容，当前类型， - var text = $('#searchText').val().trim(); - var type = 'all'; - var templateId = '30267ab3-aeb6-4371-88e0-ecc13cef94a6'; - text = encodeURI(text); - window.open("./w?cmd=com.actionsoft.apps.coe.pal.publisher_client_sso_search_page&sid=" + sid + "&type=" + type + "&templateId=" + templateId + "&text=" + text + "&wsId=" + $('#wsId').val(), "_blank"); - } - \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal.publisher/template/page/publish.client.sso.home2.html_bak b/com.actionsoft.apps.coe.pal.publisher/template/page/publish.client.sso.home2.html_bak new file mode 100644 index 00000000..465ffd7d --- /dev/null +++ b/com.actionsoft.apps.coe.pal.publisher/template/page/publish.client.sso.home2.html_bak @@ -0,0 +1,344 @@ + + + + +流程管理门户 + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 门 户 + +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js index 5da2499f..32ca6154 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js @@ -403,14 +403,9 @@ function initPublishData(data, type, pageNumber, start){ // 初始化数据 function selectPublishData(data, type, pageNumber, start) { + + //渲染到前台的流程架构L1，L2，L3 - var ids = []; - for (var i = 0; i < data.length; i++) { - var temp = data[i]; - if ((temp.methodId == 'control.policy' || temp.methodId == 'data.form' || temp.methodId.indexOf('process.') > -1) && temp.methodId != 'default') { - ids.push(temp.publishFileId); - } - } var param = { cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs', @@ -749,7 +744,6 @@ function addProcess(type) { $.simpleAlert('请选择创建流程手册的时间', 'info'); return; } - disabledButton(); setTimeout(function() { // 获取说明内容 @@ -776,9 +770,6 @@ function addProcess(type) { temps[i].publishDesc = desc; newTemp.push(temps[i]); } - - - publishFlowCheck(newTemp); // 初始化页数及当前页 initNewPagination(newPageSetting.pageNum - 1); // 初始化当前页的数据 @@ -890,43 +881,6 @@ function addProcess(type) { }); } -function publishFlowCheck(data) { - debugger; - var ids = []; - for (var i = 0; i < data.length; i++) {debugger - var temp = data[i]; - if ((temp.methodId == 'control.policy' || temp.methodId == 'data.form' || temp.methodId.indexOf('process.') > -1) && temp.methodId != 'default') { - ids.push(temp.publishFileId); - } - } - - //校验模型中支持文件附件是否上传 - var param = { - sid : sid, - cmd : "com.actionsoft.apps.coe.pal.publisher_get_publishFlow_files", - wsId: wsId, - uuids: JSON.stringify(ids) - } - $.ajax({ - url : "./jd", - type : "POST", - data : param, - success : function(r) { - if (r.result == 'ok') { - if(r.data.result=='error'){ - $('#publisher_dialog').find('div.dlg-button').find('button:first').prop('disabled', ''); - $.simpleAlert(r.data.sb,"error",3000); - return; - } - - } - } - }); - - - -} - // 打开流程树选择窗口 function queryTree() { if ($("#treeDialog").css('display') == 'none') {// 防止多次打开 @@ -945,10 +899,6 @@ function initChangedData(changeFileId) { var selectedTaskId = ""; selectedTaskId = createReport(changeTemp[i].category, changeTemp[i].methodId, selectedId, selectedTaskId); - - - - // 更新数据 changeTemp[i].changedFileIdNew = selectedId; changeTemp[i].changedFileNameNew = changeTemp[i].targetFiles[j].text; @@ -1290,6 +1240,7 @@ function getStopBatchResult(type) { // 获取已有的流程手册 function queryBatchReport(data) { + debugger; var ids = []; for (var i = 0; i < data.length; i++) { var temp = data[i]; @@ -1351,11 +1302,6 @@ function createReport(category, method, uuid, taskId) { return taskId; } - - - - - // 批量创建流程手册 function createBatchReport(data, createTime) { var ids = []; @@ -1467,6 +1413,7 @@ function quickCreateReport(obj, object, type) { $(object).text(targetFileName); } }else{ + debugger; //更新数据记录 if (type == 'new') { var fileName = obj.publishFileName + ' V' + obj.fileVersion + '-' + getOutputName(category, method); @@ -1897,6 +1844,7 @@ function formSave(isTransact){ $.simpleAlert('发布内容不能为空', 'info'); return false; } + debugger; var index = 0; if (!($("#publisher_new_tr").css('display') == 'none') && newTemp.length > 0) { index++; @@ -2320,7 +2268,9 @@ function downloadReport(uuid, taskId) { uuid: uuid }, success : function(r) { + debugger; if (r.result == "ok") { + debugger; window.open (r.data.url); } else { diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/util/ShapeUtils.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/util/ShapeUtils.java index f15a50cd..c4850d36 100644 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/util/ShapeUtils.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/util/ShapeUtils.java @@ -1,12 +1,12 @@ -package com.actionsoft.apps.coe.pal.pal.repository.util; +package com.actionsoft.apps.coe.pal.util; + +import java.util.ArrayList; +import java.util.List; import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import java.util.ArrayList; -import java.util.List; - public class ShapeUtils {