Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
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
ReactWeb5
CivManage
Commits
60258174
Commit
60258174
authored
Jan 04, 2023
by
邓超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 工作里编辑器配置,优化流程中心样式
parent
143057cf
Pipeline
#66175
passed with stages
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
10 deletions
+35
-10
WorkflowHomePage.jsx
...ges/bsmanager/workOrder/workflowEdit/WorkflowHomePage.jsx
+10
-3
WorkflowHomePage.less
...es/bsmanager/workOrder/workflowEdit/WorkflowHomePage.less
+1
-1
FlowChartRt.jsx
...workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx
+4
-1
ConfigNodeMsg.jsx
...flowChartComponents/nodeModalComponents/ConfigNodeMsg.jsx
+6
-1
ConfigOperate.jsx
...flowChartComponents/nodeModalComponents/ConfigOperate.jsx
+14
-4
No files found.
src/pages/bsmanager/workOrder/workflowEdit/WorkflowHomePage.jsx
View file @
60258174
...
@@ -43,10 +43,13 @@ const WorkflowHomePage = () => {
...
@@ -43,10 +43,13 @@ const WorkflowHomePage = () => {
gsap
.
registerPlugin
(
ScrollToPlugin
);
gsap
.
registerPlugin
(
ScrollToPlugin
);
getFlowList
();
getFlowList
();
let
flowTable
=
document
.
querySelector
(
`.
${
styles
.
flowTable
}
`
);
let
flowTable
=
document
.
querySelector
(
`.
${
styles
.
flowTable
}
`
);
flowTable
.
addEventListener
(
'scroll'
,
()
=>
{
flowTable
.
addEventListener
(
'scroll'
,
setScroll
);
setFlowTableScroll
(
flowTable
.
scrollTop
);
});
return
()
=>
{
flowTable
.
removeEventListener
(
'scroll'
,
setScroll
);
};
},
[]);
},
[]);
useEffect
(()
=>
{
useEffect
(()
=>
{
clearTimeout
(
scrollTimer
.
current
);
clearTimeout
(
scrollTimer
.
current
);
scrollTimer
.
current
=
setTimeout
(()
=>
{
scrollTimer
.
current
=
setTimeout
(()
=>
{
...
@@ -92,6 +95,10 @@ const WorkflowHomePage = () => {
...
@@ -92,6 +95,10 @@ const WorkflowHomePage = () => {
},
0
);
},
0
);
}
}
},
[
flowList
]);
},
[
flowList
]);
const
setScroll
=
()
=>
{
let
flowTable
=
document
.
querySelector
(
`.
${
styles
.
flowTable
}
`
);
setFlowTableScroll
(
flowTable
.
scrollTop
);
};
// 获取所有数据
// 获取所有数据
const
getFlowList
=
()
=>
{
const
getFlowList
=
()
=>
{
WFGetAllFlow
().
then
(
res
=>
{
WFGetAllFlow
().
then
(
res
=>
{
...
...
src/pages/bsmanager/workOrder/workflowEdit/WorkflowHomePage.less
View file @
60258174
...
@@ -322,7 +322,7 @@
...
@@ -322,7 +322,7 @@
display: flex;
display: flex;
width: 100%;
width: 100%;
justify-content: space-between;
justify-content: space-between;
padding: 0
18
px;
padding: 0
20
px;
margin-bottom: 8px;
margin-bottom: 8px;
box-sizing: border-box;
box-sizing: border-box;
}
}
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx
View file @
60258174
...
@@ -363,7 +363,7 @@ const FlowChart = props => {
...
@@ -363,7 +363,7 @@ const FlowChart = props => {
FlowTimerList
:
[],
FlowTimerList
:
[],
TurnOnCc
:
0
,
TurnOnCc
:
0
,
NodeAliasName
:
''
,
NodeAliasName
:
''
,
Handover
:
'移交选择人'
,
TableName
:
''
,
TableName
:
''
,
Fields
:
''
,
Fields
:
''
,
WebPage
:
''
,
WebPage
:
''
,
...
@@ -395,6 +395,7 @@ const FlowChart = props => {
...
@@ -395,6 +395,7 @@ const FlowChart = props => {
NodeName
:
'开始节点'
,
NodeName
:
'开始节点'
,
NodeType
:
'1'
,
NodeType
:
'1'
,
SerialNo
:
0
,
SerialNo
:
0
,
Handover
:
'移交选择人'
,
...
defaultField
,
...
defaultField
,
},
},
{
{
...
@@ -402,6 +403,7 @@ const FlowChart = props => {
...
@@ -402,6 +403,7 @@ const FlowChart = props => {
NodeName
:
'普通节点'
,
NodeName
:
'普通节点'
,
NodeType
:
'0'
,
NodeType
:
'0'
,
SerialNo
:
0
,
SerialNo
:
0
,
Handover
:
'移交选择人'
,
...
defaultField
,
...
defaultField
,
},
},
{
{
...
@@ -409,6 +411,7 @@ const FlowChart = props => {
...
@@ -409,6 +411,7 @@ const FlowChart = props => {
NodeName
:
'结束节点'
,
NodeName
:
'结束节点'
,
NodeType
:
'2'
,
NodeType
:
'2'
,
SerialNo
:
0
,
SerialNo
:
0
,
Handover
:
'自处理'
,
...
defaultField
,
...
defaultField
,
},
},
]),
]),
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigNodeMsg.jsx
View file @
60258174
...
@@ -335,7 +335,12 @@ const ConfigNodeMsg = (props, ref) => {
...
@@ -335,7 +335,12 @@ const ConfigNodeMsg = (props, ref) => {
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
label=
"移交方式"
name=
"Handover"
>
<
Form
.
Item
label=
"移交方式"
name=
"Handover"
>
<
Radio
.
Group
>
<
Radio
.
Group
>
<
Radio
value=
"移交选择人"
>
<
Radio
value=
"移交选择人"
style=
{
{
display
:
editMsg
.
NodeType
===
'2'
?
'none'
:
'flex'
,
}
}
>
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
移交选择人
移交选择人
<
Tooltip
title=
"根据人员选择面板,自主选择移交的人员"
>
<
Tooltip
title=
"根据人员选择面板,自主选择移交的人员"
>
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigOperate.jsx
View file @
60258174
...
@@ -118,7 +118,12 @@ const ConfigOperate = (props, ref) => {
...
@@ -118,7 +118,12 @@ const ConfigOperate = (props, ref) => {
</
div
>
</
div
>
<
Form
.
Item
<
Form
.
Item
valuePropName=
"checked"
valuePropName=
"checked"
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
}
}
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
,
display
:
editMsg
.
NodeType
===
'0'
?
'flex'
:
'none'
,
}
}
label=
{
label=
{
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
{
/* <Tooltip title="开始节点不允许转办">
{
/* <Tooltip title="开始节点不允许转办">
...
@@ -173,9 +178,9 @@ const ConfigOperate = (props, ref) => {
...
@@ -173,9 +178,9 @@ const ConfigOperate = (props, ref) => {
valuePropName=
"checked"
valuePropName=
"checked"
label=
{
label=
{
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
Tooltip
title=
"结束节点可配置自动关单"
>
{
/*
<Tooltip title="结束节点可配置自动关单">
<InfoCircleOutlined style={{ color: '#1890ff', marginRight: '3px' }} />
<InfoCircleOutlined style={{ color: '#1890ff', marginRight: '3px' }} />
</
Tooltip
>
</Tooltip>
*/
}
<
span
>
自动关单
</
span
>
<
span
>
自动关单
</
span
>
</
div
>
</
div
>
}
}
...
@@ -231,7 +236,12 @@ const ConfigOperate = (props, ref) => {
...
@@ -231,7 +236,12 @@ const ConfigOperate = (props, ref) => {
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
valuePropName=
"checked"
valuePropName=
"checked"
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
}
}
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
,
display
:
editMsg
.
NodeType
===
'0'
?
'flex'
:
'none'
,
}
}
label=
"是否发送短信"
label=
"是否发送短信"
name=
"IsSendMessage"
name=
"IsSendMessage"
>
>
...
...
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