From fa88df10b32eae4b08a667b58ce08159555274f2 Mon Sep 17 00:00:00 2001
From: wangpf <1305001440@qq.com>
Date: Thu, 8 Jun 2023 10:47:46 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=82=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../obj_4e95a7af7bf1414f9e878d013192675e.xml | 4 ++--
.../obj_c616f56595f54db590ff35e873c69096.xml | 22 +++++++++----------
.../js/coe.team.pal.designer.js | 4 +++-
.../scripts/diagraming/designer.core.js | 8 ++++---
4 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
index ab7f9acc..b931243f 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
@@ -4,7 +4,7 @@
admin
2023-05-31 18:03:32
admin
- 2023-06-02 10:42:49
+ 2023-06-07 19:32:51
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrfBc9hqIASUfUE0oNnMJX+ec3gaaVRTOXkn+Q9j7jtPqago5GSsGy8ZiXG2WLXK9d
false
1.0
@@ -30,8 +30,8 @@
-
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_c616f56595f54db590ff35e873c69096/obj_c616f56595f54db590ff35e873c69096.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_c616f56595f54db590ff35e873c69096/obj_c616f56595f54db590ff35e873c69096.xml
index 07d54338..1f61e42f 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_c616f56595f54db590ff35e873c69096/obj_c616f56595f54db590ff35e873c69096.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_c616f56595f54db590ff35e873c69096/obj_c616f56595f54db590ff35e873c69096.xml
@@ -4,7 +4,7 @@
admin
2023-06-05 13:54:43
admin
- 2023-06-06 17:09:20
+ 2023-06-07 17:56:56
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrd09w7WDMLKINXCrH1CQZAlHrV5j83IvEzBpZfcUU+GL5pjq9Ij6vwzDA7sjaDAgy
false
1.0
@@ -27,7 +27,8 @@
-
+
+
@@ -39,15 +40,14 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
index 1ebb91fb..78ef0cfb 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
@@ -286,6 +286,7 @@ $(function() {
* 流程清单列表按钮
*/
$("#processManifest").off("click").on("click", function () {
+ debugger;
getProcessManifestInfo();
});
@@ -293,9 +294,10 @@ $(function() {
* 获取流程列表信息，并跳转到dw数据试图
*/
function getProcessManifestInfo() {
+ debugger;
let url="./w?sid="+$("#sid").val()+"&cmd=CLIENT_DW_PORTAL&processGroupId=obj_4e95a7af7bf1414f9e878d013192675e&appId"
+ "=com.actionsoft.apps.coe.pal.publisher&dwViewId=obj_3ebec26134e345a2894e4bf0d0c628f0&condition="
- + encodeURIComponent("[{cp:'=',fd:'MODELIDOBJ_7AACB67B0377496E8A2B6A62600C6B78',cv:'"+ ruuid +"'}]");
+ + encodeURIComponent("[{cp:'=',fd:'MODELID',cv:'"+ ruuid +"'}]");
//+"&condition=\"+encodeURIComponent(\"[{cp:'=',fd:'MODELID',cv:'"+ruuid+"'}]\"";
$.ajax({
type: "POST",
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js
index eca6c12c..5c3c3bbb 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js
@@ -940,10 +940,12 @@ var Designer = {
//Designer.events.push("initialized");
let searchParam=window.location.search;
//打开模型预览页面表单或制度的时候不渲染模型图
- if(searchParam.indexOf("com.actionsoft.apps.coe.pal.publisher_publish_file_open")>=0 && methodId != "data.form" && methodId != "control.policy"){
- // if (methodId != "data.form" && methodId != "control.policy") {
+ if(searchParam.indexOf("com.actionsoft.apps.coe.pal.publisher_publish_file_open")>=0){
+ if (methodId != "data.form" && methodId != "control.policy") {
Designer.events.push("initialized");
- //}
+ }
+ }else{
+ Designer.events.push("initialized");
}
$("#designer_layout").on("scroll",
function () {