From 9a233ab6bfd40f052286a888654935da0cf83ef3 Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Wed, 12 Feb 2025 22:50:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E6=8A=BD=E5=8F=96sliceName?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/model/index.ts                       | 11 +----------
 .../src/SimpleProcessDesigner.vue                |  4 ++--
 src/utils/index.ts                               | 15 +++++++++++++++
 src/views/bpm/model/CategoryDraggableModel.vue   | 16 +++-------------
 src/views/bpm/model/form/index.vue               |  5 -----
 src/views/bpm/processInstance/create/index.vue   | 11 ++---------
 6 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts
index 5590e1c4..8caee6f9 100644
--- a/src/api/bpm/model/index.ts
+++ b/src/api/bpm/model/index.ts
@@ -76,13 +76,4 @@ export const deployModel = async (id: number) => {
 export const cleanModel = async (id: number) => {
   return await request.delete({ url: '/bpm/model/clean?id=' + id })
 }
-/**
- * 查询当前流程实例下是否存在正在进行中的单据
- * @param modelId  模型定义id
- * @returns true/false
- */
-export const getProcessInstance = async (modelId: string) => {
-  return await request.get({
-    url: '/bpm/task/manager-list?modelId=' + modelId
-  })
-}
+
diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
index dc35f5ba..c1493afb 100644
--- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
+++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
@@ -25,7 +25,6 @@
 
 <script setup lang="ts">
 import SimpleProcessModel from './SimpleProcessModel.vue'
-import { updateBpmSimpleModel, getBpmSimpleModel } from '@/api/bpm/simple'
 import { SimpleFlowNode, NodeType, NodeId, NODE_DEFAULT_TEXT } from './consts'
 import { getModel } from '@/api/bpm/model'
 import { getForm, FormVO } from '@/api/bpm/form'
@@ -35,6 +34,7 @@ import * as DeptApi from '@/api/system/dept'
 import * as PostApi from '@/api/system/post'
 import * as UserApi from '@/api/system/user'
 import * as UserGroupApi from '@/api/bpm/userGroup'
+import { BpmModelFormType } from '@/utils/constants'
 
 defineOptions({
   name: 'SimpleProcessDesigner'
@@ -169,7 +169,7 @@ onMounted(async () => {
       if (bpmnModel) {
         formType.value = bpmnModel.formType
         //fix 解决修改时流程模型时formId为空报错问题
-        if (formType.value === 10 && bpmnModel.formId) {
+        if (formType.value === BpmModelFormType.CUSTOM && bpmnModel.formId) {
           const bpmnForm = (await getForm(bpmnModel.formId)) as unknown as FormVO
           formFields.value = bpmnForm?.fields
         }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2c2fbbd0..7e56e8be 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -449,3 +449,18 @@ export function jsonParse(str: string) {
     return ''
   }
 }
+
+/**
+ * 截取字符串
+ *
+ * @param name
+ * @param start
+ * @param end
+ */
+
+export const sliceName = (name: string,start: number, end : number) => {
+  if (name.length > end) {
+    return name.slice(start, end)
+  }
+  return name
+}
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index 2d79365f..4496ad48 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -89,7 +89,7 @@
               </el-tooltip>
               <el-image v-if="row.icon" :src="row.icon" class="h-38px w-38px mr-10px rounded" />
               <div v-else class="flow-icon">
-                <span style="font-size: 12px; color: #fff">{{ sliceName(row.name) }}</span>
+                <span style="font-size: 12px; color: #fff">{{ sliceName(row.name,0,2) }}</span>
               </div>
               {{ row.name }}
             </div>
@@ -273,6 +273,7 @@ import { useAppStore } from '@/store/modules/app'
 import { cloneDeep, isEqual } from 'lodash-es'
 import { useTagsView } from '@/hooks/web/useTagsView'
 import { useDebounceFn } from '@vueuse/core'
+import { sliceName } from '@/utils/index'
 
 defineOptions({ name: 'BpmModel' })
 
@@ -445,11 +446,7 @@ const handleChangeState = async (row: any) => {
 /** 发布流程 */
 const handleDeploy = async (row: any) => {
   try {
-    //校验当前版本的流程下是否存在正在进行中的单据
-    const res = await ModelApi.getProcessInstance(row.id)
-    if (res) {
-      await message.confirm('流程下存在进行中的单据，是否确认发布该流程？')
-    }
+    await message.confirm('是否确认发布该流程？')
     // 发起部署
     await ModelApi.deployModel(row.id)
     message.success(t('发布成功'))
@@ -605,13 +602,6 @@ const openModelForm = async (type: string, id?: number) => {
   }
 }
 
-// 处理显示的名称
-const sliceName = (name: string) => {
-  if (name.length > 2) {
-    return name.slice(0, 2)
-  }
-  return name
-}
 watchEffect(() => {
   if (props.categoryInfo?.modelList) {
     updateModeList()
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 7833d629..de32b48c 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -316,11 +316,6 @@ const handleDeploy = async () => {
     if (!formData.value.id) {
       await message.confirm('是否确认发布该流程？')
     }
-    //校验当前版本的流程下是否存在正在进行中的单据
-    const res = await ModelApi.getProcessInstance(formData.value.id)
-    if (res) {
-      await message.confirm('流程下存在进行中的单据，是否确认发布该流程？')
-    }
     // 校验所有步骤
     await validateAllSteps()
 
diff --git a/src/views/bpm/processInstance/create/index.vue b/src/views/bpm/processInstance/create/index.vue
index cbbb9623..62d9ea21 100644
--- a/src/views/bpm/processInstance/create/index.vue
+++ b/src/views/bpm/processInstance/create/index.vue
@@ -65,7 +65,7 @@
                         />
                         <div v-else class="flow-icon">
                           <span style="font-size: 12px; color: #fff">{{
-                            sliceName(definition.name)
+                            sliceName(definition.name,0,2)
                           }}</span>
                         </div>
                         <el-text class="!ml-10px" size="large">{{ definition.name }}</el-text>
@@ -97,6 +97,7 @@ import * as ProcessInstanceApi from '@/api/bpm/processInstance'
 import { CategoryApi, CategoryVO } from '@/api/bpm/category'
 import ProcessDefinitionDetail from './ProcessDefinitionDetail.vue'
 import { groupBy } from 'lodash-es'
+import { sliceName } from '@/utils/index'
 
 defineOptions({ name: 'BpmProcessInstanceCreate' })
 
@@ -284,14 +285,6 @@ const availableCategories = computed(() => {
   )
 })
 
-// 处理显示的名称
-const sliceName = (name: string) => {
-  if (name.length > 2) {
-    return name.slice(0, 2)
-  }
-  return name
-}
-
 /** 初始化 */
 onMounted(() => {
   getList()