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
a82862be
authored
Dec 25, 2024
by
GoldenZqqq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改流程时,修改了流程设计保存不生效问题修复
parent
f86bd0df
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
src/views/bpm/model/form/ProcessDesign.vue
+19
-4
src/views/bpm/model/form/index.vue
+2
-2
No files found.
src/views/bpm/model/form/ProcessDesign.vue
View file @
a82862be
...
@@ -47,11 +47,15 @@ const modelData = computed({
...
@@ -47,11 +47,15 @@ const modelData = computed({
})
})
// 监听modelValue变化,确保XML数据同步
// 监听modelValue变化,确保XML数据同步
watch
(()
=>
props
.
modelValue
,
(
newVal
)
=>
{
watch
(
()
=>
props
.
modelValue
,
(
newVal
)
=>
{
if
(
newVal
.
bpmnXml
)
{
if
(
newVal
.
bpmnXml
)
{
xmlString
.
value
=
newVal
.
bpmnXml
xmlString
.
value
=
newVal
.
bpmnXml
}
}
},
{
immediate
:
true
,
deep
:
true
})
},
{
immediate
:
true
,
deep
:
true
}
)
/** 处理设计器保存成功 */
/** 处理设计器保存成功 */
const
handleDesignSuccess
=
(
bpmnXml
?:
string
)
=>
{
const
handleDesignSuccess
=
(
bpmnXml
?:
string
)
=>
{
...
@@ -67,6 +71,11 @@ const handleDesignSuccess = (bpmnXml?: string) => {
...
@@ -67,6 +71,11 @@ const handleDesignSuccess = (bpmnXml?: string) => {
/** 表单校验 */
/** 表单校验 */
const
validate
=
async
()
=>
{
const
validate
=
async
()
=>
{
// 修改场景下,如果已有 modelData.bpmnXml 则不需要重新校验
if
(
modelData
.
value
.
id
&&
modelData
.
value
.
bpmnXml
)
{
return
true
}
// 新增场景或无 bpmnXml 时才校验
if
(
!
xmlString
.
value
)
{
if
(
!
xmlString
.
value
)
{
throw
new
Error
(
'请设计流程'
)
throw
new
Error
(
'请设计流程'
)
}
}
...
@@ -75,11 +84,17 @@ const validate = async () => {
...
@@ -75,11 +84,17 @@ const validate = async () => {
/** 是否显示设计器 */
/** 是否显示设计器 */
const
showDesigner
=
computed
(()
=>
{
const
showDesigner
=
computed
(()
=>
{
return
Boolean
(
modelData
.
value
.
key
&&
modelData
.
value
.
name
)
return
Boolean
(
modelData
.
value
?.
key
&&
modelData
.
value
?
.
name
)
})
})
/** 获取当前XML字符串 */
const
getXmlString
=
()
=>
{
// 优先返回最新的 xmlString
return
xmlString
.
value
||
modelData
.
value
?.
bpmnXml
}
defineExpose
({
defineExpose
({
validate
,
validate
,
getXmlString
:
()
=>
xmlString
.
value
getXmlString
})
})
</
script
>
</
script
>
src/views/bpm/model/form/index.vue
View file @
a82862be
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
<!-- 主体内容 -->
<!-- 主体内容 -->
<div
class=
"mt-50px"
>
<div
class=
"mt-50px"
>
<!-- 第一步:基本信息 -->
<!-- 第一步:基本信息 -->
<div
v-if=
"currentStep === 0"
class=
"mx-auto
"
style=
"max-width:
1024px"
>
<div
v-if=
"currentStep === 0"
class=
"mx-auto
max-w-
1024px"
>
<BasicInfo
<BasicInfo
v-model=
"formData"
v-model=
"formData"
:categoryList=
"categoryList"
:categoryList=
"categoryList"
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
</div>
</div>
<!-- 第二步:表单设计 -->
<!-- 第二步:表单设计 -->
<div
v-if=
"currentStep === 1"
class=
"mx-auto w-1024px"
>
<div
v-if=
"currentStep === 1"
class=
"mx-auto
max-
w-1024px"
>
<FormDesign
v-model=
"formData"
:formList=
"formList"
ref=
"formDesignRef"
/>
<FormDesign
v-model=
"formData"
:formList=
"formList"
ref=
"formDesignRef"
/>
</div>
</div>
...
...
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