Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
bkunyun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bkunyun
Commits
20be3215
Commit
20be3215
authored
Sep 02, 2022
by
wuyongsheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: node节点连接线样式修改
parent
d368c9c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
MyButton.tsx
src/components/mui/MyButton.tsx
+3
-0
index.tsx
src/views/Project/components/Flow/index.tsx
+11
-9
No files found.
src/components/mui/MyButton.tsx
View file @
20be3215
...
@@ -110,16 +110,19 @@ const theme = createTheme({
...
@@ -110,16 +110,19 @@ const theme = createTheme({
"& p"
:
{
fontSize
:
"12px"
},
"& p"
:
{
fontSize
:
"12px"
},
height
:
"28px"
,
height
:
"28px"
,
padding
:
"0 12px"
,
padding
:
"0 12px"
,
minWidth
:
"60px"
,
},
},
sizeMedium
:
{
sizeMedium
:
{
"& p"
:
{
fontSize
:
"14px"
},
"& p"
:
{
fontSize
:
"14px"
},
height
:
"32px"
,
height
:
"32px"
,
padding
:
"0 16px"
,
padding
:
"0 16px"
,
minWidth
:
"68px"
,
},
},
sizeLarge
:
{
sizeLarge
:
{
"& p"
:
{
fontSize
:
"16px"
},
"& p"
:
{
fontSize
:
"16px"
},
height
:
"36px"
,
height
:
"36px"
,
padding
:
"0 16px"
,
padding
:
"0 16px"
,
minWidth
:
"80px"
,
},
},
},
},
},
},
...
...
src/views/Project/components/Flow/index.tsx
View file @
20be3215
...
@@ -11,7 +11,7 @@ import ReactFlow, {
...
@@ -11,7 +11,7 @@ import ReactFlow, {
import
{
useCallback
,
useEffect
,
useMemo
,
useState
}
from
"react"
;
import
{
useCallback
,
useEffect
,
useMemo
,
useState
}
from
"react"
;
import
{
uuid
}
from
"@/utils/util"
;
import
{
uuid
}
from
"@/utils/util"
;
import
{
IParameter
,
ITask
}
from
"../../ProjectSubmitWork/interface"
;
import
{
IParameter
,
ITask
}
from
"../../ProjectSubmitWork/interface"
;
import
{
ILine
}
from
"./interface"
;
import
{
ILine
}
from
"./interface"
;
import
BatchNode
from
"./components/BatchNode"
;
import
BatchNode
from
"./components/BatchNode"
;
import
FlowNode
from
"./components/FlowNode"
;
import
FlowNode
from
"./components/FlowNode"
;
...
@@ -61,7 +61,7 @@ const Flow = (props: IProps) => {
...
@@ -61,7 +61,7 @@ const Flow = (props: IProps) => {
showControls
=
true
,
showControls
=
true
,
...
other
...
other
}
=
props
;
}
=
props
;
/** 自定义的节点类型 */
/** 自定义的节点类型 */
const
nodeTypes
=
useMemo
(()
=>
{
const
nodeTypes
=
useMemo
(()
=>
{
return
{
batchNode
:
BatchNode
,
flowNode
:
FlowNode
};
return
{
batchNode
:
BatchNode
,
flowNode
:
FlowNode
};
...
@@ -311,16 +311,18 @@ const Flow = (props: IProps) => {
...
@@ -311,16 +311,18 @@ const Flow = (props: IProps) => {
/** tasks 数据 */
/** tasks 数据 */
tasks
:
tasks
,
tasks
:
tasks
,
}
}
:
{
selectedStatus
:
externalSelectedNodeId
:
{
?
externalSelectedNodeId
.
includes
(
item
.
id
)
selectedStatus
:
externalSelectedNodeId
:
inSideFlowNodeId
===
item
.
id
,}),
?
externalSelectedNodeId
.
includes
(
item
.
id
)
:
inSideFlowNodeId
===
item
.
id
,
}),
/** 输入输出圆点状态 */
/** 输入输出圆点状态 */
// dotStatus: nodesInputAndOutputStatus(item.id),
// dotStatus: nodesInputAndOutputStatus(item.id),
/** 样式 */
/** 样式 */
style
:
{
style
:
{
...
getBatchStyle
(
item
),
...
getBatchStyle
(
item
),
marginTop
:
'-44px'
,
marginTop
:
"-44px"
,
padding
:
"12px 20px"
,
padding
:
"12px 20px"
,
},
},
},
},
...
@@ -379,11 +381,11 @@ const Flow = (props: IProps) => {
...
@@ -379,11 +381,11 @@ const Flow = (props: IProps) => {
style
:
{
stroke
:
"#1370FF"
,
strokeWidth
:
2
},
style
:
{
stroke
:
"#1370FF"
,
strokeWidth
:
2
},
animated
:
true
,
animated
:
true
,
}
}
:
{}),
:
{
stroke
:
"#D1D6DE"
}),
/** 点击batch节点选中 */
/** 点击batch节点选中 */
...(
item
?.
batchId
===
newSelectId
...(
item
?.
batchId
===
newSelectId
?
{
style
:
{
stroke
:
"#1370FF"
},
animated
:
true
}
?
{
style
:
{
stroke
:
"#1370FF"
},
animated
:
true
}
:
{}),
:
{
stroke
:
"#D1D6DE"
}),
labelStyle
:
{
fill
:
"#8A9099"
},
labelStyle
:
{
fill
:
"#8A9099"
},
labelBgStyle
:
{
fill
:
"#F7F8FA "
},
labelBgStyle
:
{
fill
:
"#F7F8FA "
},
label
:
item
.
label
?
`(
${
item
.
label
}
)`
:
""
,
label
:
item
.
label
?
`(
${
item
.
label
}
)`
:
""
,
...
@@ -641,7 +643,7 @@ const Flow = (props: IProps) => {
...
@@ -641,7 +643,7 @@ const Flow = (props: IProps) => {
// const onNodesChange = (val: any)=>{
// const onNodesChange = (val: any)=>{
// // 自定义change事件 不允许react flow组件本身删除事件
// // 自定义change事件 不允许react flow组件本身删除事件
// // return
// // return
// }
// }
// const onEdgesChange = (val: any) =>{
// const onEdgesChange = (val: any) =>{
...
...
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