From ea1c226ec2173778c36736718463fef4cba469b8 Mon Sep 17 00:00:00 2001
From: yangjiewei <1658539101@qq.com>
Date: Mon, 29 Jul 2024 14:37:20 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=BD=8F?=
 =?UTF-8?q?=E6=88=B7=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/env.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils/env.ts b/src/utils/env.ts
index 7d3c307..07d7a4f 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -22,7 +22,8 @@ export function getAppEnvConfig() {
           (import.meta.env as unknown as GlobEnvConfig)
         : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
 
-    const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL } = ENV;
+    const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL, VITE_TENANT_ENABLED } =
+        ENV;
 
     if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
         warn(`VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`);
@@ -37,7 +38,8 @@ export function getAppEnvConfig() {
         VITE_GLOB_UPLOAD_PREVIEW,
         VITE_GLOB_OUT_LINK_URL,
         VITE_GLOB_REPORT_URL,
-        VITE_GLOB_PRINT_BASE_URL
+        VITE_GLOB_PRINT_BASE_URL,
+        VITE_TENANT_ENABLED
     };
 }
 

From 4ef45f933eb09d99fbf100a62d3465143239ae98 Mon Sep 17 00:00:00 2001
From: yangjiewei <1658539101@qq.com>
Date: Tue, 6 Aug 2024 10:06:12 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Dockfile=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..304a7ac
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+# 使用 Node.js 18 作为基础镜像
+FROM 10.4.117.234:8082/node:20-alpine
+
+# 在容器中创建工作目录
+WORKDIR /app
+
+# 拷贝整个应用程序到工作目录
+COPY . .
+
+# 安装依赖
+RUN  yarn install --registry=http://10.4.117.234:8081/repository/npm-public/
+
+# 构建应用程序
+RUN yarn build
+
+# 暴露端口
+EXPOSE 3100
+
+# 运行应用程序
+CMD [ "npm", "run", "serve" ]

From 40fbce7e7c83561bf85d0424305c3d7fefd3d424 Mon Sep 17 00:00:00 2001
From: Je <967707@dms.yudean.com>
Date: Mon, 17 Feb 2025 17:11:51 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=97=B6=E9=97=B4=E7=9A=84=E7=BB=84=E4=BB=B6=E6=9C=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=86=E6=98=AF=E6=8F=90=E4=BA=A4=E5=80=BC?=
 =?UTF-8?q?=E6=98=AF=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DatePicker/src/DatePicker.vue | 80 ++++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/components/DatePicker/src/DatePicker.vue b/src/components/DatePicker/src/DatePicker.vue
index 1661dbb..2a12d3c 100644
--- a/src/components/DatePicker/src/DatePicker.vue
+++ b/src/components/DatePicker/src/DatePicker.vue
@@ -13,46 +13,46 @@
     />
 </template>
 <script lang="ts" setup>
-import dayjs, {Dayjs} from 'dayjs';
-import {ref, watch, computed} from 'vue';
+    import dayjs, { Dayjs } from 'dayjs';
+    import { ref, watch, computed } from 'vue';
 
-const props = defineProps({
-    value: [dayjs, String, Object],
-    size: String,
-    placeholder: String,
-    format: String,
-    allowClear: Boolean,
-    disabled: Boolean,
-    originalDisabled: {
-        type: Boolean,
-        default: false
-    }
-});
-const modelValue = ref<Dayjs>();
-const emit = defineEmits(['update:value']);
+    const props = defineProps({
+        value: [dayjs, String, Object],
+        size: String,
+        placeholder: String,
+        format: String,
+        allowClear: Boolean,
+        disabled: Boolean,
+        originalDisabled: {
+            type: Boolean,
+            default: false
+        }
+    });
+    const modelValue = ref<Dayjs>();
+    const emit = defineEmits(['update:value']);
 
-const picker = computed(() => {
-    let time = 'date';
-    switch (props.format) {
-        case 'YYYY-MM':
-            time = 'month';
-            break;
-        case 'YYYY':
-            time = 'year';
-            break;
-    }
-    return time;
-});
-watch(
-    () => props.value,
-    (val) => {
-        modelValue.value = dayjs(val || undefined);
-    },
-    {
-        immediate: true,
-    },
-);
-const handleChange = (time) => {
-    emit('update:value', time);
-};
+    const picker = computed(() => {
+        let time = 'date';
+        switch (props.format) {
+            case 'YYYY-MM':
+                time = 'month';
+                break;
+            case 'YYYY':
+                time = 'year';
+                break;
+        }
+        return time;
+    });
+    watch(
+        () => props.value,
+        (val) => {
+            modelValue.value = val ? dayjs(val || undefined) : '';
+        },
+        {
+            immediate: true
+        }
+    );
+    const handleChange = (time) => {
+        emit('update:value', time);
+    };
 </script>

From f9410ec0a1b013b5e7a63400dc38f589f1e30504 Mon Sep 17 00:00:00 2001
From: Je <967707@dms.yudean.com>
Date: Tue, 25 Feb 2025 14:58:38 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/env.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/env.ts b/src/utils/env.ts
index 34b69b9..b5218cf 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -22,7 +22,7 @@ export function getAppEnvConfig() {
           (import.meta.env as unknown as GlobEnvConfig)
         : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
 
-    const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_REQUEST_TIMEOUT, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL } = ENV;
+    const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_REQUEST_TIMEOUT, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL, VITE_TENANT_ENABLED } = ENV;
 
     if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
         warn(`VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`);
@@ -38,7 +38,8 @@ export function getAppEnvConfig() {
         VITE_GLOB_UPLOAD_PREVIEW,
         VITE_GLOB_OUT_LINK_URL,
         VITE_GLOB_REPORT_URL,
-        VITE_GLOB_PRINT_BASE_URL
+        VITE_GLOB_PRINT_BASE_URL,
+        VITE_TENANT_ENABLED
     };
 }
 

From 2d240ccf0cb34c12ca6de84387ca16b802a849ec Mon Sep 17 00:00:00 2001
From: lvjunzhao <967725@dms.yudean.com>
Date: Tue, 25 Feb 2025 18:42:40 +0800
Subject: [PATCH 5/9] =?UTF-8?q?feat:=E6=B5=81=E7=A8=8B-=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E7=9A=84=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=201.=E6=B5=81=E7=A8=8B=E5=8F=98=E6=9B=B4=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E6=97=A7=E6=B5=81=E7=A8=8B=E6=8C=89=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8C=E6=8C=89=E5=90=84=E7=A7=8D=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E5=92=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE=E7=BB=A7=E7=BB=AD=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=202.=E5=8F=AF=E4=BB=A5=E5=88=87=E6=8D=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E7=9A=84=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/design.ts                    |  33 +++-
 src/components/UpdateProcessVersion/index.ts  |   3 +
 .../src/UpdateProcessVersionModal.vue         | 185 ++++++++++++++++++
 src/views/workflow/design/index.vue           |  32 ++-
 src/views/workflow/task/ProcessMonitor.vue    | 138 ++++++++++++-
 .../workflow/task/components/LookProcess.vue  |  31 +--
 6 files changed, 399 insertions(+), 23 deletions(-)
 create mode 100644 src/components/UpdateProcessVersion/index.ts
 create mode 100644 src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue

diff --git a/src/api/workflow/design.ts b/src/api/workflow/design.ts
index 1059356..699140d 100644
--- a/src/api/workflow/design.ts
+++ b/src/api/workflow/design.ts
@@ -4,6 +4,7 @@ import {
   WorkflowPageParams,
   WorkflowPageResult,
   ChangeResultModel,
+  WorkflowPageModel,
 } from './model/index';
 import { defHttp } from '/@/utils/http/axios';
 
@@ -22,6 +23,7 @@ enum Api {
   HistoryList = '/workflow/schema-history/list',
   HistorySetCurrent = '/workflow/schema-history/set-current',
   PreviewProcess = '/workflow/execute/preview',
+  UpdateVersion = '/workflow/schema/updateVersion',
 }
 /**
  * @description: 导出流程设计
@@ -51,7 +53,19 @@ export async function getDesignPage(params: WorkflowPageParams, mode: ErrorMessa
     },
   );
 }
-
+/**
+ * @description: 查询Workflow全量
+ */
+export async function getDesignList(mode: ErrorMessageMode = 'modal') {
+  return defHttp.get<Array<WorkflowPageModel>>(
+    {
+      url: Api.List,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
 /**
  * @description: 获取Workflow信息
  */
@@ -191,3 +205,20 @@ export async function getPreviewProcess(schemaId: string, mode: ErrorMessageMode
     },
   );
 }
+/**
+ * updateVersion 更新流程
+ */
+export async function updateProcessVersionApi(
+  updateVersionDto: Recordable,
+  mode: ErrorMessageMode = 'modal',
+) {
+  return defHttp.post<boolean>(
+    {
+      url: Api.UpdateVersion,
+      params: updateVersionDto,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
\ No newline at end of file
diff --git a/src/components/UpdateProcessVersion/index.ts b/src/components/UpdateProcessVersion/index.ts
new file mode 100644
index 0000000..3420205
--- /dev/null
+++ b/src/components/UpdateProcessVersion/index.ts
@@ -0,0 +1,3 @@
+import { withInstall } from '/@/utils';
+import updateProcessVersionModal from './src/UpdateProcessVersionModal.vue';
+export const UpdateProcessVersionModal = withInstall(updateProcessVersionModal); //流程版本变更
\ No newline at end of file
diff --git a/src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue b/src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue
new file mode 100644
index 0000000..f8177db
--- /dev/null
+++ b/src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue
@@ -0,0 +1,185 @@
+<template>
+    <BasicModal @register="registerUpdateProcessVersionModal" v-bind="$attrs" wrapClassName="workflow-modal" @ok="handleSubmit" @cancel="cancel">
+      <a-table
+      :pagination="false"
+      :dataSource="data.dataSource"
+      :row-selection="rowSelection"
+      :columns="configColumns">
+          <template #bodyCell="{ column, record }">
+              <template v-if="column.dataIndex === 'activityFlag'"
+                  >{{ record.activityFlag == 1 ? t('当前版本') : '' }}
+              </template>
+              <template v-if="column.dataIndex === 'operation'">
+                  <div class="flex">
+                      <a-button
+                          size="small"
+                          type="primary"
+                          class="mr-2"
+                          @click="preview(record.xmlContent)"
+                          >{{ t('预览') }}
+                      </a-button>
+                  </div>
+              </template>
+          </template>
+      </a-table>
+      <Preview v-if="data.previewVisible" :xml="data.xml" @close="() => {data.previewVisible = false}" />
+
+    </BasicModal>
+</template>
+
+<script setup lang="ts">
+import { BasicModal, useModal, useModalInner } from '/@/components/Modal';
+import {
+    updateProcessVersionApi,
+    getHistory,
+  } from '/@/api/workflow/design';
+import { ChangeResultModel, HistoryModel } from '/@/api/workflow/model';
+import { ref, reactive, onMounted, } from 'vue';
+import Preview from '/@/views/workflow/design/Preview.vue';
+import { useI18n } from '/@/hooks/web/useI18n';
+const { t } = useI18n();
+
+const props = withDefaults(
+    defineProps<{
+        processDefinitionKey: string,
+        processIds: Array<string>,
+        schemaId: string,
+    }>(),
+    {
+        processDefinitionKey: '',
+        processIds: () => [],
+        schemaId: '',
+    },
+);
+
+onMounted(() => {
+  getHistoryList();
+});
+
+const configColumns = [
+    {
+      title: t('序号'),
+      align: 'center',
+      customRender: ({ index }) => `${index + 1}`, // 显示每一行的序号
+      width: 80,
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'activityFlag',
+      sorter: {
+        multiple: 4,
+      },
+    },
+    {
+      title: t('版本'),
+      dataIndex: 'version',
+    },
+    {
+      title: t('创建人'),
+      dataIndex: 'createUserName',
+    },
+    {
+      title: t('备注'),
+      dataIndex: 'remark',
+      width: 180,
+    },
+    {
+      title: t('创建时间'),
+      dataIndex: 'createDate',
+    },
+    {
+      title: t('操作'),
+      dataIndex: 'operation',
+      width: 120,
+      align: 'center',
+    },
+  ];
+  const data: {
+    visible: boolean;
+    previewVisible: boolean;
+    xml: string;
+    dataSource: Array<HistoryModel>;
+    reusltVisible: boolean;
+    resultDataSource: ChangeResultModel[];
+  } = reactive({
+    visible: false,
+    previewVisible: false,
+    xml: '',
+    dataSource: [],
+    reusltVisible: false,
+    resultDataSource: [],
+  });
+
+
+const emits = defineEmits(['success', 'cancel']);
+const [registerUpdateProcessVersionModal, { setModalProps, closeModal }] = useModalInner(async () => {
+    setModalProps({
+      title: '流程版本变更',
+      confirmLoading: false,
+      draggable: false,
+      showOkBtn: false,
+      showCancelBtn: false,
+      destroyOnClose: true,
+      width: 800,
+      fixedHeight: true,
+    });
+});
+
+const getHistoryList = async () => {
+  try {
+      let res = await getHistory(props.schemaId);
+      data.dataSource = res;
+    } 
+  catch (error) {}
+}
+function cancel() {
+  emits('cancel')
+}
+const selectedRowSignleKey = ref('');
+
+// 右边保留流程图 单选配置
+const rowSelection = {
+  type: 'radio', // 设置为单选
+  getRecordKey: record => record.definitionId,
+  onChange: (selectedRowKeysValue, selectedRows) => {
+    selectedRowSignleKey.value = selectedRowKeysValue; // 更新选中的行keys
+  },
+};
+
+const handleSubmit = async () => {
+    const values = {
+        processDefinitionKey: props.processDefinitionKey,
+        definitionIdNew: selectedRowSignleKey.value[0],
+        processIds: props.processIds,
+    };
+    await updateProcessVersionApi(values);
+    closeModal();
+    emits('success');
+};
+
+function preview(xml: string) {
+    if (xml) {
+      data.xml = xml;
+      data.previewVisible = true;
+    }
+}
+
+</script>
+<style lang="less">
+.workflow-modal {
+  .ant-modal {
+    width: 60%!important;
+    max-width: 60%!important;
+    top: 0;
+    padding-bottom: 0;
+  }
+  .ant-modal-content {
+    display: flex;
+    flex-direction: column;
+    height: calc(100vh);
+  }
+  .ant-modal-body {
+    flex: 1;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/workflow/design/index.vue b/src/views/workflow/design/index.vue
index 3ed3c49..f9d8ab7 100644
--- a/src/views/workflow/design/index.vue
+++ b/src/views/workflow/design/index.vue
@@ -49,6 +49,9 @@
         <a-button v-auth="'design:classifyMgt'" @click="handleCategory">{{
           t('分类管理')
         }}</a-button>
+        <a-button @click="handleUpdateVersion">{{
+          t('流程版本变更')
+        }}</a-button>
       </template>
 
       <template #action="{ record }">
@@ -79,7 +82,7 @@
       @register="registerCategoryModal"
       @success="getCategoryTree"
     />
-    <Preview v-if="data.previewVisible" :xml="data.xml" @close="data.previewVisible = false" />
+    <Preview v-if="data.previewVisible" :xml="data.xml" @close="() => {data.previewVisible = false}" />
     <WorkflowDesignModal
       v-if="data.visibleBpmnDesign"
       :editData="data.editData"
@@ -91,6 +94,7 @@
   import { onMounted, reactive, computed, defineAsyncComponent, h, ref } from 'vue';
 
   import { CategoryModal } from '/@/components/CategoryModal';
+  import { UpdateProcessVersionModal } from '/@/components/UpdateProcessVersion';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   import { PageWrapper } from '/@/components/Page';
   import { LoadingBox } from '/@/components/ModalPanel/index';
@@ -114,7 +118,11 @@
   import History from './History.vue';
   import ImportFlow from './ImportFlow.vue';
 
-  import { Tag } from 'ant-design-vue';
+  import { Row, Tag } from 'ant-design-vue';
+  import { useRouter } from 'vue-router';
+
+  const { currentRoute } = useRouter();
+  const router = useRouter();
   const { t } = useI18n();
   const Preview = defineAsyncComponent(() => import('./Preview.vue'));
   const WorkflowDesignModal = defineAsyncComponent({
@@ -305,6 +313,26 @@
       } catch (error) {}
     }
   }
+  
+  const versionData = {
+    definitionKey: '',
+    schemaId: '',
+  }
+  /**
+   * 更新选中的流程图对应的执行流程的版本
+   */
+  async function handleUpdateVersion() {
+    let row = checkSelectSingleRow();
+    if (row) {
+      router.push({
+        path: '/task/monitor',
+        query: {
+          definitionKey: row.definitionKey,
+        }
+      });
+    }
+  }
+
 
   async function forbidden() {
     let row = checkSelectSingleRow();
diff --git a/src/views/workflow/task/ProcessMonitor.vue b/src/views/workflow/task/ProcessMonitor.vue
index c4d9eaf..fafbc8f 100644
--- a/src/views/workflow/task/ProcessMonitor.vue
+++ b/src/views/workflow/task/ProcessMonitor.vue
@@ -17,13 +17,17 @@
       @register="registerTable"
       class="w-3/4 xl:w-4/5"
       @selection-change="selectionChange"
+      @row-dbClick="dbClickRow"
     >
       <template #toolbar>
-        <LookProcess :taskId="taskId" :processId="processId" @close="reload"
+        <!-- <LookProcess :taskId="taskId" :processId="processId" @close="reload"
           ><a-button v-auth="'monitor:view'">{{ t('查看') }}</a-button></LookProcess
-        >
-        <a-button v-auth="'monitor:appointedAuditor'" @click="approveUser" v-if="data.type === 0">{{
+        > -->
+        <!-- <a-button v-auth="'monitor:appointedAuditor'" @click="approveUser" v-if="data.type === 0">{{
           t('指派审核人')
+        }}</a-button> -->
+        <a-button @click="handleUpdateVersion">{{
+          t('流程版本变更')
         }}</a-button>
         <a-button v-auth="'monitor:pending'" @click="setSuspended" v-if="data.type === 0">{{
           suspendedTitle
@@ -52,6 +56,8 @@
       </template>
     </BasicTable>
 
+    <!-- 查看 -->
+    <LookProcess ref="lookProcess" :taskId="taskId" :processId="processId" @close="reload"/>
     <!-- 指派审核人 -->
     <ApproveProcessMonitorUser
       v-if="data.approvedUserVisible"
@@ -65,22 +71,54 @@
         }
       "
     />
+    <!-- 流程版本变更 -->
+    <UpdateProcessVersionModal
+      v-if="data.visibleVersion"
+      title="流程版本变更"
+      :processDefinitionKey="versionData.definitionKey"
+      :schemaId="versionData.schemaId"
+      :processIds="versionData.processIds"
+      @register="registerUpdateProcessVersionModal"
+      @success="() => {
+        data.visibleVersion = false;
+        reload();
+        clearSelectedRowKeys();
+      }"
+      @cancel="() => {
+        data.visibleVersion = false;
+        reload();
+        clearSelectedRowKeys();
+      }"
+    />
   </PageWrapper>
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, reactive, ref } from 'vue';
+  import { createVNode, onMounted, reactive, ref } from 'vue';
+  import { useModal } from '/@/components/Modal';
   import { BasicTree } from '/@/components/Tree';
   import { PageWrapper } from '/@/components/Page';
   import LookProcess from './components/LookProcess.vue';
   import ApproveProcessMonitorUser from './components/flow/ApproveProcessMonitorUser.vue';
+  import { UpdateProcessVersionModal } from '/@/components/UpdateProcessVersion';
   import { deleteWorkflow, getProcessMonitorPage, postSetSuspended } from '/@/api/workflow/monitor';
+  import { getDesignList } from '/@/api/workflow/design';
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import { notification, Tag } from 'ant-design-vue';
   import { ProcessMonitorStatus } from '/@/enums/workflowEnum';
   import { BasicTable, useTable, FormSchema, BasicColumn } from '/@/components/Table';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { useRouter } from 'vue-router';
+  import { aW } from '@fullcalendar/core/internal-common';
+  const { currentRoute } = useRouter();
+  const router = useRouter();
+
+  const definitionKey = ref('');
+  onMounted(() => {
+    definitionKey.value = currentRoute.value.query.definitionKey as string;
+  });
+
   const { t } = useI18n();
   const configColumns: BasicColumn[] = [
     {
@@ -141,6 +179,20 @@
     },
   ];
   const searchFormSchema: FormSchema[] = [
+    {
+      field: 'definitionKey',
+      label: '流程',
+      component: 'ApiSelect',
+      value: definitionKey,
+      componentProps: {
+        mode: 'single',
+        api: getDesignList,
+        showSearch: true,
+        labelField: 'name',
+        valueField: 'definitionKey',
+        getPopupContainer: () => document.body,
+      },
+    },
     {
       field: 'keyword',
       label: t('关键字'),
@@ -172,7 +224,9 @@
       icon: 'ant-design:profile-outlined',
     },
   ];
+  const queryData = ref({});
   const selectedKeys = ref([0]);
+  const lookProcess = ref()
   const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
     title: t('流程监控列表'),
     api: getProcessMonitorPage,
@@ -187,11 +241,17 @@
       showResetButton: false,
     },
     rowSelection: {
-      type: 'radio',
+      // type: 'radio',
+      type: 'group',
     },
     beforeFetch: (params) => {
       //发送请求默认新增  左边树结构所选机构id
-      return { ...params, type: data.type };
+      queryData.value = {
+        ...params, 
+        definitionKey: params.definitionKey?params.definitionKey:definitionKey.value,
+        type: data.type
+      };
+      return  queryData.value
     },
     useSearchForm: true,
     showTableSetting: true,
@@ -207,9 +267,11 @@
   let data: {
     type: number;
     approvedUserVisible: boolean;
+    visibleVersion: boolean;
   } = reactive({
     type: 0,
     approvedUserVisible: false,
+    visibleVersion: false,
   });
   const processId = ref('');
   const taskId = ref('');
@@ -293,8 +355,15 @@
   }
   function checkSelectSingleRow(tip?) {
     const selectRows: any = getSelectRows();
-    if (selectRows.length > 0) {
+    if (selectRows.length == 1) {
       return selectRows[0];
+    } else if (selectRows.length > 1) {
+      notification.open({
+        type: 'error',
+        message: t('流程'),
+        description: t(tip || '请选择单一一个流程进行'),
+      });
+      return false;
     } else {
       notification.open({
         type: 'error',
@@ -304,4 +373,59 @@
       return false;
     }
   }
+  function checkSelectGroupRow(tip?) {
+    const selectRows: any = getSelectRows();
+    if (selectRows.length > 0) {
+      let processDefinitionKey = selectRows[0].processDefinitionKey;
+      let flagCheck = true;
+      selectRows.forEach(element => {
+        if(element.processDefinitionKey != processDefinitionKey) flagCheck = false;
+      });
+      if(!flagCheck) {
+        notification.open({
+          type: 'error',
+          message: t('选择了多个流程'),
+          description: t(tip || '请按单一流程选择后重新批量配置'),
+        });
+        return false;
+      }
+      return selectRows;
+    } else {
+      notification.open({
+        type: 'error',
+        message: t('流程'),
+        description: t(tip || '请选择最少一个流程实例进行'),
+      });
+      return false;
+    }
+  }
+  async function dbClickRow(record) {
+    processId.value = record.processId;
+    taskId.value = record.taskId;//改版 一个流程中可能有多个taskId 已不返回
+    await lookProcess.value.look();
+  } 
+
+  const [registerUpdateProcessVersionModal, { openModal: openUpdateProcessVersionModal }] = useModal();
+  const versionData = {
+    definitionKey: '',
+    schemaId: '',
+    processIds: [],
+  }
+  /**
+   * 更新选中的流程图对应的执行流程的版本
+   */
+  async function handleUpdateVersion() {
+    let selectRows = checkSelectGroupRow();
+    if (selectRows) {
+      versionData.definitionKey = selectRows[0].processDefinitionKey;
+      versionData.schemaId = selectRows[0].schemaId;
+      versionData.processIds = selectRows.map(selectRows => selectRows.processId);
+      await nextTick();
+      openUpdateProcessVersionModal();
+    }
+  }
+
+  function nextTick () {
+    data.visibleVersion = true;
+  }
 </script>
diff --git a/src/views/workflow/task/components/LookProcess.vue b/src/views/workflow/task/components/LookProcess.vue
index 098b347..2dc2f4f 100644
--- a/src/views/workflow/task/components/LookProcess.vue
+++ b/src/views/workflow/task/components/LookProcess.vue
@@ -19,21 +19,23 @@
   import LookTask from './flow/LookTask.vue';
   import { LoadingBox } from '/@/components/ModalPanel/index';
   import { notification } from 'ant-design-vue';
-  import { onMounted, ref } from 'vue';
+  import { onActivated, onMounted, ref } from 'vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   const { t } = useI18n();
-  const props = withDefaults(
-    defineProps<{
-      processId: string;
-      taskId: string;
-      visible?: boolean;
-    }>(),
-    {
-      processId: '',
-      taskId: '',
-      visible: false,
+  const props = defineProps({
+    processId: {
+      type: String,
+      default: ''
     },
-  );
+    taskId: {
+      type: String,
+      default: ''
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+  })
   let emits = defineEmits(['close']);
   let visible = ref(false);
   let showLoading = ref(false);
@@ -42,7 +44,7 @@
       look();
     }
   });
-  async function look() {
+  function look() {
     if (props.processId) {
       showLoading.value = false;
       visible.value = true;
@@ -59,4 +61,7 @@
     visible.value = false;
     emits('close');
   }
+  defineExpose({
+    look
+  });
 </script>

From 3c30812aad01a3bee998abfe5c3275d9ab91b73d Mon Sep 17 00:00:00 2001
From: lvjunzhao <967725@dms.yudean.com>
Date: Wed, 26 Feb 2025 10:31:39 +0800
Subject: [PATCH 6/9] =?UTF-8?q?feat:=E6=B5=81=E7=A8=8B-=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E7=9A=84=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=203.=E7=94=A8vue.nextTick=20=E6=9D=A5=E6=9B=B4=E6=96=B0props?=
 =?UTF-8?q?=20=E8=B5=8B=E5=80=BC=E5=BB=B6=E5=90=8E=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/task/ProcessMonitor.vue         | 10 +++++-----
 src/views/workflow/task/components/LookProcess.vue |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/workflow/task/ProcessMonitor.vue b/src/views/workflow/task/ProcessMonitor.vue
index fafbc8f..cde2a0e 100644
--- a/src/views/workflow/task/ProcessMonitor.vue
+++ b/src/views/workflow/task/ProcessMonitor.vue
@@ -20,7 +20,7 @@
       @row-dbClick="dbClickRow"
     >
       <template #toolbar>
-        <!-- <LookProcess :taskId="taskId" :processId="processId" @close="reload"
+        <!-- <LookProcess ref="lookProcess" :taskId="taskId" :processId="processId" @close="reload"
           ><a-button v-auth="'monitor:view'">{{ t('查看') }}</a-button></LookProcess
         > -->
         <!-- <a-button v-auth="'monitor:appointedAuditor'" @click="approveUser" v-if="data.type === 0">{{
@@ -94,7 +94,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, onMounted, reactive, ref } from 'vue';
+  import { createVNode, onMounted, reactive, ref, nextTick } from 'vue';
   import { useModal } from '/@/components/Modal';
   import { BasicTree } from '/@/components/Tree';
   import { PageWrapper } from '/@/components/Page';
@@ -110,7 +110,6 @@
   import { BasicTable, useTable, FormSchema, BasicColumn } from '/@/components/Table';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useRouter } from 'vue-router';
-  import { aW } from '@fullcalendar/core/internal-common';
   const { currentRoute } = useRouter();
   const router = useRouter();
 
@@ -402,6 +401,7 @@
   async function dbClickRow(record) {
     processId.value = record.processId;
     taskId.value = record.taskId;//改版 一个流程中可能有多个taskId 已不返回
+    await nextTick()
     await lookProcess.value.look();
   } 
 
@@ -420,12 +420,12 @@
       versionData.definitionKey = selectRows[0].processDefinitionKey;
       versionData.schemaId = selectRows[0].schemaId;
       versionData.processIds = selectRows.map(selectRows => selectRows.processId);
-      await nextTick();
+      await getNextTick();
       openUpdateProcessVersionModal();
     }
   }
 
-  function nextTick () {
+  function getNextTick () {
     data.visibleVersion = true;
   }
 </script>
diff --git a/src/views/workflow/task/components/LookProcess.vue b/src/views/workflow/task/components/LookProcess.vue
index 2dc2f4f..61452ba 100644
--- a/src/views/workflow/task/components/LookProcess.vue
+++ b/src/views/workflow/task/components/LookProcess.vue
@@ -62,6 +62,6 @@
     emits('close');
   }
   defineExpose({
-    look
+    look,
   });
 </script>

From d1a1386c9d159df3df4765c9bc409a0349aedfe6 Mon Sep 17 00:00:00 2001
From: lvjunzhao <967725@dms.yudean.com>
Date: Wed, 26 Feb 2025 14:04:59 +0800
Subject: [PATCH 7/9] =?UTF-8?q?feat:=E8=87=AA=E5=8A=A8=E5=90=8C=E6=84=8F?=
 =?UTF-8?q?=20@click=3D"onApproveClick()"=20=E5=8A=A0=E4=B8=8A=E6=8B=AC?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=97=A0=E5=8F=82=E4=BC=A0=E5=80=BC=E3=80=82?=
 =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E5=BC=95=E5=85=A5=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/secondDev/approveFlowPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue
index 2e8fefe..0c54c0f 100644
--- a/src/views/secondDev/approveFlowPage.vue
+++ b/src/views/secondDev/approveFlowPage.vue
@@ -9,7 +9,7 @@
                         </slot>
                         关闭
                     </a-button>
-                    <a-button v-if="!readonly && hasBtnApprove" type="primary" @click="onApproveClick">
+                    <a-button v-if="!readonly && hasBtnApprove" type="primary" @click="onApproveClick()">
                         <slot name="icon">
                             <check-circle-outlined />
                         </slot>

From a67fa932340320f48ebd00fb21fba17588a63a3a Mon Sep 17 00:00:00 2001
From: lvjunzhao <967725@dms.yudean.com>
Date: Wed, 26 Feb 2025 15:38:10 +0800
Subject: [PATCH 8/9] =?UTF-8?q?feat:=E6=B5=81=E7=A8=8B=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=203.=E6=9F=A5=E8=AF=A2list=20=E5=85=A8=E6=9F=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BApage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/task/ProcessMonitor.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/workflow/task/ProcessMonitor.vue b/src/views/workflow/task/ProcessMonitor.vue
index cde2a0e..ae1f487 100644
--- a/src/views/workflow/task/ProcessMonitor.vue
+++ b/src/views/workflow/task/ProcessMonitor.vue
@@ -102,7 +102,7 @@
   import ApproveProcessMonitorUser from './components/flow/ApproveProcessMonitorUser.vue';
   import { UpdateProcessVersionModal } from '/@/components/UpdateProcessVersion';
   import { deleteWorkflow, getProcessMonitorPage, postSetSuspended } from '/@/api/workflow/monitor';
-  import { getDesignList } from '/@/api/workflow/design';
+  import { getDesignList, getDesignPage } from '/@/api/workflow/design';
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import { notification, Tag } from 'ant-design-vue';
@@ -185,7 +185,7 @@
       value: definitionKey,
       componentProps: {
         mode: 'single',
-        api: getDesignList,
+        api: getDesignPageProcessed,
         showSearch: true,
         labelField: 'name',
         valueField: 'definitionKey',
@@ -428,4 +428,15 @@
   function getNextTick () {
     data.visibleVersion = true;
   }
+
+  async function getDesignPageProcessed() {
+    const searchParams = {
+        ...{
+            limit: 1,
+            size: 100
+        },
+    };
+    const response = await getDesignPage(searchParams); 
+    return response.list; 
+  }
 </script>

From d84a9706b30ff68381686a6527ec6e9a70be317d Mon Sep 17 00:00:00 2001
From: lvjunzhao <967725@dms.yudean.com>
Date: Wed, 26 Feb 2025 15:53:46 +0800
Subject: [PATCH 9/9] =?UTF-8?q?feat:=E6=B5=81=E7=A8=8B=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=203.enabledMark:=201,=20=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0en?=
 =?UTF-8?q?able?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/task/ProcessMonitor.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/workflow/task/ProcessMonitor.vue b/src/views/workflow/task/ProcessMonitor.vue
index ae1f487..b182b4f 100644
--- a/src/views/workflow/task/ProcessMonitor.vue
+++ b/src/views/workflow/task/ProcessMonitor.vue
@@ -435,6 +435,7 @@
             limit: 1,
             size: 100
         },
+        enabledMark: 1,
     };
     const response = await getDesignPage(searchParams); 
     return response.list;