diff --git a/cutejava-front/src/views/components/advanced/CuteDragTable.vue b/cutejava-front/src/views/components/advanced/CuteDragTable.vue index 0ec1af52..2108cc4d 100644 --- a/cutejava-front/src/views/components/advanced/CuteDragTable.vue +++ b/cutejava-front/src/views/components/advanced/CuteDragTable.vue @@ -88,7 +88,7 @@ export default { }, pageProps: { type: Object, - required: true, + required: false, default: function() { return { current: 1, @@ -108,8 +108,7 @@ export default { onPageChange: (currentPage, pageSize) => { this.pageProps.current = currentPage this.pageProps.pageSize = pageSize - console.log('on-page-change', currentPage, pageSize) - // this.$emit('onPageChange', currentPage, pageSize, total) + this.$emit('page-change', currentPage, pageSize) this.refresh() }, orderBy: '', @@ -185,7 +184,7 @@ export default { } else { result = { column: prop, orderType: 'desc' } } - // this.$emit('order-change', result) + this.$emit('order-change', result.column, result.orderType) this.crud.orderBy = result this.refresh() }, diff --git a/cutejava-front/src/views/components/advanced/CuteEditTable.vue b/cutejava-front/src/views/components/advanced/CuteEditTable.vue index e84352f8..2ab77ec2 100644 --- a/cutejava-front/src/views/components/advanced/CuteEditTable.vue +++ b/cutejava-front/src/views/components/advanced/CuteEditTable.vue @@ -24,6 +24,7 @@ { this.pageProps.current = currentPage this.pageProps.pageSize = pageSize - console.log('on-page-change', currentPage, pageSize) - // this.$emit('onPageChange', currentPage, pageSize, total) + this.$emit('page-change', currentPage, pageSize) this.refresh() }, orderBy: '', @@ -192,7 +191,7 @@ export default { } else { result = { column: prop, orderType: 'desc' } } - // this.$emit('order-change', result) + this.$emit('order-change', result.column, result.orderType) this.crud.orderBy = result this.refresh() } diff --git a/cutejava-front/src/views/components/dev/CuteRichTextEditor.vue b/cutejava-front/src/views/components/dev/CuteRichTextEditor.vue index 1357bd77..d0fd5487 100644 --- a/cutejava-front/src/views/components/dev/CuteRichTextEditor.vue +++ b/cutejava-front/src/views/components/dev/CuteRichTextEditor.vue @@ -299,6 +299,7 @@ export default { */ resetField() { this.setHtml('') + this.$emit('input', '') } } } diff --git a/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue deleted file mode 100644 index 8d1fe594..00000000 --- a/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - - diff --git a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue index 400048d7..f2eaa9e4 100644 --- a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue +++ b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue @@ -25,41 +25,6 @@ - - - - - - - - - - - - - - - - - - - + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteEditTableDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteEditTableDemo.vue new file mode 100644 index 00000000..875fd160 --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteEditTableDemo.vue @@ -0,0 +1,93 @@ + + + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue new file mode 100644 index 00000000..50ef12ba --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue @@ -0,0 +1,154 @@ + + + diff --git a/cutejava-front/src/views/componentsDemo/index.vue b/cutejava-front/src/views/componentsDemo/index.vue index d7b1fb75..4d52cecb 100644 --- a/cutejava-front/src/views/componentsDemo/index.vue +++ b/cutejava-front/src/views/componentsDemo/index.vue @@ -91,7 +91,19 @@ - + + + + + + + + + + + + + @@ -124,10 +136,16 @@ import CutePreviewDrawerDemo from '@/views/componentsDemo/dev/CutePreviewDrawerD import CuteTransferDemo from '@/views/componentsDemo/dev/CuteTransferDemo.vue' import CuteFileUploadDemo from '@/views/componentsDemo/business/CuteFileUploadDemo.vue' import CuteFileDragUploadDemo from '@/views/componentsDemo/business/CuteFileDragUploadDemo.vue' +import CuteSimpleTableDemo from '@/views/componentsDemo/CuteSimpleTableDemo.vue' +import CuteDragTableDemo from '@/views/componentsDemo/advanced/CuteDragTableDemo.vue' +import CuteEditTableDemo from '@/views/componentsDemo/advanced/CuteEditTableDemo.vue' export default { name: 'SystemComponents', components: { + CuteEditTableDemo, + CuteDragTableDemo, + CuteSimpleTableDemo, CuteFileDragUploadDemo, CuteFileUploadDemo, CuteTransferDemo,