From 31b7551852567993116f472ef2afe5c5e58f39c9 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 20 Dec 2024 16:37:56 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=20=E6=BF=80=E6=B4=BB=E6=94=B9=E4=B8=BAswitch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/workflow/processDefinition/data.tsx | 14 ++-----
 .../workflow/processDefinition/index.vue      | 41 +++++++++----------
 .../process-definition-history-modal.vue      | 41 +++++++++----------
 3 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/apps/web-antd/src/views/workflow/processDefinition/data.tsx b/apps/web-antd/src/views/workflow/processDefinition/data.tsx
index ac47b60e..1fc74dec 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/data.tsx
+++ b/apps/web-antd/src/views/workflow/processDefinition/data.tsx
@@ -3,7 +3,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { type FormSchemaGetter } from '#/adapter/form';
 import { OptionsTag } from '#/components/table';
 
-import { activityStatusOptions, publishStatusOptions } from './constant';
+import { publishStatusOptions } from './constant';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -38,18 +38,10 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     field: 'activityStatus',
-    title: '状态',
+    title: '激活状态',
     minWidth: 100,
     slots: {
-      default: ({ row }) => {
-        const cellValue = row.activityStatus;
-        return (
-          <OptionsTag
-            options={activityStatusOptions as any}
-            value={cellValue}
-          />
-        );
-      },
+      default: 'activityStatus',
     },
   },
   {
diff --git a/apps/web-antd/src/views/workflow/processDefinition/index.vue b/apps/web-antd/src/views/workflow/processDefinition/index.vue
index 56d995ee..02bd1bff 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/index.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/index.vue
@@ -8,7 +8,7 @@ import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { getVxePopupContainer } from '@vben/utils';
 
-import { message, Modal, Popconfirm, Space } from 'ant-design-vue';
+import { message, Modal, Popconfirm, Space, Switch } from 'ant-design-vue';
 
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
 import { vxeCheckboxChecked } from '#/adapter/vxe-table';
@@ -23,7 +23,6 @@ import {
 import { downloadByData } from '#/utils/file/download';
 
 import CategoryTree from './category-tree.vue';
-import { ActivityStatusEnum } from './constant';
 import { columns, querySchema } from './data';
 import processDefinitionDeployModal from './process-definition-deploy-modal.vue';
 import processDefinitionHistoryModal from './process-definition-history-modal.vue';
@@ -132,9 +131,15 @@ function handleDesign(row: any, disabled: boolean) {
  * 激活/挂起流程
  * @param row row
  */
-async function handleActive(row: any) {
-  await workflowDefinitionActive(row.id, !row.activityStatus);
-  await tableApi.query();
+async function handleActive(row: any, status: boolean | number | string) {
+  const lastStatus = status === 1 ? 0 : 1;
+  try {
+    await workflowDefinitionActive(row.id, !!status);
+    await tableApi.query();
+  } catch (error) {
+    row.activityStatus = lastStatus;
+    console.error(error);
+  }
 }
 
 const [ProcessDefinitionHistoryModal, historyModalApi] = useVbenModal({
@@ -258,25 +263,19 @@ function handleDeploy() {
             </a-button>
           </Space>
         </template>
+        <template #activityStatus="{ row }">
+          <Switch
+            v-model:checked="row.activityStatus"
+            :checked-value="1"
+            :unchecked-value="0"
+            checked-children="激活"
+            un-checked-children="挂起"
+            @change="(status) => handleActive(row, status)"
+          />
+        </template>
         <template #action="{ row }">
           <div class="flex flex-col gap-1">
             <div>
-              <a-button
-                v-if="row.activityStatus === ActivityStatusEnum.Active"
-                size="small"
-                type="link"
-                @click="() => handleActive(row)"
-              >
-                挂起流程
-              </a-button>
-              <a-button
-                v-if="row.activityStatus === ActivityStatusEnum.Suspended"
-                size="small"
-                type="link"
-                @click="() => handleActive(row)"
-              >
-                激活流程
-              </a-button>
               <a-button size="small" type="link" @click="handleHistory(row)">
                 历史版本
               </a-button>
diff --git a/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue b/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue
index 45b48859..07433e56 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue
@@ -7,7 +7,7 @@ import { useVbenModal } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '@vben/plugins/vxe-table';
 import { getVxePopupContainer } from '@vben/utils';
 
-import { Popconfirm } from 'ant-design-vue';
+import { Popconfirm, Switch } from 'ant-design-vue';
 
 import {
   getHisListByKey,
@@ -17,7 +17,6 @@ import {
   workflowDefinitionPublish,
 } from '#/api/workflow/definition';
 
-import { ActivityStatusEnum } from './constant';
 import { columns } from './data';
 
 const [BasicModal, modalApi] = useVbenModal({
@@ -111,9 +110,15 @@ async function handleCopy(row: any) {
  * 激活/挂起流程
  * @param row row
  */
-async function handleActive(row: any) {
-  await workflowDefinitionActive(row.id, !row.activityStatus);
-  await tableApi.query();
+async function handleActive(row: any, status: boolean | number | string) {
+  const lastStatus = status === 1 ? 0 : 1;
+  try {
+    await workflowDefinitionActive(row.id, !!status);
+    await tableApi.query();
+  } catch (error) {
+    row.activityStatus = lastStatus;
+    console.error(error);
+  }
 }
 </script>
 
@@ -121,25 +126,19 @@ async function handleActive(row: any) {
   <BasicModal>
     <!-- TODO: 添加操作列 -->
     <BasicTable>
+      <template #activityStatus="{ row }">
+        <Switch
+          v-model:checked="row.activityStatus"
+          :checked-value="1"
+          :unchecked-value="0"
+          checked-children="激活"
+          un-checked-children="挂起"
+          @change="(status) => handleActive(row, status)"
+        />
+      </template>
       <template #action="{ row }">
         <div class="flex flex-col gap-1">
           <div>
-            <a-button
-              v-if="row.activityStatus === ActivityStatusEnum.Active"
-              size="small"
-              type="link"
-              @click="() => handleActive(row)"
-            >
-              挂起流程
-            </a-button>
-            <a-button
-              v-if="row.activityStatus === ActivityStatusEnum.Suspended"
-              size="small"
-              type="link"
-              @click="() => handleActive(row)"
-            >
-              激活流程
-            </a-button>
             <Popconfirm
               :get-popup-container="getVxePopupContainer"
               placement="left"