From cae241d99bd389c57adaccff1815e94be766e18f Mon Sep 17 00:00:00 2001
From: pengqiang <pengqiang.it@ciic.com.cn>
Date: Wed, 17 Nov 2021 18:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=85=AC=E5=85=B1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/act_model_list.ftl        | 21 ++++++++++++-------
 .../templates/admin/act_proc_def_list.ftl     | 13 +++++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/admin/act_model_list.ftl b/src/main/resources/templates/admin/act_model_list.ftl
index 220c877..aa68f8d 100644
--- a/src/main/resources/templates/admin/act_model_list.ftl
+++ b/src/main/resources/templates/admin/act_model_list.ftl
@@ -78,7 +78,7 @@
 
                                             <button type="button"
                                                     class="am-btn am-btn-default am-btn-xs am-text-secondary"
-                                                    onclick="window.open('${base}/activiti-editor/modeler.html?modelId==${list.id?c}')">
+                                                    onclick="design(${list.id?c})" >
                                                 <span class="am-icon-pencil-square-o"></span>
                                                 流程设计
                                             </button>
@@ -205,12 +205,19 @@
         }
     }
 
-
-    $(function () {
-
-
-    });
-
+    var design = function (id) {
+        layer.open({
+            type: 2,
+            title: '',
+            shadeClose: true,
+            shade: 0.8,
+            area: ['90%', '90%'],
+            content: '${base}/activiti-editor/modeler.html?modelId==' + id,
+            end: function () {
+                location.reload();
+            }
+        });
+    };
 
 </script>
 
diff --git a/src/main/resources/templates/admin/act_proc_def_list.ftl b/src/main/resources/templates/admin/act_proc_def_list.ftl
index 4670920..ff15939 100644
--- a/src/main/resources/templates/admin/act_proc_def_list.ftl
+++ b/src/main/resources/templates/admin/act_proc_def_list.ftl
@@ -78,7 +78,7 @@
                                 <td>
                                     <button type="button"
                                             class="am-btn am-btn-default am-btn-xs am-text-secondary"
-                                            onclick="window.open('${base}/actProcDef/procDefPng/${list.deploymentId!}')">
+                                            onclick="pngView('${list.deploymentId!}')">
                                         <span class="am-icon-pencil-square-o"></span>
                                         流程图片
                                     </button>
@@ -269,4 +269,15 @@
         });
     }
 
+    var pngView = function (id) {
+        layer.open({
+            type: 2,
+            title: '',
+            shadeClose: true,
+            shade: 0.8,
+            area: ['90%', '60%'],
+            content: '${base}/actProcDef/procDefPng/' + id,
+        });
+    };
+
 </script>
\ No newline at end of file