Commit 9b9cdbe0 authored by chenshouchao's avatar chenshouchao

Merge branch 'feat-20220705-customTemplate' of…

Merge branch 'feat-20220705-customTemplate' of http://120.77.149.83/sunyihao/bkunyun into feat-20220705-customTemplate
parents de4f0a6d 96cf9fc3
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-21 20:03:56
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-07-06 11:55:03
* @LastEditTime: 2022-07-07 10:53:41
* @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -229,7 +229,7 @@ const ProjectSubmitWork = () => {
<div className={styles.swTemplateVersionBox}>
<span className={styles.swHeaderLable}>版本:</span>
<span className={styles.swHeaderValue}>
{templateConfigInfo?.languageVersion}
{templateConfigInfo?.version}
</span>
</div>
<div className={styles.swTemplateUpdateTimeBox}>
......
......@@ -8,10 +8,18 @@
align-items: center;
}
.selectBatchNode {
.doneBatchNode {
border-left: 4px solid #0dd09b;
}
.runBatchNode {
border-left: 4px solid #1370ff;
}
.errorBatchNode {
border-left: 4px solid #ff4e4e;
}
.batchRotate {
transform: translateX(-50%) rotate(-90deg);
}
......
......@@ -61,7 +61,9 @@ const BatchNode = (props: IBatchNode) => {
className={classNames({
[styles.batchNode]: true,
[styles.selectedBatchBox]: selectedStatus,
[styles.selectBatchNode]: selectedStatus,
[styles.runBatchNode]: data.executionStatus === "Running",
[styles.doneBatchNode]: data.executionStatus === "Done",
[styles.errorBatchNode]: data.executionStatus === "Failed",
})}
style={style}
>
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-23 11:00:29
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-07-04 14:26:18
* @LastEditTime: 2022-07-07 11:23:14
* @FilePath: /bkunyun/src/views/Project/components/Flow/interface.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -38,6 +38,8 @@ export interface IBatchNodeData {
selectedStatus?: boolean;
/** 是否校验通过 */
isCheck?: boolean;
/** 运行状态 */
executionStatus: string
}
export interface IBatchNode {
data: IBatchNodeData
......
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