Commit 2d1e0f78 authored by chenshouchao's avatar chenshouchao

fix: 未选择模板时不允许点击添加模板

parent d7fa2b1d
...@@ -83,10 +83,14 @@ const AddTemplate = observer((props: IAddTemplateProps) => { ...@@ -83,10 +83,14 @@ const AddTemplate = observer((props: IAddTemplateProps) => {
}); });
const handleAddTemplate = () => { const handleAddTemplate = () => {
if (selectTemplateData.length === 0) {
Message.error("请选择要添加的模板");
} else {
addTemplate({ addTemplate({
projectId: projectId as string, projectId: projectId as string,
workflowSpecIds: selectTemplateData, workflowSpecIds: selectTemplateData,
}); });
}
}; };
// 添加工作流模板-获取模板列表 // 添加工作流模板-获取模板列表
......
...@@ -45,3 +45,6 @@ ...@@ -45,3 +45,6 @@
background-color: #fff; background-color: #fff;
padding: 24px; padding: 24px;
} }
.saveBox {
width: 390px;
}
...@@ -115,7 +115,7 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -115,7 +115,7 @@ const WorkFlowEdit = observer((props: IProps) => {
}, [id, fetchTemplateConfigInfoRun]); }, [id, fetchTemplateConfigInfoRun]);
// 校验模板名称 // 校验模板名称
const checkTitle = () => { const checkTitle = (title: string) => {
if (!title) { if (!title) {
setTitleHelper({ setTitleHelper({
error: true, error: true,
...@@ -152,7 +152,6 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -152,7 +152,6 @@ const WorkFlowEdit = observer((props: IProps) => {
helperText: helperText:
"新版本号必须大于老版本号,且必须为X.Y.Z格式,XYZ必须为0~99的正整数", "新版本号必须大于老版本号,且必须为X.Y.Z格式,XYZ必须为0~99的正整数",
}); });
return false;
} else if (versionArr[0] === oldversionArr[0]) { } else if (versionArr[0] === oldversionArr[0]) {
if (versionArr[1] < oldversionArr[1]) { if (versionArr[1] < oldversionArr[1]) {
setVersionHelper({ setVersionHelper({
...@@ -160,7 +159,6 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -160,7 +159,6 @@ const WorkFlowEdit = observer((props: IProps) => {
helperText: helperText:
"新版本号必须大于老版本号,且必须为X.Y.Z格式,XYZ必须为0~99的正整数", "新版本号必须大于老版本号,且必须为X.Y.Z格式,XYZ必须为0~99的正整数",
}); });
return false;
} else if (versionArr[1] === oldversionArr[1]) { } else if (versionArr[1] === oldversionArr[1]) {
if (versionArr[2] <= oldversionArr[2]) { if (versionArr[2] <= oldversionArr[2]) {
setVersionHelper({ setVersionHelper({
...@@ -168,26 +166,21 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -168,26 +166,21 @@ const WorkFlowEdit = observer((props: IProps) => {
helperText: helperText:
"新版本号必须大于老版本号,且必须为X.Y.Z格式,XYZ必须为0~99的正整数", "新版本号必须大于老版本号,且必须为X.Y.Z格式,XYZ必须为0~99的正整数",
}); });
return false;
} }
} }
} }
return true;
}; };
// 校验版本号格式 // 校验版本号格式
const checkVersion = (version: string) => { const checkVersion = (version: string) => {
if (oldversion) {
if (!checkNewOldVersion(version, oldversion)) {
return;
}
}
console.log(version);
if (/^[1-9]\d?(\.(0|[1-9]\d?)){2}$/.test(version)) { if (/^[1-9]\d?(\.(0|[1-9]\d?)){2}$/.test(version)) {
setVersionHelper({ setVersionHelper({
error: false, error: false,
helperText: "", helperText: "",
}); });
if (oldversion) {
checkNewOldVersion(version, oldversion);
}
} else { } else {
setVersionHelper({ setVersionHelper({
error: true, error: true,
...@@ -200,7 +193,7 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -200,7 +193,7 @@ const WorkFlowEdit = observer((props: IProps) => {
const handleTitleChange = (e: any) => { const handleTitleChange = (e: any) => {
const title = e.target.value; const title = e.target.value;
setTitle(title); setTitle(title);
checkTitle(); checkTitle(title);
// 格式不正确,必须在15字符以内,仅限大小写字母、数字、中文 // 格式不正确,必须在15字符以内,仅限大小写字母、数字、中文
}; };
...@@ -281,7 +274,7 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -281,7 +274,7 @@ const WorkFlowEdit = observer((props: IProps) => {
// 表单弹窗确定,新建/编辑自定义模板保存 // 表单弹窗确定,新建/编辑自定义模板保存
const handleOncofirm = () => { const handleOncofirm = () => {
checkTitle(); checkTitle(title);
checkVersion(version); checkVersion(version);
if (!titleHelper.error && !versionHelper.error) { if (!titleHelper.error && !versionHelper.error) {
saveUserSpecRun({ saveUserSpecRun({
...@@ -387,7 +380,7 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -387,7 +380,7 @@ const WorkFlowEdit = observer((props: IProps) => {
onClose={handleCloseDialog} onClose={handleCloseDialog}
onConfirm={handleOncofirm} onConfirm={handleOncofirm}
> >
<div> <div className={styles.saveBox}>
<MyInput <MyInput
value={title} value={title}
label="模板名称" label="模板名称"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment