diff --git a/cutejava/README.md b/README.MD similarity index 73% rename from cutejava/README.md rename to README.MD index 907ef08e..6641d630 100644 --- a/cutejava/README.md +++ b/README.MD @@ -52,24 +52,33 @@ https://github.com/odboy-tianjun/cutejava - 存储管理:本地存储、Minio存储 - 服务监控:监控服务器的负载情况 -#### 丰富的自定义组件 +#### 前端基础组件 + +> 组件所在路径:cutejava-front/src/views/components/dev - CuteSimpleTable 简单表格 - CuteDragTable 支持拖拽的表格 - CuteFormDialog 支持表单的对话框 +- CuteRichTextEditor 富文本编辑器 +- CuteOneKeyCopy 一键复制 +- CuteMarkdown Markdown编辑器 +- CuteJavaEditor Java编辑器(已弃用) +- CuteYamlEditor Yaml编辑器(已弃用) +- CuteCodeEditor 多语言编辑器(支持yaml、java、go、swift、dockerfile、groovy、lua、perl、python、ruby、sql、xml、vue) + +#### 前端业务组件 + +> 组件所在路径:cutejava-front/src/views/components/business + +- CuteDeptTree 部门树 +- CuteUserSelect 用户多选框 #### 系统模块 -- cutejava-framework:系统基础框架,提供核心功能,如:权限、数据权限、异常处理、缓存、工具类、接口限流、接口防重、接口幂等。 -- cutejava-system:系统功能模块,提供用户、角色、菜单、部门、岗位、字典、定时任务、邮件、Minio存储、服务监控等功能 -- cutejava-pipeline:流水线模块,参考阿里云云效,提供流水线功能,可配置流水线任务,并支持任务依赖、任务参数、任务参数校验、任务参数回填。 +- cutejava-framework:系统基础框架。提供核心功能,如:权限、数据权限、异常处理、缓存、工具类、接口限流、接口防重、接口幂等。 +- cutejava-system:系统功能模块。提供用户、角色、菜单、部门、岗位、字典、定时任务、邮件、Minio存储、服务监控等功能 +- cutejava-devops:devops模块,已实现流水线功能。参考阿里云云效,提供流水线功能,可配置流水线任务,并支持任务依赖、任务参数、任务参数校验、任务参数回填。 #### 特别鸣谢 -- 感谢 [PanJiaChen](https://github.com/PanJiaChen/vue-element-admin) 大佬提供的前端模板 - -- 感谢 [Moxun](https://github.com/moxun1639) 大佬提供的前端 Curd 通用组件 - -- 感谢 [zhy6599](https://gitee.com/zhy6599) 大佬提供的后端运维管理相关功能 - -- 感谢 [j.yao.SUSE](https://github.com/everhopingandwaiting) 大佬提供的匿名接口与Redis限流等功能 +- 感谢 [elunez](https://github.com/elunez/eladmin-mp) 大佬提供的基础框架 diff --git a/cutejava-front/README.md b/cutejava-front/README.md index 5fe66784..e6e1db9a 100644 --- a/cutejava-front/README.md +++ b/cutejava-front/README.md @@ -61,12 +61,4 @@ https://www.ydyno.com/archives/1219.html #### 特别鸣谢 -- 感谢 [JetBrains](https://www.jetbrains.com/) 提供的非商业开源软件开发授权 - -- 感谢 [PanJiaChen](https://github.com/PanJiaChen/vue-element-admin) 大佬提供的前端模板 - -- 感谢 [Moxun](https://github.com/moxun1639) 大佬提供的前端 Crud 通用组件 - -- 感谢 [zhy6599](https://gitee.com/zhy6599) 大佬提供的后端运维管理相关功能 - -- 感谢 [j.yao.SUSE](https://github.com/everhopingandwaiting) 大佬提供的匿名接口与Redis限流等功能 +- 感谢 [elunez](https://github.com/elunez/eladmin-mp) 大佬提供的基础框架 diff --git a/cutejava-front/src/api/system/dictDetail.js b/cutejava-front/src/api/system/dictDetail.js index cf7aede8..9f83c667 100644 --- a/cutejava-front/src/api/system/dictDetail.js +++ b/cutejava-front/src/api/system/dictDetail.js @@ -3,7 +3,7 @@ import request from '@/utils/request' export function get(dictName) { const params = { page: 1, - size: 999999, + size: 9999999, args: { dictName: dictName } diff --git a/cutejava-front/src/api/system/job.js b/cutejava-front/src/api/system/job.js index dc4ed860..8ed716d0 100644 --- a/cutejava-front/src/api/system/job.js +++ b/cutejava-front/src/api/system/job.js @@ -3,7 +3,7 @@ import request from '@/utils/request' export function queryAllEnableJob() { const params = { page: 1, - size: 999999, + size: 9999999, args: { enabled: true } diff --git a/cutejava-front/src/components/JavaEdit/index.vue b/cutejava-front/src/components/JavaEdit/index.vue deleted file mode 100644 index 7bb78bec..00000000 --- a/cutejava-front/src/components/JavaEdit/index.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - diff --git a/cutejava-front/src/components/WangEditor/index.vue b/cutejava-front/src/components/WangEditor/index.vue deleted file mode 100644 index a5df3392..00000000 --- a/cutejava-front/src/components/WangEditor/index.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - diff --git a/cutejava-front/src/views/components/base/CodemirrorDemo.vue b/cutejava-front/src/views/components/base/CodemirrorDemo.vue deleted file mode 100644 index 3014210c..00000000 --- a/cutejava-front/src/views/components/base/CodemirrorDemo.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/cutejava-front/src/views/components/base/DragTableDemo.vue b/cutejava-front/src/views/components/base/DragTableDemo.vue deleted file mode 100644 index 34d1a9ca..00000000 --- a/cutejava-front/src/views/components/base/DragTableDemo.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/cutejava-front/src/views/components/base/Editor.vue b/cutejava-front/src/views/components/base/Editor.vue deleted file mode 100644 index d84fd845..00000000 --- a/cutejava-front/src/views/components/base/Editor.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - 富文本基于 - wangEditor - - - - - - - - diff --git a/cutejava-front/src/views/components/base/MarkDown.vue b/cutejava-front/src/views/components/base/MarkDown.vue deleted file mode 100644 index 85876a43..00000000 --- a/cutejava-front/src/views/components/base/MarkDown.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - Markdown 基于 - MavonEditor - - - - - - - - diff --git a/cutejava-front/src/views/components/base/YamlEdit.vue b/cutejava-front/src/views/components/base/YamlEdit.vue deleted file mode 100644 index f8079205..00000000 --- a/cutejava-front/src/views/components/base/YamlEdit.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - - Yaml编辑器 基于 - CodeMirror, - 主题预览地址 Theme - - - - - - - - diff --git a/cutejava-front/src/views/components/business/CuteDeptTree.vue b/cutejava-front/src/views/components/business/CuteDeptTree.vue index 6d0f5893..57754cdc 100644 --- a/cutejava-front/src/views/components/business/CuteDeptTree.vue +++ b/cutejava-front/src/views/components/business/CuteDeptTree.vue @@ -43,18 +43,13 @@ export default { currentDept: null } }, - watch: { - // 监听currentDept变量 - currentDept(newValue) { - this.$emit('input', newValue) - } - }, methods: { getDeptData(node, resolve) { const params = {} if (typeof node !== 'object') { if (node) { params['name'] = node + this.$emit('search', node) } } else if (node.level !== 0) { params['pid'] = node.data.id @@ -62,7 +57,7 @@ export default { setTimeout(() => { queryDeptList({ page: 1, - size: 999999, + size: 9999999, args: params }).then(res => { if (resolve) { diff --git a/cutejava-front/src/views/components/business/CuteUserSelect.vue b/cutejava-front/src/views/components/business/CuteUserSelect.vue index 2b5a6829..e4d2a048 100644 --- a/cutejava-front/src/views/components/business/CuteUserSelect.vue +++ b/cutejava-front/src/views/components/business/CuteUserSelect.vue @@ -40,12 +40,6 @@ export default { options: [] } }, - watch: { - // 监听users变量 - users(newValue) { - this.$emit('input', newValue) - } - }, methods: { remoteMethod(query) { if (query !== '') { @@ -66,7 +60,6 @@ export default { }, onChange(value) { this.$emit('change', value) - this.$emit('input', value) } } } diff --git a/cutejava-front/src/views/components/business/DemoShow.vue b/cutejava-front/src/views/components/business/DemoShow.vue deleted file mode 100644 index 7b2e13d8..00000000 --- a/cutejava-front/src/views/components/business/DemoShow.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - 立即创建 - 取消 - - - - - - - - - - - diff --git a/cutejava-front/src/views/components/dev/CuteCodeEditor.vue b/cutejava-front/src/views/components/dev/CuteCodeEditor.vue new file mode 100644 index 00000000..cbb7c962 --- /dev/null +++ b/cutejava-front/src/views/components/dev/CuteCodeEditor.vue @@ -0,0 +1,117 @@ + + + + + + + + + + diff --git a/cutejava-front/src/views/components/dev/CuteDragTable.vue b/cutejava-front/src/views/components/dev/CuteDragTable.vue index dbe2065d..9ff3915d 100644 --- a/cutejava-front/src/views/components/dev/CuteDragTable.vue +++ b/cutejava-front/src/views/components/dev/CuteDragTable.vue @@ -49,11 +49,6 @@ export default { required: true, default: null }, - dataSource: { - type: Array, - required: false, - default: null - }, fetch: { type: Function, required: false, @@ -94,7 +89,7 @@ export default { columns: this.columns && this.columns.length > 0 ? this.columns : [], operateColumn: this.operateColumn, fetchUrl: null, - dataSource: this.dataSource && this.dataSource.length > 0 ? this.dataSource : [], + dataSource: [], onPageChange: (currentPage, pageSize) => { this.pageProps.current = currentPage this.pageProps.pageSize = pageSize @@ -114,11 +109,6 @@ export default { this.initDragTable() }, async initData() { - // 以dataSource属性为准 - if (this.dataSource) { - this.crud.dataSource = this.dataSource - return - } let params = {} // 自定义请求参数 if (this.paramsTransform) { @@ -135,7 +125,7 @@ export default { if (this.responseTransform) { return this.responseTransform(response) } - if (response && response.totalElements && response.content) { + if (response && response.hasOwnProperty('totalElements') && response.hasOwnProperty('content')) { this.pageProps.total = response.totalElements this.crud.dataSource = response.content } diff --git a/cutejava-front/src/views/components/dev/CuteFormDialog.vue b/cutejava-front/src/views/components/dev/CuteFormDialog.vue index a97dc923..bec3bc20 100644 --- a/cutejava-front/src/views/components/dev/CuteFormDialog.vue +++ b/cutejava-front/src/views/components/dev/CuteFormDialog.vue @@ -1,10 +1,19 @@ - - - - - -
- 富文本基于 - wangEditor -
- Markdown 基于 - MavonEditor -
- Yaml编辑器 基于 - CodeMirror, - 主题预览地址 Theme -