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
9bdafb0f
authored
Dec 06, 2024
by
jason
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【缺陷修复】1、条件配置的表单字段必须为必填 2、配置方式 bug
parent
8e4d91f4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
13 deletions
+9
-13
src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
+9
-13
No files found.
src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
View file @
9bdafb0f
...
...
@@ -26,19 +26,13 @@
</div>
</
template
>
<div>
<div
class=
"mb-3 font-size-16px"
v-if=
"currentNode.defaultFlow"
>
未满足其它条件时,将进入此分支(该分支不可编辑和删除)
</div>
<div
v-else
>
<el-form
ref=
"formRef"
:model=
"currentNode"
:rules=
"formRules"
label-position=
"top"
<div
class=
"mb-3 font-size-16px"
v-if=
"currentNode.defaultFlow"
>
未满足其它条件时,将进入此分支(该分支不可编辑和删除)
</div
>
<div
v-else
>
<el-form
ref=
"formRef"
:model=
"currentNode"
:rules=
"formRules"
label-position=
"top"
>
<el-form-item
label=
"配置方式"
prop=
"conditionType"
>
<el-radio-group
v-model=
"currentNode.conditionType"
@
change=
"changeConditionType"
>
<el-radio-group
v-model=
"currentNode.conditionType"
@
change=
"changeConditionType"
>
<el-radio
v-for=
"(dict, index) in conditionConfigTypes"
:key=
"index"
...
...
@@ -112,6 +106,7 @@
:key=
"index"
:label=
"item.title"
:value=
"item.field"
:disabled =
"!item.required"
/>
</el-select>
</div>
...
...
@@ -169,6 +164,7 @@ import {
}
from
'../consts'
import
{
getDefaultConditionNodeName
}
from
'../utils'
import
{
useFormFields
}
from
'../node'
import
{
BpmModelFormType
}
from
'@/utils/constants'
const
message
=
useMessage
()
// 消息弹窗
defineOptions
({
name
:
'ConditionNodeConfig'
...
...
@@ -177,8 +173,8 @@ const formType = inject<Ref<number>>('formType') // 表单类型
const
conditionConfigTypes
=
computed
(()
=>
{
return
CONDITION_CONFIG_TYPES
.
filter
((
item
)
=>
{
// 业务表单暂时去掉条件规则选项
if
(
formType
?.
value
!==
10
)
{
return
item
.
value
===
ConditionType
.
RULE
if
(
formType
?.
value
===
BpmModelFormType
.
CUSTOM
&&
item
.
value
===
ConditionType
.
RULE
)
{
return
false
}
else
{
return
true
}
...
...
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