Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c6ffe4a7
authored
Feb 14, 2025
by
lizhixian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复审批节点自定义配置字段权限为空问题
parent
a27dad61
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
5 deletions
+20
-5
src/components/SimpleProcessDesignerV2/src/SimpleProcessViewer.vue
+0
-1
src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
+2
-3
src/views/bpm/model/editor/index.vue
+18
-1
No files found.
src/components/SimpleProcessDesignerV2/src/SimpleProcessViewer.vue
View file @
c6ffe4a7
...
@@ -45,4 +45,3 @@ watch(
...
@@ -45,4 +45,3 @@ watch(
provide
(
'tasks'
,
approveTasks
)
provide
(
'tasks'
,
approveTasks
)
provide
(
'processInstance'
,
currentProcessInstance
)
provide
(
'processInstance'
,
currentProcessInstance
)
</
script
>
</
script
>
p
src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
View file @
c6ffe4a7
...
@@ -191,6 +191,7 @@ import {
...
@@ -191,6 +191,7 @@ import {
}
from
'@/components/SimpleProcessDesignerV2/src/consts'
}
from
'@/components/SimpleProcessDesignerV2/src/consts'
import
*
as
UserApi
from
'@/api/system/user'
import
*
as
UserApi
from
'@/api/system/user'
import
{
useFormFieldsPermission
}
from
'@/components/SimpleProcessDesignerV2/src/node'
import
{
useFormFieldsPermission
}
from
'@/components/SimpleProcessDesignerV2/src/node'
import
{
BpmModelFormType
}
from
'@/utils/constants'
defineOptions
({
name
:
'ElementCustomConfig4UserTask'
})
defineOptions
({
name
:
'ElementCustomConfig4UserTask'
})
const
props
=
defineProps
({
const
props
=
defineProps
({
...
@@ -310,14 +311,12 @@ const resetCustomConfigList = () => {
...
@@ -310,14 +311,12 @@ const resetCustomConfigList = () => {
}
}
// 字段权限
// 字段权限
if
(
formType
.
value
===
10
)
{
if
(
formType
.
value
===
BpmModelFormType
.
NORMAL
)
{
const
fieldsPermissionList
=
elExtensionElements
.
value
.
values
?.
filter
(
const
fieldsPermissionList
=
elExtensionElements
.
value
.
values
?.
filter
(
(
ex
)
=>
ex
.
$type
===
`
${
prefix
}
:FieldsPermission`
(
ex
)
=>
ex
.
$type
===
`
${
prefix
}
:FieldsPermission`
)
)
fieldsPermissionEl
.
value
=
[]
fieldsPermissionEl
.
value
=
[]
getNodeConfigFormFields
()
getNodeConfigFormFields
()
// 由于默认添加了发起人元素,这里需要删掉
// fieldsPermissionConfig.value = fieldsPermissionConfig.value.slice(1)
fieldsPermissionConfig
.
value
=
fieldsPermissionConfig
.
value
fieldsPermissionConfig
.
value
=
fieldsPermissionConfig
.
value
fieldsPermissionConfig
.
value
.
forEach
((
element
)
=>
{
fieldsPermissionConfig
.
value
.
forEach
((
element
)
=>
{
element
.
permission
=
element
.
permission
=
...
...
src/views/bpm/model/editor/index.vue
View file @
c6ffe4a7
...
@@ -34,6 +34,8 @@ import CustomContentPadProvider from '@/components/bpmnProcessDesigner/package/d
...
@@ -34,6 +34,8 @@ import CustomContentPadProvider from '@/components/bpmnProcessDesigner/package/d
// 自定义左侧菜单(修改 默认任务 为 用户任务)
// 自定义左侧菜单(修改 默认任务 为 用户任务)
import
CustomPaletteProvider
from
'@/components/bpmnProcessDesigner/package/designer/plugins/palette'
import
CustomPaletteProvider
from
'@/components/bpmnProcessDesigner/package/designer/plugins/palette'
import
*
as
ModelApi
from
'@/api/bpm/model'
import
*
as
ModelApi
from
'@/api/bpm/model'
import
{
BpmModelFormType
}
from
'@/utils/constants'
import
*
as
FormApi
from
'@/api/bpm/form'
defineOptions
({
name
:
'BpmModelEditor'
})
defineOptions
({
name
:
'BpmModelEditor'
})
...
@@ -49,7 +51,8 @@ const message = useMessage() // 国际化
...
@@ -49,7 +51,8 @@ const message = useMessage() // 国际化
// 表单信息
// 表单信息
const
formFields
=
ref
<
string
[]
>
([])
const
formFields
=
ref
<
string
[]
>
([])
const
formType
=
ref
(
20
)
// 表单类型,暂仅限流程表单
const
formType
=
ref
(
BpmModelFormType
.
NORMAL
)
provide
(
'formFields'
,
formFields
)
provide
(
'formFields'
,
formFields
)
provide
(
'formType'
,
formType
)
provide
(
'formType'
,
formType
)
...
@@ -88,6 +91,20 @@ const save = async (bpmnXml: string) => {
...
@@ -88,6 +91,20 @@ const save = async (bpmnXml: string) => {
}
}
}
}
/** 监听表单 ID 变化,加载表单数据 */
watch
(
()
=>
modelData
.
value
.
formId
,
async
(
newFormId
)
=>
{
if
(
newFormId
&&
modelData
.
value
.
formType
===
BpmModelFormType
.
NORMAL
)
{
const
data
=
await
FormApi
.
getForm
(
newFormId
)
formFields
.
value
=
data
.
fields
}
else
{
formFields
.
value
=
[]
}
},
{
immediate
:
true
}
)
// 在组件卸载时清理
// 在组件卸载时清理
onBeforeUnmount
(()
=>
{
onBeforeUnmount
(()
=>
{
modeler
.
value
=
null
modeler
.
value
=
null
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment