diff --git a/cutejava-front/src/api/system/dict.js b/cutejava-front/src/api/system/dict.js index 1d6ff114..e0baf34e 100644 --- a/cutejava-front/src/api/system/dict.js +++ b/cutejava-front/src/api/system/dict.js @@ -24,4 +24,12 @@ export function edit(data) { }) } -export default { add, edit, del } +export function queryPageDict(data) { + return request({ + url: 'api/dict', + method: 'post', + data: data + }) +} + +export default { add, edit, del, queryPageDict } diff --git a/cutejava-front/src/api/system/qiniu.js b/cutejava-front/src/api/system/qiniu.js deleted file mode 100644 index 2c4f6935..00000000 --- a/cutejava-front/src/api/system/qiniu.js +++ /dev/null @@ -1,39 +0,0 @@ -import request from '@/utils/request' - -export function queryQiniuConfig() { - return request({ - url: 'api/qiNiuContent/queryQiniuConfig', - method: 'post' - }) -} - -export function modifyQiniuConfig(data) { - return request({ - url: 'api/qiNiuContent/modifyQiniuConfig', - method: 'post', - data: data - }) -} - -export function createFilePreviewUrl(id) { - return request({ - url: 'api/qiNiuContent/createFilePreviewUrl/' + id, - method: 'get' - }) -} - -export function sync() { - return request({ - url: 'api/qiNiuContent/synchronize', - method: 'post' - }) -} - -export function del(ids) { - return request({ - url: 'api/qiNiuContent/removeFileByIds', - method: 'post', - data: ids - }) -} -export default { del, createFilePreviewUrl, sync } diff --git a/cutejava-front/src/utils/myUtil.js b/cutejava-front/src/utils/myUtil.js index 243c9580..972aa3cf 100644 --- a/cutejava-front/src/utils/myUtil.js +++ b/cutejava-front/src/utils/myUtil.js @@ -75,9 +75,49 @@ const LabelUtil = { } } +const DateUtil = { + formatDate: function(originVal) { + if (originVal === undefined) { + return '' + } + const dt = new Date(originVal) + const y = dt.getFullYear() + const m = (dt.getMonth() + 1 + '').padStart(2, '0') + const d = (dt.getDate() + '').padStart(2, '0') + return `${y}-${m}-${d}` + }, + formatDateTime: function(originVal) { + if (originVal === undefined) { + return '' + } + const dt = new Date(originVal) + const y = dt.getFullYear() + const m = (dt.getMonth() + 1 + '').padStart(2, '0') + const d = (dt.getDate() + '').padStart(2, '0') + const hh = (dt.getHours() + '').padStart(2, '0') + const mm = (dt.getMinutes() + '').padStart(2, '0') + const ss = (dt.getSeconds() + '').padStart(2, '0') + return `${y}-${m}-${d} ${hh}:${mm}:${ss}` + }, + formatRowDateTime: function(row, column, cellValue, index) { + if (cellValue === undefined) { + return '' + } + const dt = new Date(cellValue) + const y = dt.getFullYear() + const m = (dt.getMonth() + 1 + '').padStart(2, '0') + const d = (dt.getDate() + '').padStart(2, '0') + const hh = (dt.getHours() + '').padStart(2, '0') + const mm = (dt.getMinutes() + '').padStart(2, '0') + const ss = (dt.getSeconds() + '').padStart(2, '0') + return `${y}-${m}-${d} ${hh}:${mm}:${ss}` + } +} + export { PermissionUtil, StringUtil, ObjectUtil, - LabelUtil + LabelUtil, + DateUtil } diff --git a/cutejava-front/src/views/components/dev/CuteFormDialog.vue b/cutejava-front/src/views/components/dev/CuteFormDialog.vue new file mode 100644 index 00000000..a97dc923 --- /dev/null +++ b/cutejava-front/src/views/components/dev/CuteFormDialog.vue @@ -0,0 +1,72 @@ + + + + diff --git a/cutejava-front/src/views/components/dev/CuteTable.vue b/cutejava-front/src/views/components/dev/CuteTable.vue new file mode 100644 index 00000000..762e30c3 --- /dev/null +++ b/cutejava-front/src/views/components/dev/CuteTable.vue @@ -0,0 +1,146 @@ + + + + diff --git a/cutejava-front/src/views/cuteTableDemo.vue b/cutejava-front/src/views/cuteTableDemo.vue new file mode 100644 index 00000000..df14e63f --- /dev/null +++ b/cutejava-front/src/views/cuteTableDemo.vue @@ -0,0 +1,162 @@ + + + + diff --git a/cutejava-front/src/views/demo.vue b/cutejava-front/src/views/demo.vue deleted file mode 100644 index 5669f5c9..00000000 --- a/cutejava-front/src/views/demo.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - diff --git a/cutejava/README.md b/cutejava/README.md index 6a2ef268..696400d8 100644 --- a/cutejava/README.md +++ b/cutejava/README.md @@ -49,13 +49,18 @@ https://github.com/odboy-tianjun/cutejava - SQL监控:采用druid 监控数据库访问性能,默认用户名admin,密码123456 - 定时任务:整合Quartz做定时任务,加入任务日志,任务运行情况一目了然 - 邮件工具:配合富文本,发送html格式的邮件 -- 七牛云存储:可同步七牛云存储的数据到系统,无需登录七牛云直接操作云数据 +- 存储管理:本地存储、Minio存储 - 服务监控:监控服务器的负载情况 +#### 丰富的自定义组件 + +- CuteTable +- CuteFormDialog + #### 系统模块 -- cutejava-framework:系统基础框架,提供核心功能,如:权限、数据权限、异常处理、日志、缓存、工具类、代码生成器、接口限流、接口防重、接口幂等。 -- cutejava-system:系统功能模块,提供用户、角色、菜单、部门、岗位、字典、日志、定时任务、邮件、七牛云存储、服务监控等功能 +- cutejava-framework:系统基础框架,提供核心功能,如:权限、数据权限、异常处理、缓存、工具类、接口限流、接口防重、接口幂等。 +- cutejava-system:系统功能模块,提供用户、角色、菜单、部门、岗位、字典、定时任务、邮件、Minio存储、服务监控等功能 - cutejava-pipeline:流水线模块,参考阿里云云效,提供流水线功能,可配置流水线任务,并支持任务依赖、任务参数、任务参数校验、任务参数回填。 #### 特别鸣谢