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
e5f60205
authored
Jan 08, 2025
by
Lesan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: routeGroups命名问题
parent
a2759680
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
src/components/SimpleProcessDesignerV2/src/consts.ts
+1
-1
src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue
+11
-11
No files found.
src/components/SimpleProcessDesignerV2/src/consts.ts
View file @
e5f60205
...
@@ -116,7 +116,7 @@ export interface SimpleFlowNode {
...
@@ -116,7 +116,7 @@ export interface SimpleFlowNode {
// 延迟设置
// 延迟设置
delaySetting
?:
DelaySetting
delaySetting
?:
DelaySetting
// 路由分支
// 路由分支
routeGroup
?:
RouteCondition
[]
routeGroup
s
?:
RouteCondition
[]
defaultFlowId
?:
string
defaultFlowId
?:
string
}
}
// 候选人策略枚举 ( 用于审批节点。抄送节点 )
// 候选人策略枚举 ( 用于审批节点。抄送节点 )
...
...
src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue
View file @
e5f60205
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
</
template
>
</
template
>
<div>
<div>
<el-form
label-position=
"top"
>
<el-form
label-position=
"top"
>
<el-card
class=
"mb-15px"
v-for=
"(item, index) in routeGroup"
:key=
"index"
>
<el-card
class=
"mb-15px"
v-for=
"(item, index) in routeGroup
s
"
:key=
"index"
>
<
template
#
header
>
<
template
#
header
>
<div
class=
"flex flex-items-center"
>
<div
class=
"flex flex-items-center"
>
<el-text
size=
"large"
>
路由
{{
index
+
1
}}
</el-text>
<el-text
size=
"large"
>
路由
{{
index
+
1
}}
</el-text>
...
@@ -228,7 +228,7 @@ const fieldOptions = computed(() => {
...
@@ -228,7 +228,7 @@ const fieldOptions = computed(() => {
})
})
return
fieldsCopy
return
fieldsCopy
})
})
const
routeGroup
=
ref
<
RouteCondition
[]
>
([])
const
routeGroup
s
=
ref
<
RouteCondition
[]
>
([])
const
nodeOptions
=
ref
()
const
nodeOptions
=
ref
()
// 保存配置
// 保存配置
...
@@ -237,26 +237,26 @@ const saveConfig = async () => {
...
@@ -237,26 +237,26 @@ const saveConfig = async () => {
if
(
!
showText
)
return
false
if
(
!
showText
)
return
false
currentNode
.
value
.
name
=
nodeName
.
value
!
currentNode
.
value
.
name
=
nodeName
.
value
!
currentNode
.
value
.
showText
=
showText
currentNode
.
value
.
showText
=
showText
currentNode
.
value
.
routeGroup
=
routeGroup
.
value
currentNode
.
value
.
routeGroup
s
=
routeGroups
.
value
settingVisible
.
value
=
false
settingVisible
.
value
=
false
return
true
return
true
}
}
// 显示路由分支节点配置, 由父组件传过来
// 显示路由分支节点配置, 由父组件传过来
const
showRouteNodeConfig
=
(
node
:
SimpleFlowNode
)
=>
{
const
showRouteNodeConfig
=
(
node
:
SimpleFlowNode
)
=>
{
getRoutableNode
()
getRoutableNode
()
routeGroup
.
value
=
[]
routeGroup
s
.
value
=
[]
nodeName
.
value
=
node
.
name
nodeName
.
value
=
node
.
name
if
(
node
.
routeGroup
)
{
if
(
node
.
routeGroup
s
)
{
routeGroup
.
value
=
node
.
routeGroup
routeGroup
s
.
value
=
node
.
routeGroups
}
}
}
}
const
getShowText
=
()
=>
{
const
getShowText
=
()
=>
{
if
(
!
routeGroup
.
value
||
!
Array
.
isArray
(
routeGroup
.
value
)
||
routeGroup
.
value
.
length
<=
0
)
{
if
(
!
routeGroup
s
.
value
||
!
Array
.
isArray
(
routeGroups
.
value
)
||
routeGroups
.
value
.
length
<=
0
)
{
message
.
warning
(
'请配置路由!'
)
message
.
warning
(
'请配置路由!'
)
return
''
return
''
}
}
for
(
const
route
of
routeGroup
.
value
)
{
for
(
const
route
of
routeGroup
s
.
value
)
{
if
(
!
route
.
nodeId
||
!
route
.
conditionType
)
{
if
(
!
route
.
nodeId
||
!
route
.
conditionType
)
{
message
.
warning
(
'请完善路由配置项!'
)
message
.
warning
(
'请完善路由配置项!'
)
return
''
return
''
...
@@ -276,7 +276,7 @@ const getShowText = () => {
...
@@ -276,7 +276,7 @@ const getShowText = () => {
}
}
}
}
}
}
return
`
${
routeGroup
.
value
.
length
}
条路由分支`
return
`
${
routeGroup
s
.
value
.
length
}
条路由分支`
}
}
// TODO @lesan:这个需要实现么?
// TODO @lesan:这个需要实现么?
...
@@ -318,7 +318,7 @@ const addConditionGroup = (conditions) => {
...
@@ -318,7 +318,7 @@ const addConditionGroup = (conditions) => {
}
}
const
addRouteGroup
=
()
=>
{
const
addRouteGroup
=
()
=>
{
routeGroup
.
value
.
push
({
routeGroup
s
.
value
.
push
({
nodeId
:
''
,
nodeId
:
''
,
conditionType
:
ConditionType
.
EXPRESSION
,
conditionType
:
ConditionType
.
EXPRESSION
,
conditionExpression
:
''
,
conditionExpression
:
''
,
...
@@ -343,7 +343,7 @@ const addRouteGroup = () => {
...
@@ -343,7 +343,7 @@ const addRouteGroup = () => {
}
}
const
deleteRouteGroup
=
(
index
)
=>
{
const
deleteRouteGroup
=
(
index
)
=>
{
routeGroup
.
value
.
splice
(
index
,
1
)
routeGroup
s
.
value
.
splice
(
index
,
1
)
}
}
const
getRoutableNode
=
()
=>
{
const
getRoutableNode
=
()
=>
{
...
...
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