From f8a79a724de26bb6231bc966040928086822d9ff Mon Sep 17 00:00:00 2001
From: yangwj <>
Date: Tue, 23 Jun 2026 14:42:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(gen):=20=E4=BF=AE=E5=A4=8D=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=96=87=E4=BB=B6=E6=89=A9=E5=B1=95=E5=90=8D=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=B7=B7=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将模板文件扩展名从 .vm 修改为 .ftl 以正确匹配文件名
---
 src/views/tool/gen/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index a22f0d40..54ea1e0c 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -170,8 +170,8 @@
         <el-tab-pane
           v-for="(value, key) in preview.data"
           :key="value"
-          :label="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.vm'))"
-          :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.vm'))"
+          :label="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.ftl'))"
+          :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.ftl'))"
         >
           <el-link
             v-copyText="value"

From b695dbf2d53907c1e4485604ce243ee90b99b25a Mon Sep 17 00:00:00 2001
From: yangwj <>
Date: Thu, 2 Jul 2026 10:29:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(workflow):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E5=8F=96=E6=B6=88=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在流程定义表格中添加取消发布按钮
- 实现取消发布接口调用和确认弹窗逻辑
- 添加取消发布后的页面状态更新和提示信息
- 优化发布确认弹窗的字符串拼接格式
---
 .../workflow/processDefinition/index.vue      | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 63764de2..45c6c8b8 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -215,6 +215,17 @@
                     >
                       发布流程
                     </el-button>
+                    <el-button
+                      v-hasPermi="['workflow:definition:publish']"
+                      link
+                      type="primary"
+                      v-if="scope.row.isPublish == 1"
+                      size="small"
+                      icon="CircleCheck"
+                      @click="handleUnPublish(scope.row)"
+                    >
+                      取消发布
+                    </el-button>
                   </div>
                 </template>
               </el-table-column>
@@ -335,6 +346,7 @@ import {
   importDef,
   unPublishList,
   publish,
+  unPublish,
   add,
   edit,
   getInfo,
@@ -517,10 +529,10 @@ const handleDelete = async (row?: Partial<FlowDefinitionVo>) => {
 const handlePublish = async (row?: Partial<FlowDefinitionVo>) => {
   await modal.confirm(
     '是否确认发布流程定义编码为【' +
-      row.flowCode +
-      '】版本为【' +
-      row.version +
-      '】的数据项？，发布后会将已发布流程定义改为失效！'
+    row.flowCode +
+    '】版本为【' +
+    row.version +
+    '】的数据项？，发布后会将已发布流程定义改为失效！'
   );
   setLoading(true);
   await publish(row.id).finally(() => setLoading(false));
@@ -528,6 +540,21 @@ const handlePublish = async (row?: Partial<FlowDefinitionVo>) => {
   await handleQuery();
   modal.msgSuccess('发布成功');
 };
+/** 取消发布流程定义 */
+const handleUnPublish = async (row?: Partial<FlowDefinitionVo>) => {
+  await modal.confirm(
+    '是否确认取消发布流程定义编码为【' +
+    row.flowCode +
+    '】版本为【' +
+    row.version +
+    '】的数据项？，取消发布后，此流程定义将不再显示在流程定义列表！'
+  );
+  setLoading(true);
+  await unPublish(row.id).finally(() => setLoading(false));
+  activeName.value = '1';
+  await handleQuery();
+  modal.msgSuccess('取消发布成功');
+}
 /** 挂起/激活 */
 const handleProcessDefState = async (row: Partial<FlowDefinitionVo>, status: number | string | boolean) => {
   let msg: string;