From 221918bba28d2384d03c596a68256d7832e4a0e0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 13:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/SimpleProcessDesignerV2/src/node.ts | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts
index 0810c1f..282e81b 100644
--- a/src/components/SimpleProcessDesignerV2/src/node.ts
+++ b/src/components/SimpleProcessDesignerV2/src/node.ts
@@ -1,4 +1,3 @@
-import { cloneDeep } from 'lodash-es'
import { TaskStatusEnum } from '@/api/bpm/task'
import * as RoleApi from '@/api/system/role'
import * as DeptApi from '@/api/system/dept'
@@ -14,8 +13,7 @@
NODE_DEFAULT_NAME,
AssignStartUserHandlerType,
AssignEmptyHandlerType,
- FieldPermissionType,
- ProcessVariableEnum
+ FieldPermissionType
} from './consts'
import { parseFormFields } from '@/components/FormCreate/src/utils/index'
export function useWatchNode(props: { flowNode: SimpleFlowNode }): Ref<SimpleFlowNode> {
@@ -37,13 +35,6 @@
parseFormFields(JSON.parse(fieldStr), result)
})
}
- // 固定添加发起人 ID 字段
- result.unshift({
- field: ProcessVariableEnum.START_USER_ID,
- title: '发起人',
- type: 'UserSelect',
- required: true
- })
return result
}
@@ -60,9 +51,33 @@
const getNodeConfigFormFields = (nodeFormFields?: Array<Record<string, string>>) => {
nodeFormFields = toRaw(nodeFormFields)
- fieldsPermissionConfig.value =
- cloneDeep(nodeFormFields) || getDefaultFieldsPermission(unref(formFields))
+ if (!nodeFormFields || nodeFormFields.length === 0) {
+ fieldsPermissionConfig.value = getDefaultFieldsPermission(unref(formFields))
+ } else {
+ fieldsPermissionConfig.value = mergeFieldsPermission(nodeFormFields, unref(formFields))
+ }
}
+ // 合并已经设置的表单字段权限，当前流程表单字段 (可能新增，或删除了字段)
+ const mergeFieldsPermission = (
+ formFieldsPermisson: Array<Record<string, string>>,
+ formFields?: string[]
+ ) => {
+ let mergedFieldsPermission: Array<Record<string, any>> = []
+ if (formFields) {
+ mergedFieldsPermission = parseFormCreateFields(formFields).map((item) => {
+ const found = formFieldsPermisson.find(
+ (fieldPermission) => fieldPermission.field == item.field
+ )
+ return {
+ field: item.field,
+ title: item.title,
+ permission: found ? found.permission : defaultPermission
+ }
+ })
+ }
+ return mergedFieldsPermission
+ }
+
// 默认的表单权限： 获取表单的所有字段，设置字段默认权限为只读
const getDefaultFieldsPermission = (formFields?: string[]) => {
let defaultFieldsPermission: Array<Record<string, any>> = []
--
Gitblit v1.9.3