diff --git a/README.MD b/README.MD index 32f9276a..9e2fb734 100644 --- a/README.MD +++ b/README.MD @@ -72,8 +72,13 @@ https://github.com/odboy-tianjun/cutejava - CuteDeptTree 部门树 - CuteUserSelect 用户多选框 +  - CuteFileUpload 上传文件到OSS, 必须结合Minio使用(上传完成后必须销毁组件) +  - CuteFileDragUpload 支持拖拽上传文件到OSS, 必须结合Minio使用(上传完成后必须销毁组件) +  +- CutePipelineNode 流水线节点组件 +  #### 系统模块 diff --git a/cutejava-front/README.md b/cutejava-front/README.md index e6e1db9a..5141af4b 100644 --- a/cutejava-front/README.md +++ b/cutejava-front/README.md @@ -6,19 +6,6 @@ 模板文档: [https://panjiachen.github.io/vue-element-admin-site/zh/guide/](https://panjiachen.github.io/vue-element-admin-site/zh/guide/) -#### 集成、自定义组件 -- echart 图表 -- wangEditor 富文本 -- MavonEditor Markdown编辑器 -- CodeMirror Yaml编辑器 -- CodeMirror Java代码编辑器 -- 自定义业务组件(用户下拉选择框、部门下拉选择框) -- 滚动数字 -- 表格拖拽 -- 面板分割 -- WebSocket -- 快速复制 - ## 快速开始 ### 环境要求 diff --git a/cutejava-front/package.json b/cutejava-front/package.json index 96452153..a28f031d 100644 --- a/cutejava-front/package.json +++ b/cutejava-front/package.json @@ -42,6 +42,7 @@ "clipboard": "2.0.4", "codemirror": "^5.49.2", "core-js": "^2.6.12", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "echarts-wordcloud": "^1.1.3", "element-ui": "^2.15.8", diff --git a/cutejava-front/src/utils/index.js b/cutejava-front/src/utils/index.js index 7f5c1ee6..fddc3a65 100644 --- a/cutejava-front/src/utils/index.js +++ b/cutejava-front/src/utils/index.js @@ -2,6 +2,8 @@ * Created by PanJiaChen on 16/11/18. */ +import dayjs from 'dayjs' + /** * Parse the time to string * @param {(Object|string|number)} time @@ -373,3 +375,11 @@ export const type = (value) => Object.prototype.toString.call(value).slice(8, -1 // 深拷贝对象 export const deepClone = (obj) => JSON.parse(JSON.stringify(obj)) + +// 格式化日期时间字符串 +export const formatDateTimeStr = (date) => { + if (date) { + return dayjs(date).format('YYYY-MM-DD HH:mm:ss') + } + return '' +} diff --git a/cutejava-front/src/views/components/dev/CutePipelineNode.vue b/cutejava-front/src/views/components/dev/CutePipelineNode.vue new file mode 100644 index 00000000..2fc37066 --- /dev/null +++ b/cutejava-front/src/views/components/dev/CutePipelineNode.vue @@ -0,0 +1,297 @@ + + + + + + + + + + + {{ templateData.name }} + + + + + {{ templateData.currentNode }} + + + + + + + + + 重试 + + + + + + + + {{ buttonItem.title }} + + + + + + + + {{ buttonItem.title }} + + + + + + + + + + + {{ executeTimeStr }} + + + + + + + 这里是明细 + + + + + + + diff --git a/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue b/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue new file mode 100644 index 00000000..82c3b16f --- /dev/null +++ b/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue @@ -0,0 +1,64 @@ + + + + + + + + + + diff --git a/cutejava-front/src/views/componentsDemo/CuteFileDragUploadDemo.vue b/cutejava-front/src/views/componentsDemo/CuteFileDragUploadDemo.vue new file mode 100644 index 00000000..de4c1cd0 --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/CuteFileDragUploadDemo.vue @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + 提 交 + + + + + + + diff --git a/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue b/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue new file mode 100644 index 00000000..3862010d --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue @@ -0,0 +1,633 @@ + + + 演示:运行中 + + + + + + + + + 演示:成功 + + + + + + + + + 演示:失败或重试 + + + + + + + + + + + + + + diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java index 37455cb9..67a8962b 100644 --- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java +++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/constant/pipeline/PipelineStatusEnum.java @@ -9,7 +9,7 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum PipelineStatusEnum { - WAIT("wait", "#C0C4CC", "未开始"), + PENDING("pending", "#C0C4CC", "未开始"), RUNNING("running", "#409EFF", "运行中"), SUCCESS("success", "#67C23A", "执行成功"), FAIL("fail", "#F56C6C", "执行失败"); diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java index 151f5276..864920d9 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/pipeline/PipelineReleaseTests.java @@ -57,7 +57,7 @@ public class PipelineReleaseTests { pipelineInstanceTb.setType(pipelineTemplateTb.getType()); pipelineInstanceTb.setAppName(appName); pipelineInstanceTb.setEnv(envCode); - pipelineInstanceTb.setStatus(PipelineStatusEnum.WAIT.getCode()); + pipelineInstanceTb.setStatus(PipelineStatusEnum.PENDING.getCode()); pipelineInstanceTb.setCurrentNode(null); pipelineInstanceTb.setCurrentNodeStatus(null); pipelineInstanceTb.setContext(JSON.toJSONString(context)); diff --git a/doc/images/CuteBusiness.png b/doc/images/CuteBusiness.png new file mode 100644 index 00000000..95445b5f Binary files /dev/null and b/doc/images/CuteBusiness.png differ diff --git a/doc/images/CuteFileDragUpload.png b/doc/images/CuteFileDragUpload.png new file mode 100644 index 00000000..aae6a418 Binary files /dev/null and b/doc/images/CuteFileDragUpload.png differ diff --git a/doc/images/CuteFileUpload.png b/doc/images/CuteFileUpload.png new file mode 100644 index 00000000..98abcdfb Binary files /dev/null and b/doc/images/CuteFileUpload.png differ diff --git a/doc/images/CutePipelineNode.png b/doc/images/CutePipelineNode.png new file mode 100644 index 00000000..9a90acf8 Binary files /dev/null and b/doc/images/CutePipelineNode.png differ