From f679fbd894ef0323f1134747dc0d69d862b3c717 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Mon, 19 Sep 2022 18:54:39 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96wsid=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/coe.pal.process.publish.ma.js | 9 +++++----
.../js/coe.pal.process.publish.multiple.js | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js
index 184de2d5..a429b97e 100644
--- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js
+++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js
@@ -64,6 +64,7 @@ function getWsId() {
type : "POST",
dataType : "JSON",
data : param,
+ async: false,
success : function(r) {
if (r.result == 'ok') {
var wsId=$("#WSID").val();
@@ -1103,7 +1104,7 @@ function getNotPublishTreeData(type) {
sid : sid,
cmd : "com.actionsoft.apps.coe.pal.publisher_publish_tree_ma_data_query",
teamId: teamId,
- wsId: '0285ff6a-e418-4d8b-a5b1-22240296f769',
+ wsId: wsId,
type: type,
flag: true
}
@@ -1143,7 +1144,7 @@ function loadNewData(treeNode) {
var dataModel = {
url : "./w?sid=" + jQuery("#sid").val()
+ "&cmd=com.actionsoft.apps.coe.pal.publisher_publish_tree_ma_data_query&flag=" + false + "&pid=" + pid
- + "&wsId=" + '0285ff6a-e418-4d8b-a5b1-22240296f769' + "&type=" + "new" + "&teamId=" + teamId,
+ + "&wsId=" + wsId + "&type=" + "new" + "&teamId=" + teamId,
method : "POST",
dataType : "json"
}
@@ -1221,7 +1222,7 @@ function getPublishedTreeData(type) {
sid : sid,
cmd : "com.actionsoft.apps.coe.pal.publisher_publish_tree_ma_data_query",
teamId: teamId,
- wsId: '0285ff6a-e418-4d8b-a5b1-22240296f769',
+ wsId: wsId,
type: type,
flag: true
}
@@ -2004,7 +2005,7 @@ function formSave(isTransact){
var params = {
title : $("#title").val(),
- wsId: '0285ff6a-e418-4d8b-a5b1-22240296f769',
+ wsId: wsId,
teamId: $("#teamId").val(),
teamName: $("#teamName").val(),
processInstId:$("#processInstId").val()
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 dd9a5738..acee3696 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
@@ -65,6 +65,7 @@ function getWsId() {
type : "POST",
dataType : "JSON",
data : param,
+ async: false,
success : function(r) {
if (r.result == 'ok') {
var wsId=$("#WSID").val();
From a89a241d38d1d6648f951e49edb431fe7eb61f68 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Mon, 19 Sep 2022 19:02:06 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/coe.pal.process.publish.ma.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js
index a429b97e..a8328848 100644
--- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js
+++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js
@@ -768,7 +768,6 @@ function addProcess(type) {
buttons:[
{text:'确定',cls:"blue",handler:function(){
window.$.simpleAlert("请稍等...", "loading");
- debugger;
if (type == 'new') {
if (treeCheckedNewArr.length == 0) {
$.simpleAlert('发布流程不能为空');
@@ -1026,7 +1025,6 @@ function openPortalPage(uuid, taskId) {
// 打开流程选择dialog
function openQueryDataDialog(type) {
- debugger;
$('#treeDataDiv').html('');
$('#searchData').html('');
$("#loadImg").loading({
@@ -2372,9 +2370,7 @@ function downloadReport(uuid, taskId) {
uuid: uuid
},
success : function(r) {
- debugger;
if (r.result == "ok") {
- debugger;
window.open (r.data.url);
} else {
From c6179a3d90a6857d5803839af948701445f69969 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Tue, 20 Sep 2022 09:54:28 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=B0=E5=BB=BA?=
=?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E7=A9=BA?=
=?UTF-8?q?=E6=A0=BC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../template/page/main.htm | 2 +-
.../{app.b58aa8df.css => app.634e376c.css} | 2 +-
...cc4095.css => chunk-18ba0bf3.b9b5de63.css} | 0
...5e2b5a.css => chunk-1fd5b92a.9170273e.css} | 0
...3dbaa2.css => chunk-3a7599c6.bb861d84.css} | 0
.../main/css/chunk-532765fe.0cca68dd.css | 1 +
...e5d032.css => chunk-612728bc.3d893bb2.css} | 2 +-
...cd2ccf.css => chunk-632a23b2.5118bec3.css} | 2 +-
...2f3f84.css => chunk-6c83edf4.6c467910.css} | 0
...fd01d3.css => chunk-9d1e04c4.d1caea12.css} | 0
.../main/css/chunk-bb3b9f20.f7f4b256.css | 1 -
...3e7967.css => chunk-f3e4ff48.721c4dc9.css} | 0
...ont.71026185.svg => iconfont.1c1408b5.svg} | 0
...1d3.svg => iconfont.ce1b01d3.7c0515fd.svg} | 0
.../js/{app.10b9304e.js => app.a290a1ed.js} | 4 +-
.../main/js/chunk-18ba0bf3.d0d27872.js | 1 +
...529dedd5.js => chunk-1fd5b92a.07c16352.js} | 2 +-
.../main/js/chunk-21453108.61269ead.js | 1 -
.../main/js/chunk-23a660f0.1efa21de.js | 1 -
...fd29d082.js => chunk-2d0ab156.ca03ae9d.js} | 2 +-
...1061dc70.js => chunk-2d0b25b0.3ebfc816.js} | 2 +-
...f290866f.js => chunk-2d0f078a.3038704d.js} | 2 +-
...9f4d92b1.js => chunk-2d216d3a.96ada280.js} | 2 +-
...c12b6728.js => chunk-2d224b23.e62adedc.js} | 2 +-
...9b69a5bc.js => chunk-2d224ef1.44cb7f2b.js} | 2 +-
.../main/js/chunk-3178e2bf.97e80de1.js | 1 -
...52f9d178.js => chunk-3a7599c6.5d555915.js} | 2 +-
.../main/js/chunk-3a9b7577.1c8372d8.js | 1 -
.../main/js/chunk-532765fe.9bb04323.js | 1 +
.../main/js/chunk-5ca06e36.c64d879b.js | 1 +
.../main/js/chunk-612728bc.d0166971.js | 1 +
.../main/js/chunk-632a23b2.ffa525a8.js | 1 +
.../main/js/chunk-6c83edf4.93b8726a.js | 1 +
.../main/js/chunk-773ec048.42d708a6.js | 1 -
.../main/js/chunk-79148172.25989b20.js | 1 -
.../main/js/chunk-7f2e89b2.e179f783.js | 1 -
.../main/js/chunk-9d1e04c4.ddede9a0.js | 1 +
.../main/js/chunk-b158b92a.02ee2c83.js | 1 -
.../main/js/chunk-bb3b9f20.8fc67a6c.js | 1 -
.../main/js/chunk-bf7921b8.1d6eee48.js | 1 +
.../main/js/chunk-f3e4ff48.6d7f9787.js | 1 +
.../main/js/chunk-vendors.335bcbdd.js | 38 -------------------
.../main/js/chunk-vendors.bd2b52b4.js | 38 +++++++++++++++++++
43 files changed, 62 insertions(+), 62 deletions(-)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{app.b58aa8df.css => app.634e376c.css} (99%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-23a660f0.0ecc4095.css => chunk-18ba0bf3.b9b5de63.css} (100%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-03c6285a.7d5e2b5a.css => chunk-1fd5b92a.9170273e.css} (100%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-0df035f6.e83dbaa2.css => chunk-3a7599c6.bb861d84.css} (100%)
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-773ec048.b5e5d032.css => chunk-612728bc.3d893bb2.css} (87%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-7f2e89b2.e0cd2ccf.css => chunk-632a23b2.5118bec3.css} (97%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-b158b92a.fe2f3f84.css => chunk-6c83edf4.6c467910.css} (100%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-21453108.a3fd01d3.css => chunk-9d1e04c4.d1caea12.css} (100%)
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/{chunk-79148172.dc3e7967.css => chunk-f3e4ff48.721c4dc9.css} (100%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/img/{iconfont.71026185.svg => iconfont.1c1408b5.svg} (100%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/img/{iconfont.ce1b01d3.ce1b01d3.svg => iconfont.ce1b01d3.7c0515fd.svg} (100%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{app.10b9304e.js => app.a290a1ed.js} (99%)
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-03c6285a.529dedd5.js => chunk-1fd5b92a.07c16352.js} (97%)
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.61269ead.js
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.1efa21de.js
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d0ab156.fd29d082.js => chunk-2d0ab156.ca03ae9d.js} (82%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d212b99.1061dc70.js => chunk-2d0b25b0.3ebfc816.js} (99%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d0f078a.f290866f.js => chunk-2d0f078a.3038704d.js} (90%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d216d3a.9f4d92b1.js => chunk-2d216d3a.96ada280.js} (91%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d224b23.c12b6728.js => chunk-2d224b23.e62adedc.js} (84%)
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-2d224ef1.9b69a5bc.js => chunk-2d224ef1.44cb7f2b.js} (90%)
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.97e80de1.js
rename com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/{chunk-0df035f6.52f9d178.js => chunk-3a7599c6.5d555915.js} (98%)
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.1c8372d8.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-612728bc.d0166971.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-632a23b2.ffa525a8.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-773ec048.42d708a6.js
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-79148172.25989b20.js
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-7f2e89b2.e179f783.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.02ee2c83.js
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.8fc67a6c.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js
delete mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.335bcbdd.js
create mode 100644 com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js
diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm
index 5fc289c3..43026159 100644
--- a/com.actionsoft.apps.coe.pal/template/page/main.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/main.htm
@@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
var wHref = "./w";
- var jdHref = "./jd";