perf: 阶段、任务、步骤全面支持拖动排序

pull/189/head
xiaojunnuo 2024-09-05 10:47:03 +08:00
parent 1e9b5638aa
commit bd73a163cd
3 changed files with 320 additions and 248 deletions

View File

@ -22,15 +22,14 @@ h1, h2, h3, h4, h5, h6 {
margin-bottom: 0; margin-bottom: 0;
} }
.fs-desc{ .fs-desc {
font-size: 12px; font-size: 12px;
color:#888888; color: #888888;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
} }
.ant-btn-link { .ant-btn-link {
height: 24px; height: 24px;
} }
@ -45,75 +44,88 @@ h1, h2, h3, h4, h5, h6 {
vertical-align: 0 !important; vertical-align: 0 !important;
} }
.pointer{ .pointer {
cursor: pointer; cursor: pointer;
} }
.flex-center{ .flex-center {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.flex-o{
.flex-o {
display: flex !important; display: flex !important;
align-items: center; align-items: center;
} }
.flex{ .flex {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.flex-1{ .flex-1 {
flex: 1; flex: 1;
} }
.mb-2{ .mb-2 {
margin-bottom:2px; margin-bottom: 2px;
}
.ml-5{
margin-left:5px;
}
.ml-10{
margin-left:10px;
}
.ml-20{
margin-left:20px;
}
.ml-15{
margin-left:15px;
} }
.mr-5{ .ml-5 {
margin-left: 5px;
}
.ml-10 {
margin-left: 10px;
}
.ml-20 {
margin-left: 20px;
}
.ml-15 {
margin-left: 15px;
}
.mr-5 {
margin-right: 5px; margin-right: 5px;
} }
.mr-10{
.mr-10 {
margin-right: 10px; margin-right: 10px;
} }
.mr-20{
.mr-20 {
margin-right: 20px; margin-right: 20px;
} }
.mr-15{
.mr-15 {
margin-right: 15px; margin-right: 15px;
} }
.mt-5{
margin-top:5px; .mt-5 {
} margin-top: 5px;
.mt-10{
margin-top:10px;
}
.mb-10{
margin-bottom: 10px;
}
.m-10{
margin:10px;
} }
.p-5{ .mt-10 {
padding:5px; margin-top: 10px;
} }
.p-10{
padding:10px; .mb-10 {
margin-bottom: 10px;
}
.m-10 {
margin: 10px;
}
.p-5 {
padding: 5px;
}
.p-10 {
padding: 10px;
} }
.ellipsis { .ellipsis {
@ -122,18 +134,31 @@ h1, h2, h3, h4, h5, h6 {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.w-100{ .w-100 {
width: 100%; width: 100%;
} }
.block-header{ .block-header {
margin:3px; margin: 3px;
padding-top: 15px; padding-top: 15px;
padding-bottom:3px; padding-bottom: 3px;
border-bottom: 1px solid #dedede; border-bottom: 1px solid #dedede;
} }
.color-blue{ .color-blue {
color: #1890ff; color: #1890ff;
}
.icon-box {
display: inline-flex;
align-items: center;
justify-content: center;
.fs-icon {
display: flex;
align-items: center;
justify-content: center;
}
} }

View File

@ -43,7 +43,7 @@
<a-button type="primary" @click="stepAdd(currentTask)"></a-button> <a-button type="primary" @click="stepAdd(currentTask)"></a-button>
</template> </template>
</a-descriptions> </a-descriptions>
<v-draggable v-model="currentTask.steps" class="step-list" handle=".handle"> <v-draggable v-model="currentTask.steps" class="step-list" handle=".handle" item-key="id">
<template #item="{ element, index }"> <template #item="{ element, index }">
<div class="step-row"> <div class="step-row">
<div class="text"> <div class="text">

View File

@ -20,192 +20,204 @@
<div class="layout-left"> <div class="layout-left">
<div class="pipeline-container"> <div class="pipeline-container">
<div class="pipeline"> <div class="pipeline">
<div class="stages"> <v-draggable v-model="pipeline.stages" class="stages" item-key="id" handle=".stage-move-handle">
<div class="stage first-stage"> <template #header>
<div class="title"> <div class="stage first-stage">
<pi-editable model-value="" :disabled="true" /> <div class="title stage-move-handle">
</div> <pi-editable model-value="" :disabled="true" />
<div class="tasks">
<div class="task-container first-task">
<div class="line">
<div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" type="primary" @click="run()">
<fs-icon icon="ion:play"></fs-icon>
手动触发
</a-button>
</div>
</div> </div>
<div v-for="(trigger, index) of pipeline.triggers" :key="trigger.id" class="task-container"> <div class="tasks">
<div class="line"> <div class="task-container first-task">
<div class="flow-line"></div> <div class="line line-right">
</div>
<div class="task">
<a-button shape="round" @click="triggerEdit(trigger, index)">
<fs-icon icon="ion:time"></fs-icon>
{{ trigger.title }}
</a-button>
</div>
</div>
<div v-if="editMode" class="task-container is-add">
<div class="line">
<div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" type="dashed" @click="triggerAdd">
<fs-icon icon="ion:add-circle-outline"></fs-icon>
触发源定时
</a-button>
</div>
</div>
</div>
</div>
<div v-for="(stage, index) of pipeline.stages" :key="stage.id" class="stage" :class="{ 'last-stage': isLastStage(index) }">
<div class="title">
<pi-editable v-model="stage.title" :disabled="!editMode"></pi-editable>
</div>
<v-draggable v-model="stage.tasks" item-key="id" class="tasks" handle=".handle">
<template #item="{ element: task, index: taskIndex }">
<div
class="task-container"
:class="{
'first-task': taskIndex === 0
}"
>
<div class="line">
<div class="flow-line"></div> <div class="flow-line"></div>
<fs-icon v-if="editMode" class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd(index)"></fs-icon>
</div> </div>
<div class="task"> <div class="task">
<a-button shape="round" @click="taskEdit(stage, index, task, taskIndex)"> <a-button shape="round" type="primary" @click="run()">
<a-popover title="步骤" :trigger="editMode ? 'none' : 'hover'"> <fs-icon icon="ion:play"></fs-icon>
<!-- :open="true"--> 手动触发
<template #content>
<div v-for="(item, index) of task.steps" class="flex-o w-100">
<span class="ellipsis flex-1">{{ index + 1 }}. {{ item.title }} </span>
<pi-status-show v-if="!editMode" :status="item.status?.result"></pi-status-show>
<fs-icon
v-if="!editMode"
class="pointer color-blue ml-2"
title="重新运行此步骤"
icon="SyncOutlined"
@click="run(item.id)"
></fs-icon>
</div>
</template>
<span class="flex-o w-100">
<span class="ellipsis flex-1 task-title" :class="{ 'in-edit': editMode }">{{ task.title }}</span>
<pi-status-show :status="task.status?.result"></pi-status-show>
</span>
</a-popover>
</a-button> </a-button>
<fs-icon
v-if="editMode"
class="action copy"
title="复制"
icon="ion:copy-outline"
@click="taskCopy(stage, index, task)"
></fs-icon>
<fs-icon v-if="editMode" class="handle action drag" title="拖动排序" icon="ion:move-outline"></fs-icon>
</div> </div>
</div> </div>
</template> <div v-for="(trigger, index) of pipeline.triggers" :key="trigger.id" class="task-container">
<template #footer> <div class="line line-right">
<div v-if="editMode" class="task-container is-add">
<div class="line">
<div class="flow-line"></div> <div class="flow-line"></div>
</div> </div>
<div class="task"> <div class="task">
<a-tooltip> <a-button shape="round" @click="triggerEdit(trigger, index)">
<a-button type="dashed" shape="round" @click="taskAdd(stage, index)"> <fs-icon icon="ion:time"></fs-icon>
<fs-icon class="font-20" icon="ion:add-circle-outline"></fs-icon> {{ trigger.title }}
并行任务 </a-button>
</a-button>
</a-tooltip>
</div> </div>
</div> </div>
</template>
</v-draggable>
</div>
<div v-if="editMode" class="stage last-stage"> <div v-if="editMode" class="task-container is-add">
<div class="title"> <div class="line line-right">
<pi-editable model-value="" :disabled="true" /> <div class="flow-line"></div>
</div> </div>
<div class="tasks"> <div class="task">
<div class="task-container first-task"> <a-button shape="round" type="dashed" @click="triggerAdd">
<div class="line"> <fs-icon icon="ion:add-circle-outline"></fs-icon>
<div class="flow-line"></div> 触发源定时
<fs-icon class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd()"></fs-icon> </a-button>
</div> </div>
<div class="task">
<a-button shape="round" type="dashed" @click="stageAdd()">
<fs-icon icon="ion:add-circle-outline"></fs-icon>
添加任务
</a-button>
</div> </div>
</div> </div>
<div class="task-container"> </div>
<div class="line"> </template>
<div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" type="dashed" @click="notificationAdd()">
<fs-icon icon="ion:add-circle-outline"></fs-icon>
添加通知 <template #item="{ element: stage, index }">
</a-button> <div :key="stage.id" class="stage" :class="{ 'last-stage': isLastStage(index) }">
<div class="title">
<pi-editable v-model="stage.title" :disabled="!editMode"></pi-editable>
<div class="icon-box stage-move-handle">
<fs-icon v-if="editMode" title="拖动排序" icon="ion:move-outline"></fs-icon>
</div> </div>
</div> </div>
<div v-for="(item, ii) of pipeline.notifications" :key="ii" class="task-container"> <v-draggable v-model="stage.tasks" item-key="id" class="tasks" group="task" handle=".task-move-handle">
<div class="line"> <template #item="{ element: task, index: taskIndex }">
<div class="flow-line"></div> <div
</div> class="task-container"
<div class="task"> :class="{
<a-button shape="round" @click="notificationEdit(item, ii as number)"> 'first-task': taskIndex === 0
<fs-icon icon="ion:notifications"></fs-icon> }"
通知 {{ item.type }} >
</a-button> <div class="line line-left">
</div> <div class="flow-line"></div>
<fs-icon v-if="editMode" class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd(index)"></fs-icon>
</div>
<div class="line line-right">
<div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" @click="taskEdit(stage, index, task, taskIndex)">
<a-popover title="步骤" :trigger="editMode ? 'none' : 'hover'">
<!-- :open="true"-->
<template #content>
<div v-for="(item, index) of task.steps" class="flex-o w-100">
<span class="ellipsis flex-1">{{ index + 1 }}. {{ item.title }} </span>
<pi-status-show v-if="!editMode" :status="item.status?.result"></pi-status-show>
<fs-icon
v-if="!editMode"
class="pointer color-blue ml-2"
title="重新运行此步骤"
icon="SyncOutlined"
@click="run(item.id)"
></fs-icon>
</div>
</template>
<span class="flex-o w-100">
<span class="ellipsis flex-1 task-title" :class="{ 'in-edit': editMode }">{{ task.title }}</span>
<pi-status-show :status="task.status?.result"></pi-status-show>
</span>
</a-popover>
</a-button>
<div class="icon-box action copy">
<fs-icon v-if="editMode" title="复制" icon="ion:copy-outline" @click="taskCopy(stage, index, task)"></fs-icon>
</div>
<div class="icon-box task-move-handle action drag">
<fs-icon v-if="editMode" title="拖动排序" icon="ion:move-outline"></fs-icon>
</div>
</div>
</div>
</template>
<template #footer>
<div v-if="editMode" class="task-container is-add">
<div class="line line-left">
<div class="flow-line"></div>
</div>
<div class="line line-right">
<div class="flow-line"></div>
</div>
<div class="task">
<a-tooltip>
<a-button type="dashed" shape="round" @click="taskAdd(stage, index)">
<fs-icon class="font-20" icon="ion:add-circle-outline"></fs-icon>
并行任务
</a-button>
</a-tooltip>
</div>
</div>
</template>
</v-draggable>
</div>
</template>
<template #footer>
<div v-if="editMode" class="stage last-stage">
<div class="title">
<pi-editable model-value="" :disabled="true" />
</div> </div>
</div> <div class="tasks">
</div> <div class="task-container first-task">
<div v-else class="stage last-stage"> <div class="line line-left">
<div class="title"> <div class="flow-line"></div>
<pi-editable model-value="" :disabled="true" /> <fs-icon class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd()"></fs-icon>
</div> </div>
<div v-if="pipeline.notifications?.length > 0" class="tasks"> <div class="task">
<div v-for="(item, index) of pipeline.notifications" :key="index" class="task-container" :class="{ 'first-task': index == 0 }"> <a-button shape="round" type="dashed" @click="stageAdd()">
<div class="line"> <fs-icon icon="ion:add-circle-outline"></fs-icon>
<div class="flow-line"></div> 添加任务
</a-button>
</div>
</div> </div>
<div class="task"> <div class="task-container">
<a-button shape="round" @click="notificationEdit(item, index)"> <div class="line line-left">
<fs-icon icon="ion:notifications"></fs-icon> <div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" type="dashed" @click="notificationAdd()">
<fs-icon icon="ion:add-circle-outline"></fs-icon>
通知 {{ item.type }} 添加通知
</a-button> </a-button>
</div>
</div>
<div v-for="(item, ii) of pipeline.notifications" :key="ii" class="task-container">
<div class="line line-left">
<div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" @click="notificationEdit(item, ii as number)">
<fs-icon icon="ion:notifications"></fs-icon>
通知 {{ item.type }}
</a-button>
</div>
</div> </div>
</div> </div>
</div> </div>
<div v-else class="tasks"> <div v-else class="stage last-stage">
<div class="task-container first-task"> <div class="title">
<div class="line"> <pi-editable model-value="" :disabled="true" />
<div class="flow-line"></div> </div>
<div v-if="pipeline.notifications?.length > 0" class="tasks">
<div v-for="(item, index) of pipeline.notifications" :key="index" class="task-container" :class="{ 'first-task': index == 0 }">
<div class="line line-left">
<div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" @click="notificationEdit(item, index)">
<fs-icon icon="ion:notifications"></fs-icon>
通知 {{ item.type }}
</a-button>
</div>
</div> </div>
<div class="task"> </div>
<a-button shape="round" type="dashed"> <div v-else class="tasks">
<fs-icon icon="ion:notifications"></fs-icon> <div class="task-container first-task">
通知未设置 <div class="line line-left">
</a-button> <div class="flow-line"></div>
</div>
<div class="task">
<a-button shape="round" type="dashed">
<fs-icon icon="ion:notifications"></fs-icon>
通知未设置
</a-button>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </template>
</div> </v-draggable>
</div> </div>
</div> </div>
</div> </div>
@ -715,39 +727,39 @@ export default defineComponent({
.title { .title {
padding: 20px; padding: 20px;
color: gray; color: gray;
} display: flex;
&.first-stage { .stage-move-handle {
.line { cursor: move;
width: 50% !important; margin-left: 4px;
.flow-line {
border-left: 0;
}
} }
} }
&.last-stage { //.sortable-ghost {
.line { // .line {
width: 50% !important; // visibility: hidden;
left: 0; // }
right: auto; //}
.flow-line {
border-right: 0;
}
.add-stage-btn {
visibility: hidden;
}
}
}
.line { .line {
height: 50px; height: 50px;
position: absolute; position: absolute;
top: -25px; top: -25px;
right: 0; width: 25px;
width: 100%;
&.line-left {
left: 25px;
.flow-line {
border-right: 0;
}
}
&.line-right {
right: 25px;
.flow-line {
border-left: 0;
}
}
.flow-line { .flow-line {
height: 100%; height: 100%;
margin-left: 28px;
margin-right: 28px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
border-top: 0; border-top: 0;
} }
@ -766,6 +778,52 @@ export default defineComponent({
} }
} }
.task-container:first-child {
.line {
width: 50px;
&.line-left {
left: 0;
.flow-line {
border-right: 0;
border-left: 0;
}
}
&.line-right {
right: 0;
.flow-line {
border-left: 0;
border-right: 0;
}
}
.add-stage-btn {
visibility: visible;
}
}
}
&.first-stage {
.line {
.flow-line {
border-left: 0;
}
}
}
&.last-stage {
.line {
width: 50% !important;
right: auto;
.flow-line {
border-right: 0;
}
.add-stage-btn {
visibility: hidden;
}
}
}
.tasks { .tasks {
.task-container { .task-container {
width: 100%; width: 100%;
@ -775,18 +833,6 @@ export default defineComponent({
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: relative; position: relative;
&.first-task {
.line {
.flow-line {
margin: 0;
border-left: 0;
border-right: 0;
}
.add-stage-btn {
visibility: visible;
}
}
}
.task { .task {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -816,6 +862,7 @@ export default defineComponent({
} }
&.drag { &.drag {
right: 60px; right: 60px;
cursor: move;
} }
} }