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
d0c45cef
Commit
d0c45cef
authored
Jul 12, 2022
by
chenshouchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: getCustomTemplateParameterCheckResult方法增加连线逻辑判断
parent
31a3b1a3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
83 additions
and
7 deletions
+83
-7
addTemplate.tsx
...ectWorkbench/workbenchTemplate/components/addTemplate.tsx
+0
-0
index.tsx
src/views/WorkFlowEdit/index.tsx
+14
-7
util.ts
src/views/WorkFlowEdit/util.ts
+69
-0
No files found.
src/views/Project/ProjectWorkbench/workbenchTemplate/components/addTemplate.tsx
View file @
d0c45cef
This diff is collapsed.
Click to expand it.
src/views/WorkFlowEdit/index.tsx
View file @
d0c45cef
...
@@ -21,6 +21,8 @@ import { ITask } from "../Project/ProjectSubmitWork/interface";
...
@@ -21,6 +21,8 @@ import { ITask } from "../Project/ProjectSubmitWork/interface";
import
_
from
"lodash"
;
import
_
from
"lodash"
;
import
{
saveUserSpec
}
from
"@/api/workbench_api"
;
import
{
saveUserSpec
}
from
"@/api/workbench_api"
;
import
useMyRequest
from
"@/hooks/useMyRequest"
;
import
useMyRequest
from
"@/hooks/useMyRequest"
;
import
MyDialog
from
"@/components/mui/Dialog"
;
import
MyInput
from
"@/components/mui/MyInput"
;
import
{
getCustomTemplateParameterCheckResult
}
from
"./util"
;
import
{
getCustomTemplateParameterCheckResult
}
from
"./util"
;
import
styles
from
"./index.module.css"
;
import
styles
from
"./index.module.css"
;
...
@@ -44,7 +46,7 @@ const WorkFlowEdit = (props: IProps) => {
...
@@ -44,7 +46,7 @@ const WorkFlowEdit = (props: IProps) => {
const
{
onBack
}
=
props
;
const
{
onBack
}
=
props
;
const
Message
=
useMessage
();
const
Message
=
useMessage
();
const
[
templateConfigInfo
,
setTemplateConfigInfo
]
=
useState
<
ITask
[]
>
([]);
const
[
templateConfigInfo
,
setTemplateConfigInfo
]
=
useState
<
ITask
[]
>
([]);
const
[
saveFormDialog
,
setSaveFormDialog
]
=
useState
(
false
);
const
[
leftContentType
,
setLeftContentType
]
=
useState
(
"list"
);
const
[
leftContentType
,
setLeftContentType
]
=
useState
(
"list"
);
const
[
popperTitle
,
setPopperTitle
]
=
useState
(
const
[
popperTitle
,
setPopperTitle
]
=
useState
(
"返回后,当前页面已填写内容将不保存,确认返回吗?"
"返回后,当前页面已填写内容将不保存,确认返回吗?"
...
@@ -99,12 +101,13 @@ const WorkFlowEdit = (props: IProps) => {
...
@@ -99,12 +101,13 @@ const WorkFlowEdit = (props: IProps) => {
Message
.
error
(
"工作流校验未通过,请检查!"
);
Message
.
error
(
"工作流校验未通过,请检查!"
);
}
else
{
}
else
{
console
.
log
(
"弹表单窗"
);
console
.
log
(
"弹表单窗"
);
saveUserSpecRun
({
setSaveFormDialog
(
true
);
title
:
"自定义模板标题"
,
// saveUserSpecRun({
version
:
"1.0.0"
,
// title: "自定义模板标题",
description
:
"这里是描述"
,
// version: "1.0.0",
tasks
:
templateConfigInfoClone
,
// description: "这里是描述",
});
// tasks: templateConfigInfoClone,
// });
}
}
};
};
...
@@ -194,6 +197,10 @@ const WorkFlowEdit = (props: IProps) => {
...
@@ -194,6 +197,10 @@ const WorkFlowEdit = (props: IProps) => {
onCancel=
{
handleCancel
}
onCancel=
{
handleCancel
}
onConfirm=
{
handleConfirm
}
onConfirm=
{
handleConfirm
}
/>
/>
<
MyDialog
open=
{
saveFormDialog
}
title=
"保存自定义模板"
>
{
/* <MyInput></MyInput> */
}
<
div
>
这是表单
</
div
>
</
MyDialog
>
</
div
>
</
div
>
);
);
};
};
...
...
src/views/WorkFlowEdit/util.ts
View file @
d0c45cef
...
@@ -4,6 +4,7 @@ export const getCustomTemplateParameterCheckResult = (
...
@@ -4,6 +4,7 @@ export const getCustomTemplateParameterCheckResult = (
):
{
):
{
error
:
boolean
;
error
:
boolean
;
helperText
:
string
;
helperText
:
string
;
deleteLine
?:
boolean
;
// 自动将该线删除
}
=>
{
}
=>
{
let
error
=
false
;
let
error
=
false
;
let
helperText
=
""
;
let
helperText
=
""
;
...
@@ -14,6 +15,73 @@ export const getCustomTemplateParameterCheckResult = (
...
@@ -14,6 +15,73 @@ export const getCustomTemplateParameterCheckResult = (
helperText
,
helperText
,
}
}
}
}
// 1. 当该输入为必填项时:
// 1.1 若为“启用”状态,则表示该输入的值交由用户在使用时填写。故该输入的节点入口在右侧编辑区内不允许连线,若已有连线则自动将该线删除。
// 1.2 若为“关闭”状态,则表示该输入的值是上一步批算子的结果。故该输入的节点入口在右侧编辑区内必须有连线。(若编辑者没有为该节点入口添加连线,则错误提示“该输入为必填,需在右侧视图编辑区连接输入文件或重新改回“开启”状态”;若连上线了则无需错误提示。)
// 2. 当该输入为选填项时:
// 2.1 若为“启用”状态,则表示该输入的值交由用户在使用时填写。故该输入的节点入口在右侧编辑区内不允许连线,若已有连线则自动将该线删除。
// 2.2 若为“关闭”状态,则表示该输入的值是上一步批算子的结果,又因为其为选填项,所以这线可连可不连,不做限制。
// 输入校验
if
(
parameter
.
parameterGroup
===
"in"
)
{
if
(
parameter
.
required
)
{
if
(
!
parameter
.
hidden
&&
parameter
.
isLine
)
{
return
{
error
,
helperText
,
deleteLine
:
true
,
}
}
else
if
(
!
parameter
.
hidden
&&
!
parameter
.
isLine
)
{
return
{
error
,
helperText
,
deleteLine
:
false
,
}
}
else
if
(
parameter
.
hidden
&&
parameter
.
isLine
)
{
return
{
error
,
helperText
,
deleteLine
:
false
,
}
}
else
if
(
parameter
.
hidden
&&
!
parameter
.
isLine
)
{
return
{
error
:
true
,
helperText
:
'该输入为必填,需在右侧视图编辑区连接输入文件或重新改回“开启”状态”'
,
deleteLine
:
false
,
}
}
}
else
{
if
(
!
parameter
.
hidden
&&
parameter
.
isLine
)
{
return
{
error
,
helperText
,
deleteLine
:
true
,
}
}
else
if
(
!
parameter
.
hidden
&&
!
parameter
.
isLine
)
{
return
{
error
,
helperText
,
deleteLine
:
false
,
}
}
else
if
(
parameter
.
hidden
&&
parameter
.
isLine
)
{
return
{
error
,
helperText
,
deleteLine
:
false
,
}
}
else
if
(
parameter
.
hidden
&&
!
parameter
.
isLine
)
{
return
{
error
,
helperText
,
deleteLine
:
false
,
}
}
}
}
// 表单校验
// 表单校验
if
(
parameter
.
required
)
{
if
(
parameter
.
required
)
{
// 提交任务时不展示
// 提交任务时不展示
...
@@ -35,6 +103,7 @@ export const getCustomTemplateParameterCheckResult = (
...
@@ -35,6 +103,7 @@ export const getCustomTemplateParameterCheckResult = (
helperText
,
helperText
,
};
};
}
}
// isLine
// 有值才做validators旋律校验
// 有值才做validators旋律校验
if
(
parameter
.
defaultValue
)
{
if
(
parameter
.
defaultValue
)
{
if
(
Array
.
isArray
(
parameter
.
validators
))
{
if
(
Array
.
isArray
(
parameter
.
validators
))
{
...
...
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