From 434cff69a60e7e6b7cc8c3cb2bbc41d7a6199c7f Mon Sep 17 00:00:00 2001
From: yujh <yujh_java@163.com>
Date: Thu, 29 Aug 2024 15:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C=E6=AD=A3?=
 =?UTF-8?q?=E6=96=87=E4=B8=8B=E8=BD=BD=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ....pal.process.publish.multiple.file_perm.js | 26 ++++++++++++++-----
 .../js/coe.pal.process.publish.multiple_L4.js |  2 +-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.file_perm.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.file_perm.js
index ab08a32d..95664e73 100644
--- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.file_perm.js
+++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.file_perm.js
@@ -362,6 +362,8 @@ function initHtml() {
 function initParam() {
 	teamId = "";
 	sid = $("#sid").val();
+	//本地测试环境使用
+	//wsId = "11dd43d0-a3c7-4ba7-860f-6eac3383e0b0";
 	debugger;
 	processInstId = $("#processInstId").val();
 	var param = {
@@ -1184,6 +1186,15 @@ function refreshManuals(processInstId,type) {
 function openQueryDataDialog(type) {
 	$('#treeDataDiv').html('<div id="loadImg" style="width:100%;height:100%;text-align:center;vertical-align: middle;margin: auto;"></div>');
 	$('#searchData').html('<input id="processName" style="width:700px;" type="text" class="awsui-txt" placeholder="快速查询">');
+	//增加一个监听
+	$(document).on('click', function(e) {
+		debugger;
+		//if (!e.target.closest('#autoSearchProcessDiv')) {
+		if (!$(e.target).closest('#autoSearchProcessDiv').length) {
+			// 如果点击的目标不是.input-container或其子元素，则隐藏tooltip
+			$("#autoSearchProcessDiv").hide();
+		}
+	});
 	$("#loadImg").loading({
 		description:"加载中",
 		size:'large',
@@ -1309,6 +1320,10 @@ function loadNewData(treeNode) {
 			dataModel : dataModel
 		});
 		var data = initTree.getChildrenByPid(pid);
+		//过滤data
+		data = data.filter(function(obj) {
+			return obj.method === 'process.framework';
+		});
 		var newData = [];
 		for (var i=0;i<data.length;i++){
 			if (data[i].pid != pid) {
@@ -2330,16 +2345,11 @@ function initPublishSearch(type) {
 			searchProcess(type);
 		}
 	});
-	$("#processName").bind("keypress",function(event){
+	$("#processName").bind("keydown",function(event){
 		if(event.keyCode == "13"){
 			searchProcess(type);
 		}
 	});
-	$("#autoSearchProcessDiv").off("mouseenter").on("mouseenter", function () {
-		$('#autoSearchProcessDiv').show();
-	}).off("autoSearchProcessDiv").on("mouseleave", function () {
-		$('#autoSearchProcessDiv').hide();
-	});
 }
 
 // 搜索
@@ -2353,6 +2363,10 @@ function searchProcess(type) {
 	//先向后台请求完整tree数据
 	if (type == 'new') {
 		var data = getAllTreeData();
+		//过滤data
+		data = data.filter(function(obj) {
+			return obj.category !== 'org';
+		});
 		for (var i = 0; i < data.length; i++) {
 			var text = data[i].name;
 			if (text.indexOf(name) > -1) {
diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js
index 9954300b..af21ec9b 100644
--- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js
+++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js
@@ -459,7 +459,7 @@ function initParam() {
 	sid = $("#sid").val();
 	wsId = $("#WSID").val();
 	//本地测试环境使用
-	wsId = "11dd43d0-a3c7-4ba7-860f-6eac3383e0b0";
+	//wsId = "11dd43d0-a3c7-4ba7-860f-6eac3383e0b0";
 	processInstId = $("#processInstId").val();
 	var param = {
 		sid : sid,