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
1e48bd54
Commit
1e48bd54
authored
Aug 22, 2022
by
chenshouchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 新增算子增加删除监听控制、 新增模板中的流算子输入参数显示隐藏禁止编辑
parent
e8ef7d31
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
index.tsx
src/views/CustomOperator/components/OperatorList/index.tsx
+8
-1
index.tsx
src/views/CustomOperator/index.tsx
+3
-1
index.tsx
src/views/WorkFlowEdit/components/ParameterSetting/index.tsx
+1
-0
util.ts
src/views/WorkFlowEdit/util.ts
+1
-1
No files found.
src/views/CustomOperator/components/OperatorList/index.tsx
View file @
1e48bd54
...
@@ -14,10 +14,11 @@ import { ITask } from "@/views/Project/ProjectSubmitWork/interface";
...
@@ -14,10 +14,11 @@ import { ITask } from "@/views/Project/ProjectSubmitWork/interface";
type
IProps
=
{
type
IProps
=
{
operatorList
:
ITask
[];
operatorList
:
ITask
[];
setOperatorList
:
any
;
setOperatorList
:
any
;
setInputActive
:
any
;
};
};
const
OperatorList
=
(
props
:
IProps
)
=>
{
const
OperatorList
=
(
props
:
IProps
)
=>
{
const
{
operatorList
,
setOperatorList
}
=
props
;
// 流程图中流算子列表
const
{
operatorList
,
setOperatorList
,
setInputActive
}
=
props
;
// 流程图中流算子列表
const
{
currentProjectStore
}
=
useStores
();
const
{
currentProjectStore
}
=
useStores
();
const
[
list
,
setList
]
=
useState
<
ITask
[]
>
([]);
// 算子列表
const
[
list
,
setList
]
=
useState
<
ITask
[]
>
([]);
// 算子列表
const
productId
=
toJS
(
currentProjectStore
.
currentProductInfo
.
id
);
// 产品ID
const
productId
=
toJS
(
currentProjectStore
.
currentProductInfo
.
id
);
// 产品ID
...
@@ -205,6 +206,12 @@ const OperatorList = (props: IProps) => {
...
@@ -205,6 +206,12 @@ const OperatorList = (props: IProps) => {
value=
{
keyword
}
value=
{
keyword
}
onChange=
{
keywordChange
}
onChange=
{
keywordChange
}
onKeyUp=
{
handleKeywordKeyUp
}
onKeyUp=
{
handleKeywordKeyUp
}
onFocus=
{
()
=>
{
setInputActive
(
true
);
}
}
onBlur=
{
()
=>
{
setInputActive
(
false
);
}
}
sx=
{
{
fontSize
:
"14px"
}
}
sx=
{
{
fontSize
:
"14px"
}
}
/>
/>
</
div
>
</
div
>
...
...
src/views/CustomOperator/index.tsx
View file @
1e48bd54
...
@@ -21,6 +21,7 @@ const CustomOperator = observer((props: IProps) => {
...
@@ -21,6 +21,7 @@ const CustomOperator = observer((props: IProps) => {
const
Message
=
useMessage
();
const
Message
=
useMessage
();
const
[
operatorList
,
setOperatorList
]
=
useState
<
ITask
[]
>
(
initOperatorList
);
const
[
operatorList
,
setOperatorList
]
=
useState
<
ITask
[]
>
(
initOperatorList
);
const
[
saveFormDialog
,
setSaveFormDialog
]
=
useState
(
false
);
const
[
saveFormDialog
,
setSaveFormDialog
]
=
useState
(
false
);
const
[
inputActive
,
setInputActive
]
=
useState
(
true
);
// const [showCustomOperator, setShowCustomOperator] = useState(false);
// const [showCustomOperator, setShowCustomOperator] = useState(false);
/** 设置选中唯一标识符 */
/** 设置选中唯一标识符 */
...
@@ -176,6 +177,7 @@ const CustomOperator = observer((props: IProps) => {
...
@@ -176,6 +177,7 @@ const CustomOperator = observer((props: IProps) => {
<
OperatorList
<
OperatorList
operatorList=
{
operatorList
}
operatorList=
{
operatorList
}
setOperatorList=
{
setOperatorList
}
setOperatorList=
{
setOperatorList
}
setInputActive=
{
setInputActive
}
/>
/>
<
BatchOperatorFlow
<
BatchOperatorFlow
tasks=
{
operatorList
}
tasks=
{
operatorList
}
...
@@ -183,7 +185,7 @@ const CustomOperator = observer((props: IProps) => {
...
@@ -183,7 +185,7 @@ const CustomOperator = observer((props: IProps) => {
type=
"edit"
type=
"edit"
onFlowNodeClick=
{
handleNodeClick
}
onFlowNodeClick=
{
handleNodeClick
}
flowNodeDraggable=
{
true
}
flowNodeDraggable=
{
true
}
ListenState=
{
!
saveFormDialog
}
ListenState=
{
!
saveFormDialog
&&
!
inputActive
}
showVersion=
{
true
}
showVersion=
{
true
}
showControls=
{
false
}
showControls=
{
false
}
/>
/>
...
...
src/views/WorkFlowEdit/components/ParameterSetting/index.tsx
View file @
1e48bd54
...
@@ -581,6 +581,7 @@ const ParameterSetting = (props: IParameterSettingProps) => {
...
@@ -581,6 +581,7 @@ const ParameterSetting = (props: IParameterSettingProps) => {
onChange=
{
(
e
:
any
)
=>
onChange=
{
(
e
:
any
)
=>
handleHiddenChange
(
e
,
parameter
.
name
||
""
)
handleHiddenChange
(
e
,
parameter
.
name
||
""
)
}
}
disabled=
{
true
}
></
MySwitch
>
></
MySwitch
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
src/views/WorkFlowEdit/util.ts
View file @
1e48bd54
...
@@ -50,7 +50,7 @@ export const getCustomTemplateParameterCheckResult = (
...
@@ -50,7 +50,7 @@ export const getCustomTemplateParameterCheckResult = (
}
else
if
(
parameter
.
hidden
&&
!
parameter
.
linked
)
{
}
else
if
(
parameter
.
hidden
&&
!
parameter
.
linked
)
{
return
{
return
{
error
:
true
,
error
:
true
,
helperText
:
'该输入为必填,需在右侧视图编辑区连接输入文件
或重新改回“开启”状态
'
,
helperText
:
'该输入为必填,需在右侧视图编辑区连接输入文件'
,
deleteLine
:
false
,
deleteLine
:
false
,
}
}
}
}
...
...
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