diff --git a/cutejava-front/src/views/components/base/ClipboardDemo.vue b/cutejava-front/src/views/components/base/ClipboardDemo.vue deleted file mode 100644 index c979eb49..00000000 --- a/cutejava-front/src/views/components/base/ClipboardDemo.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - diff --git a/cutejava-front/src/views/components/dev/CuteDragTable.vue b/cutejava-front/src/views/components/dev/CuteDragTable.vue new file mode 100644 index 00000000..dbe2065d --- /dev/null +++ b/cutejava-front/src/views/components/dev/CuteDragTable.vue @@ -0,0 +1,176 @@ + + + + diff --git a/cutejava-front/src/views/components/base/OneKeyCopy.vue b/cutejava-front/src/views/components/dev/CuteOneKeyCopy.vue similarity index 88% rename from cutejava-front/src/views/components/base/OneKeyCopy.vue rename to cutejava-front/src/views/components/dev/CuteOneKeyCopy.vue index 15873401..02454b87 100644 --- a/cutejava-front/src/views/components/base/OneKeyCopy.vue +++ b/cutejava-front/src/views/components/dev/CuteOneKeyCopy.vue @@ -1,7 +1,6 @@ - diff --git a/cutejava/README.md b/cutejava/README.md index 696400d8..907ef08e 100644 --- a/cutejava/README.md +++ b/cutejava/README.md @@ -54,8 +54,9 @@ https://github.com/odboy-tianjun/cutejava #### 丰富的自定义组件 -- CuteTable -- CuteFormDialog +- CuteSimpleTable 简单表格 +- CuteDragTable 支持拖拽的表格 +- CuteFormDialog 支持表单的对话框 #### 系统模块 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index 57fb3d1b..c511bbab 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -46,8 +46,13 @@ public class SystemDictController { @PostMapping @PreAuthorize("@el.check('dict:list')") public ResponseEntity>> queryDictByArgs(@Validated @RequestBody CsPageArgs args) { + Page page; SystemQueryDictArgs criteria = args.getArgs(); - Page page = new Page<>(criteria.getPage(), criteria.getSize()); + if (args.getSize() != null) { + page = new Page<>(args.getPage(), args.getSize()); + } else { + page = new Page<>(criteria.getPage(), criteria.getSize()); + } return new ResponseEntity<>(systemDictService.queryDictByArgs(criteria, page), HttpStatus.OK); }