diff --git a/cutejava-front/src/views/components/advanced/CuteFormDialog.vue b/cutejava-front/src/views/components/advanced/CuteFormDialog.vue index 5829d0b7..680f359f 100644 --- a/cutejava-front/src/views/components/advanced/CuteFormDialog.vue +++ b/cutejava-front/src/views/components/advanced/CuteFormDialog.vue @@ -22,7 +22,7 @@ @@ -35,7 +35,7 @@ export default { props: { title: { type: String, - required: true, + required: false, default: '默认标题' }, width: { @@ -60,11 +60,15 @@ export default { return {} } }, - // 是否平铺表单 inline: { type: Boolean, required: false, default: false + }, + showReset: { + type: Boolean, + required: false, + default: false } }, data() { @@ -91,9 +95,11 @@ export default { }, resetForm(formName) { this.$refs[formName].resetFields() + this.$emit('reset') }, beforeClose() { this.hidden() + this.$emit('cancel') } } } diff --git a/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue b/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue index 11e132ca..b9003623 100644 --- a/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue +++ b/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue @@ -21,6 +21,7 @@ v-if="item.type === 'input'" v-model="model[item.name]" :placeholder="`请输入${item.title}`" + :disabled="model.disabled === true" clearable style="width: 100%" /> @@ -30,6 +31,7 @@ v-model="model[item.name]" clearable :placeholder="`请选择${item.title}`" + :disabled="model.disabled === true" style="width: 100%" > @@ -128,6 +132,11 @@ export default { model: { type: Object, required: true + }, + showReset: { + type: Boolean, + required: false, + default: false } }, data() { @@ -214,9 +223,11 @@ export default { } } this.model = { ...model } + this.$emit('reset') }, beforeClose() { this.hidden() + this.$emit('cancel') } } } diff --git a/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue b/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue index 5c6f1678..2bf94459 100644 --- a/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue +++ b/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue @@ -38,7 +38,7 @@ export default { props: { title: { type: String, - required: true, + required: false, default: '默认标题' }, width: { @@ -58,11 +58,15 @@ export default { return {} } }, - // 是否平铺表单 inline: { type: Boolean, required: false, default: false + }, + showReset: { + type: Boolean, + required: false, + default: false } }, data() { @@ -89,9 +93,11 @@ export default { }, resetForm(formName) { this.$refs[formName].resetFields() + this.$emit('reset') }, beforeClose() { this.hidden() + this.$emit('cancel') } } } diff --git a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue index f2eaa9e4..0ddb7ff0 100644 --- a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue +++ b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue @@ -1,47 +1,5 @@ + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogProDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogProDemo.vue new file mode 100644 index 00000000..ae12e916 --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogProDemo.vue @@ -0,0 +1,101 @@ + + + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerDemo.vue new file mode 100644 index 00000000..25f6b7aa --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerDemo.vue @@ -0,0 +1,102 @@ + + + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue index 50ef12ba..43285fae 100644 --- a/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue @@ -136,10 +136,10 @@ export default { methods: { FormatRowDateTimeStr, onTableEditClick(row) { - console.log('编辑', row) + console.log('onTableEditClick', row) }, onTableDeleteClick(row) { - console.log('删除', row) + console.log('onTableDeleteClick', row) } } } diff --git a/cutejava-front/src/views/componentsDemo/business/CuteFileDragUploadDemo.vue b/cutejava-front/src/views/componentsDemo/business/CuteFileDragUploadDemo.vue index 34420fb9..a736be9a 100644 --- a/cutejava-front/src/views/componentsDemo/business/CuteFileDragUploadDemo.vue +++ b/cutejava-front/src/views/componentsDemo/business/CuteFileDragUploadDemo.vue @@ -24,7 +24,8 @@ 提 交 -

与CuteFormDialog集成 显示对话框

+

与CuteFormDialog集成

+ 显示对话框 @@ -39,7 +40,8 @@ -

与CuteFormDrawer集成 显示抽屉

+

与CuteFormDrawer集成

+ 显示抽屉 @@ -68,10 +70,11 @@ import CuteFormDialog from '@/views/components/advanced/CuteFormDialog.vue' import CuteFileDragUpload from '@/views/components/business/CuteFileDragUpload.vue' import CuteFormDrawer from '@/views/components/advanced/CuteFormDrawer.vue' +import CuteButton from '@/views/components/dev/CuteButton.vue' export default { name: 'CuteFileDragUploadDemo', - components: { CuteFormDrawer, CuteFormDialog, CuteFileDragUpload }, + components: { CuteButton, CuteFormDrawer, CuteFormDialog, CuteFileDragUpload }, data() { return { form: { diff --git a/cutejava-front/src/views/componentsDemo/business/CuteFileUploadDemo.vue b/cutejava-front/src/views/componentsDemo/business/CuteFileUploadDemo.vue index 551423a5..14537699 100644 --- a/cutejava-front/src/views/componentsDemo/business/CuteFileUploadDemo.vue +++ b/cutejava-front/src/views/componentsDemo/business/CuteFileUploadDemo.vue @@ -24,7 +24,8 @@ 提 交 -

与CuteFormDialog集成 显示对话框

+

与CuteFormDialog集成

+ 显示对话框 @@ -39,7 +40,8 @@ -

与CuteFormDrawer集成 显示抽屉

+

与CuteFormDrawer集成

+ 显示抽屉 @@ -68,10 +70,11 @@ import CuteFileUpload from '@/views/components/business/CuteFileUpload.vue' import CuteFormDialog from '@/views/components/advanced/CuteFormDialog.vue' import CuteFormDrawer from '@/views/components/advanced/CuteFormDrawer.vue' +import CuteButton from '@/views/components/dev/CuteButton.vue' export default { name: 'CuteFileUploadDemo', - components: { CuteFormDrawer, CuteFormDialog, CuteFileUpload }, + components: { CuteButton, CuteFormDrawer, CuteFormDialog, CuteFileUpload }, data() { return { form: { diff --git a/cutejava-front/src/views/componentsDemo/index.vue b/cutejava-front/src/views/componentsDemo/index.vue index 4d52cecb..c889afe7 100644 --- a/cutejava-front/src/views/componentsDemo/index.vue +++ b/cutejava-front/src/views/componentsDemo/index.vue @@ -99,9 +99,18 @@ - + + + + + + + + + + @@ -139,10 +148,16 @@ import CuteFileDragUploadDemo from '@/views/componentsDemo/business/CuteFileDrag import CuteSimpleTableDemo from '@/views/componentsDemo/CuteSimpleTableDemo.vue' import CuteDragTableDemo from '@/views/componentsDemo/advanced/CuteDragTableDemo.vue' import CuteEditTableDemo from '@/views/componentsDemo/advanced/CuteEditTableDemo.vue' +import CuteFormDialogDemo from '@/views/componentsDemo/advanced/CuteFormDialogDemo.vue' +import CuteFormDialogProDemo from '@/views/componentsDemo/advanced/CuteFormDialogProDemo.vue' +import CuteFormDrawerDemo from '@/views/componentsDemo/advanced/CuteFormDrawerDemo.vue' export default { name: 'SystemComponents', components: { + CuteFormDrawerDemo, + CuteFormDialogProDemo, + CuteFormDialogDemo, CuteEditTableDemo, CuteDragTableDemo, CuteSimpleTableDemo,