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
ab09191f
Commit
ab09191f
authored
2 years ago
by
涂伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '1.运维流程节点设计交互优化2.查询表名接口参数添加3.首节点配置提示优化'
parent
5e6c7688
Pipeline
#68800
passed with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
16 deletions
+30
-16
ParmarModal.jsx
...de/flowNodeComponents/auxiliaryComponents/ParmarModal.jsx
+15
-15
ConfigNodeMsg.jsx
...flowChartComponents/nodeModalComponents/ConfigNodeMsg.jsx
+15
-1
No files found.
src/pages/bsmanager/workOrder/workFlow/flowNode/flowNodeComponents/auxiliaryComponents/ParmarModal.jsx
View file @
ab09191f
...
...
@@ -9,7 +9,7 @@ const ParmarModal = props => {
const
[
form
]
=
Form
.
useForm
();
const
[
keepStandingBook
,
setKeepStandingBook
]
=
useState
([]);
const
[
visibleChecked
,
setVisibleChecked
]
=
useState
(
true
);
const
[
shineFieldsData
,
setShineFields
Data
]
=
useState
([
'事件编号'
,
'工单编号'
]);
const
[
mappingData
,
setMapping
Data
]
=
useState
([
'事件编号'
,
'工单编号'
]);
const
{
Option
}
=
Select
;
useEffect
(()
=>
{
if
(
visible
)
{
...
...
@@ -28,15 +28,15 @@ const ParmarModal = props => {
if
(
pageUrl
.
indexOf
(
'['
)
!==
-
1
)
{
let
data
=
JSON
.
parse
(
pageUrl
);
let
list
=
[];
if
(
data
.
shineFields
.
length
>
0
)
{
data
.
shineFields
.
map
(
i
=>
{
list
.
push
(
i
.
f
or
mField
);
if
(
data
.
mapping
.
length
>
0
)
{
data
.
mapping
.
map
(
i
=>
{
list
.
push
(
i
.
f
ro
mField
);
});
}
form
.
setFieldsValue
({
accountName
:
data
.
accountName
,
editable
:
data
.
editable
,
shineFields
:
list
,
mapping
:
list
,
});
}
}
...
...
@@ -54,14 +54,14 @@ const ParmarModal = props => {
let
data
=
{};
data
.
accountName
=
obj
.
accountName
;
data
.
editable
=
visibleChecked
;
data
.
shineFields
=
[];
if
(
obj
.
shineFields
)
{
obj
.
shineFields
.
map
(
i
=>
{
data
.
shineFields
.
push
({
for
mField
:
i
,
toField
:
i
});
data
.
mapping
=
[];
if
(
obj
.
mapping
)
{
obj
.
mapping
.
map
(
i
=>
{
data
.
mapping
.
push
({
fro
mField
:
i
,
toField
:
i
});
});
}
// data.
shineFields = [{ formField: obj.shineFields, toField: obj.shineFields
}];
// data.
shineFields
= parma;
// data.
mapping = [{ fromField: obj.mapping, toField: obj.mapping
}];
// data.
mapping
= parma;
parmarCallBack
(
JSON
.
stringify
(
data
));
}
});
...
...
@@ -106,9 +106,9 @@ const ParmarModal = props => {
onChange=
{
change
}
/>
</
Form
.
Item
>
<
Form
.
Item
label=
"映射字段"
name=
"
shineFields
"
>
<
Form
.
Item
label=
"映射字段"
name=
"
mapping
"
>
<
Select
placeholder=
"请选择映射字段"
showSearch
mode=
"multiple"
>
{
shineFields
Data
.
map
((
item
,
index
)
=>
(
{
mapping
Data
.
map
((
item
,
index
)
=>
(
<
Option
key=
{
index
}
value=
{
item
}
>
{
item
}
</
Option
>
...
...
@@ -126,7 +126,7 @@ const ParmarModal = props => {
<Form.Item
{...restField}
style={{ marginBottom: '5px' }}
name={[name, 'f
or
mField']}
name={[name, 'f
ro
mField']}
fieldKey={[fieldKey, 'key']}
validateTrigger={['onChange', 'onBlur']}
rules={[
...
...
@@ -136,7 +136,7 @@ const ParmarModal = props => {
// 验证参数名不能重复
const allKey = form
.getFieldsValue()
.parmars.map(item => (item ? item.f
or
mField : ''));
.parmars.map(item => (item ? item.f
ro
mField : ''));
const repeatKey = new Set(allKey);
if (repeatKey.size !== allKey.length) {
return Promise.reject(new Error('参数名重复'));
...
...
This diff is collapsed.
Click to expand it.
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigNodeMsg.jsx
View file @
ab09191f
...
...
@@ -393,7 +393,21 @@ const ConfigNodeMsg = (props, ref) => {
</
Radio
>
</
Radio
.
Group
>
</
Form
.
Item
>
<
Form
.
Item
label=
"节点表名"
name=
"TableName"
>
<
Form
.
Item
label=
{
editMsg
.
NodeType
===
'1'
?
(
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
Tooltip
title=
"首节点的表必须包含事件编号和工单编号"
>
<
InfoCircleOutlined
style=
{
{
color
:
'#1890ff'
,
marginLeft
:
'3px'
}
}
/>
</
Tooltip
>
节点表名
</
div
>
)
:
(
<
div
>
节点表名
</
div
>
)
}
name=
"TableName"
>
<
Select
placeholder=
"请选择节点表名"
onChange=
{
changTable
}
showSearch
>
{
eventTable
.
map
(
item
=>
(
<
Option
value=
{
item
.
Name
}
key=
{
item
.
Name
}
>
...
...
This diff is collapsed.
Click to expand it.
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