Merge remote-tracking branch 'upstream/feature/bpm' into feature/bpm

src/views/bpm/model/editor/index.vue

@@ -221,7 +221,7 @@ onBeforeUnmount(() => {
   }
 })
 
-/** 获取XML字符串 */
+/** 获取 XML 字符串 */
 const saveXML = async () => {
   if (!modeler.value) {
     return { xml: xmlString.value }
@@ -273,7 +273,7 @@ defineExpose({
 <style lang="scss">
 .process-panel__container {
   position: absolute;
-  top: 180px;
-  right: 60px;
+  top: 172px;
+  right: 70px;
 }
 </style>

src/views/bpm/model/form/index.vue

@@ -79,14 +79,14 @@
 </template>
 
 <script lang="ts" setup>
-import { useRouter, useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { useMessage } from '@/hooks/web/useMessage'
 import * as ModelApi from '@/api/bpm/model'
 import * as FormApi from '@/api/bpm/form'
 import { CategoryApi } from '@/api/bpm/category'
 import * as UserApi from '@/api/system/user'
 import { useUserStoreWithOut } from '@/store/modules/user'
-import { BpmModelType, BpmModelFormType } from '@/utils/constants'
+import { BpmModelFormType, BpmModelType } from '@/utils/constants'
 import BasicInfo from './BasicInfo.vue'
 import FormDesign from './FormDesign.vue'
 import ProcessDesign from './ProcessDesign.vue'
@@ -108,16 +108,17 @@ const validateBasic = async () => {
   await basicInfoRef.value?.validate()
 }
 
+/** 表单设计校验 */
 const validateForm = async () => {
   await formDesignRef.value?.validate()
 }
 
+/** 流程设计校验 */
 const validateProcess = async () => {
   await processDesignRef.value?.validate()
 }
 
-// 步骤控制
-const currentStep = ref(0)
+const currentStep = ref(0) // 步骤控制
 const steps = [
   { title: '基本信息', validator: validateBasic },
   { title: '表单设计', validator: validateForm },
@@ -255,7 +256,6 @@ const handleSave = async () => {
     if (formData.value.id) {
       // 修改场景
       await ModelApi.updateModel(modelData)
-      message.success('修改成功')
       // 询问是否发布流程
       try {
         await message.confirm('修改流程成功，是否发布流程？')
@@ -266,8 +266,7 @@ const handleSave = async () => {
       }
     } else {
       // 新增场景
-      const result = await ModelApi.createModel(modelData)
-      formData.value.id = result
+      formData.value.id = await ModelApi.createModel(modelData)
       message.success('新增成功')
       try {
         await message.confirm('创建流程成功，是否继续编辑？')
@@ -335,7 +334,7 @@ const handleDeploy = async () => {
     await ModelApi.deployModel(formData.value.id)
     message.success('发布成功')
     // 返回列表页
-    router.push({ name: 'BpmModel' })
+    await router.push({ name: 'BpmModel' })
   } catch (error: any) {
     console.error('发布失败:', error)
     message.warning(error.message || '发布失败')

src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue

@@ -8,7 +8,7 @@
         <!-- 中间主要内容 tab 栏 -->
         <el-tabs v-model="activeTab">
           <!-- 表单信息 -->
-          <el-tab-pane label="表单填写" name="form" >
+          <el-tab-pane label="表单填写" name="form">
             <div class="form-scroll-area" v-loading="processInstanceStartLoading">
               <el-scrollbar>
                 <el-row>
@@ -75,7 +75,11 @@
 <script lang="ts" setup>
 import { decodeFields, setConfAndFields2 } from '@/utils/formCreate'
 import { BpmModelType } from '@/utils/constants'
-import { CandidateStrategy } from '@/components/SimpleProcessDesignerV2/src/consts'
+import {
+  CandidateStrategy,
+  NodeId,
+  FieldPermissionType
+} from '@/components/SimpleProcessDesignerV2/src/consts'
 import ProcessInstanceBpmnViewer from '../detail/ProcessInstanceBpmnViewer.vue'
 import ProcessInstanceSimpleViewer from '../detail/ProcessInstanceSimpleViewer.vue'
 import ProcessInstanceTimeline from '../detail/ProcessInstanceTimeline.vue'
@@ -129,8 +133,10 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
       }
     }
     setConfAndFields2(detailForm, row.formConf, row.formFields, formVariables)
+
     await nextTick()
     fApi.value?.btn.show(false) // 隐藏提交按钮
+
     // 获取流程审批信息
     await getApprovalDetail(row)
 
@@ -152,7 +158,12 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
 /** 获取审批详情 */
 const getApprovalDetail = async (row: any) => {
   try {
-    const data = await ProcessInstanceApi.getApprovalDetail({ processDefinitionId: row.id })
+    // TODO 获取审批详情，设置 activityId 为发起人节点（为了获取字段权限。暂时只对 Simple 设计器有效）
+    const data = await ProcessInstanceApi.getApprovalDetail({
+      processDefinitionId: row.id,
+      activityId: NodeId.START_USER_NODE_ID
+    })
+
     if (!data) {
       message.error('查询不到审批详情信息！')
       return
@@ -170,10 +181,36 @@ const getApprovalDetail = async (row: any) => {
 
     // 获取审批节点，显示 Timeline 的数据
     activityNodes.value = data.activityNodes
+    // 获取表单字段权限
+    const formFieldsPermission = data.formFieldsPermission
+    // 设置表单字段权限
+    if (formFieldsPermission) {
+      Object.keys(formFieldsPermission).forEach((item) => {
+        setFieldPermission(item, formFieldsPermission[item])
+      })
+    }
   } finally {
   }
 }
 
+/**
+ * 设置表单权限
+ */
+const setFieldPermission = (field: string, permission: string) => {
+  if (permission === FieldPermissionType.READ) {
+    //@ts-ignore
+    fApi.value?.disabled(true, field)
+  }
+  if (permission === FieldPermissionType.WRITE) {
+    //@ts-ignore
+    fApi.value?.disabled(false, field)
+  }
+  if (permission === FieldPermissionType.NONE) {
+    //@ts-ignore
+    fApi.value?.hidden(true, field)
+  }
+}
+
 /** 提交按钮 */
 const submitForm = async () => {
   if (!fApi.value || !props.selectProcessDefinition) {