Commit db14b59d authored by wuyongsheng's avatar wuyongsheng

Merge branch 'feat-20220718' into 'release'

Feat 20220718

See merge request !40
parents c99d8093 26d8c9b4
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
z-index: 100; z-index: 100;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
animation: showBG 1.1s ease; animation: showBG 0.31s ease;
-webkit-animation: showBG 1.1s ease; -webkit-animation: showBG 0.31s ease;
} }
.drawerBoxHidden { .drawerBoxHidden {
animation: hiddenBG 1.1s ease; animation: hiddenBG 0.31s ease;
-webkit-animation: hiddenBG 1.1s ease; -webkit-animation: hiddenBG 0.31s ease;
} }
.closeBox { .closeBox {
display: flex; display: flex;
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
top: 0; top: 0;
left: 0; left: 0;
align-items: center; align-items: center;
animation: showClose 1.1s ease; animation: showClose 0.31s ease;
-webkit-animation: showClose 1.1s ease; -webkit-animation: showClose 0.31s ease;
} }
.closeBoxHidden { .closeBoxHidden {
animation: hiddenClose 1.1s ease; animation: hiddenClose 0.31s ease;
-webkit-animation: hiddenClose 1.1s ease; -webkit-animation: hiddenClose 0.31s ease;
} }
.closeiIcon { .closeiIcon {
position: absolute; position: absolute;
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
/* padding: 24px 32px; */ /* padding: 24px 32px; */
box-sizing: border-box; box-sizing: border-box;
overflow: scroll; overflow: scroll;
animation: showDrawer 1.1s ease; animation: showDrawer 0.31s ease;
-webkit-animation: showDrawer 1.1s ease; -webkit-animation: showDrawer 0.31s ease;
} }
.contentBoxHidden { .contentBoxHidden {
animation: hiddenDrawer 1.1s ease; animation: hiddenDrawer 0.31s ease;
-webkit-animation: hiddenDrawer 1.1s ease; -webkit-animation: hiddenDrawer 0.31s ease;
} }
@keyframes showBG { @keyframes showBG {
......
...@@ -18,7 +18,7 @@ const FullScreenDrawer = (props: IFullScreenDrawerProps) => { ...@@ -18,7 +18,7 @@ const FullScreenDrawer = (props: IFullScreenDrawerProps) => {
setTimeout(() => { setTimeout(() => {
setCloseing(false); setCloseing(false);
handleClose(); handleClose();
}, 1000); }, 300);
}; };
return ( return (
<div <div
......
...@@ -8,66 +8,66 @@ ...@@ -8,66 +8,66 @@
*/ */
type IType = "BATCH" | "FLOW"; type IType = "BATCH" | "FLOW";
export interface IParameter { export interface IParameter {
hidden: boolean; hidden: boolean; // 使用模板时是否展示 true 不展示 用户不需要填写
id?: string; id?: string;
name: string; name: string; // 参数名称
required: boolean; required: boolean; // 是否必填
defaultValue: any; defaultValue: any; // 默认值
domType: IDomType; domType: IDomType; // 前端组件类型
classType: string; classType: string; // 后端数据类型
classTypeName: string; classTypeName: string; // 前端展示的数据类型 classType对应的描述
value: any; value: any; // 值
description: string; description: string; // 该参数的描述、解释
language: string; language: string; //
languageVersion: string; languageVersion: string; //
tags: Array<string>; tags: Array<string>;
source: string; source: string;
productId: string; productId: string;
// tasks: ITask[]; // tasks: ITask[];
linked?: boolean; linked?: boolean;
validators: Array<IValidator>; validators: Array<IValidator>; // 校验方式的数组, 有正则和对应的提示语
choices: Array<IChoice>; choices: Array<IChoice>; // 提供给用户选择的选项组
error?: boolean; error?: boolean; // 表单校验是否通过
helperText?: string; helperText?: string; // 表单校验提示文案
parameterGroup?: string; parameterGroup?: string; //
} }
export type IExecutionStatus = "Pending" | "Running" | "Done" | "Failed"; export type IExecutionStatus = "Pending" | "Running" | "Done" | "Failed";
export interface ITask { export interface ITask {
id: string; id: string;
title: string; title: string; // 批流算子名称
description: string; description: string; // 描述
version?: string; version?: string; // 版本
allVersions?: string[] allVersions?: string[]; // 全部版本
position: { position: { // 流程图位置信息
x: number; x: number;
y: number; y: number;
}; };
tags?: string[]; tags?: string[];
type: IType | string; type: IType | string; // 算子类型(批算子、流算子)
parentNode?: string; parentNode?: string; //
parameters: Array<IParameter>; parameters: Array<IParameter>; // 参数组
edges: Array<IEdge>; edges: Array<IEdge>;
isCheck?: boolean; isCheck?: boolean; // 表单校验是否通过
executionStatus?: IExecutionStatus; executionStatus?: IExecutionStatus; // 算子的状态
} }
export interface ITemplateConfig { export interface ITemplateConfig { // 模板信息
title: string; title: string; // 标题
version: string; version: string; // 版本
updateTime?: string; updateTime?: string; // 更新时间
description: string; description: string; // 模板描述
language: string; language: string;
languageVersion: string; languageVersion: string;
tags: Array<string>; tags: Array<string>;
source: string; source: string;
productId: string; productId: string; // 产品id
tasks: ITask[]; tasks: ITask[]; // 算子组
id: string; id: string;
} }
export type IDomType = export type IDomType = // 前端组件类型
| "path" | "path"
| "dataset" | "dataset"
| "file" | "file"
...@@ -78,12 +78,12 @@ export type IDomType = ...@@ -78,12 +78,12 @@ export type IDomType =
| "checkbox"; | "checkbox";
// 待定 // 待定
export type IValidator = { export type IValidator = { // 表单校验中的一项
regex: string; regex: string;
message: string; message: string;
}; };
export interface IChoice { export interface IChoice { // 表单选项中的一项
label: string; label: string;
value: string; value: string;
} }
...@@ -98,7 +98,7 @@ export interface IEdge { ...@@ -98,7 +98,7 @@ export interface IEdge {
} }
// 提交任务时的动态表单的数据结构 // 提交任务时的动态表单的数据结构
export type IRenderTasks = Array<IRenderTask>; export type IRenderTasks = Array<IRenderTask>; // 将批算子、流算子、批算子下的流算子混合在一起的一维数组转换成批算子、流算子的二维数组
export type IRenderTask = { export type IRenderTask = {
id: string; id: string;
title: string; title: string;
...@@ -114,18 +114,19 @@ export type IRenderTask = { ...@@ -114,18 +114,19 @@ export type IRenderTask = {
isCheck: boolean; // 里面的子项表单校验是否全部通过 isCheck: boolean; // 里面的子项表单校验是否全部通过
}; };
// 工作流详情
export interface ITaskInfo extends ITemplateConfig { export interface ITaskInfo extends ITemplateConfig {
name: string; name: string; // 任务(工作流)名称
outputPath: string; outputPath: string; // 任务结果 输出文件路径
state: IState; state: IState; // 任务状态
specTitle: string; specTitle: string; // 源模板
specVersion: string; specVersion: string; // 源模板版本
jobCost: string; jobCost: string; // 花费(元)
creator: string; creator: string; // 创建人
createTime: string; createTime: string; // 创建时间
costTime: string; costTime: string; // 运行时间
logPath: string; logPath: string; // 日志文件
outputs?: any; outputs?: any; // 结果文件
} }
type IState = "SUCCEEDED" | "RUNNING" | "ABORTED" | "FAILED"; type IState = "SUCCEEDED" | "RUNNING" | "ABORTED" | "FAILED";
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