diff --git a/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue b/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue index b9003623..2d26ad5d 100644 --- a/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue +++ b/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue @@ -90,7 +90,7 @@ + + diff --git a/cutejava-front/src/views/components/advanced/CuteSearchForm.vue b/cutejava-front/src/views/components/advanced/CuteSearchForm.vue index c0133013..4e508c13 100644 --- a/cutejava-front/src/views/components/advanced/CuteSearchForm.vue +++ b/cutejava-front/src/views/components/advanced/CuteSearchForm.vue @@ -11,7 +11,6 @@ :model.sync="model" label-position="right" label-width="90px" - :disabled="disabled" size="small" > @@ -34,11 +33,6 @@ export default { model: { type: Object, required: true - }, - disabled: { - type: Boolean, - required: false, - default: false } }, methods: { @@ -46,7 +40,7 @@ export default { const that = this that.$refs[formName].validate((valid) => { if (valid) { - that.$emit('submit', that.model) + that.$emit('search', that.model) } else { return false } @@ -56,7 +50,6 @@ export default { try { this.$refs[formName].resetFields() this.onFormSubmit(formName) - // this.$emit('reset') } catch (e) { console.error(e) } diff --git a/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue b/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue index 621c8bfc..6158b81a 100644 --- a/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue +++ b/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue @@ -11,7 +11,6 @@ :model.sync="model" label-position="right" label-width="90px" - :disabled="disabled" size="small" > @@ -99,14 +98,6 @@ export default { model: { type: Object, required: true - }, - /** - * 是否禁用 - */ - disabled: { - type: Boolean, - required: false, - default: false } }, data() { @@ -145,7 +136,7 @@ export default { const that = this that.$refs[formName].validate((valid) => { if (valid) { - that.$emit('submit', that.model) + that.$emit('search', that.model) } else { return false } @@ -169,7 +160,6 @@ export default { } this.model = { ...model } this.onFormSubmit(formName) - // this.$emit('reset') } catch (e) { console.error(e) } diff --git a/cutejava-front/src/views/componentsDemo/CuteOtherDemo.vue b/cutejava-front/src/views/componentsDemo/CuteOtherDemo.vue deleted file mode 100644 index 5182171b..00000000 --- a/cutejava-front/src/views/componentsDemo/CuteOtherDemo.vue +++ /dev/null @@ -1,54 +0,0 @@ - - - - diff --git a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue deleted file mode 100644 index 0ddb7ff0..00000000 --- a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteDragTableDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteDragTableDemo.vue index 5bd48f97..326e7146 100644 --- a/cutejava-front/src/views/componentsDemo/advanced/CuteDragTableDemo.vue +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteDragTableDemo.vue @@ -69,6 +69,9 @@ export default { components: { CuteDragTable, CuteButton }, data() { return { + form: { + model: '' + }, curd: { paramsTransform: (pageProps) => { const values = this.form.model @@ -131,10 +134,13 @@ export default { } }, mounted() { - this.$refs.instance.refresh() + this.refreshData() }, methods: { FormatRowDateTimeStr, + refreshData() { + this.$refs.instance.refresh() + }, onTableEditClick(row) { console.log('编辑', row) }, diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogDemo.vue index 64a5f856..b1829b10 100644 --- a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogDemo.vue +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogDemo.vue @@ -2,9 +2,8 @@

何时使用

基础用法

diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogProDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogProDemo.vue index 1afe1063..0d3b0966 100644 --- a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogProDemo.vue +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDialogProDemo.vue @@ -2,9 +2,8 @@

何时使用

    -
  • 不离开当前场景完成增删改操作
  • -
  • 需要确认用户的操作,明确操作会产生的结果,提醒告知用户
  • -
  • 作为配置型功能及信息的容器
  • +
  • 用于创建一个实体或收集信息
  • +
  • 需要对输入的数据类型进行校验时
  • 在使用过程中有任何问题,咨询 @Odboy(前端)

基础用法

diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerDemo.vue index d7b67619..611a0273 100644 --- a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerDemo.vue +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerDemo.vue @@ -2,8 +2,8 @@

何时使用

    -
  • 不离开当前场景完成增删改操作
  • -
  • 作为配置型功能及信息的容器
  • +
  • 用于创建一个实体或收集信息
  • +
  • 需要对输入的数据类型进行校验时
  • 在使用过程中有任何问题,咨询 @Odboy(前端)

基础用法

diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerProDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerProDemo.vue new file mode 100644 index 00000000..fa73bcb9 --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteFormDrawerProDemo.vue @@ -0,0 +1,99 @@ + + + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteSearchFormDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteSearchFormDemo.vue new file mode 100644 index 00000000..c66608cf --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteSearchFormDemo.vue @@ -0,0 +1,63 @@ + + + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteSearchFormProDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteSearchFormProDemo.vue new file mode 100644 index 00000000..9c455a14 --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteSearchFormProDemo.vue @@ -0,0 +1,74 @@ + + + diff --git a/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue index 43285fae..f744d97d 100644 --- a/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue +++ b/cutejava-front/src/views/componentsDemo/advanced/CuteSimpleTableDemo.vue @@ -23,10 +23,10 @@ show-select > @@ -69,6 +69,9 @@ export default { components: { CuteSimpleTable, CuteButton }, data() { return { + form: { + model: '' + }, curd: { paramsTransform: (pageProps) => { const values = this.form.model @@ -131,10 +134,13 @@ export default { } }, mounted() { - this.$refs.instance.refresh() + this.refreshData() }, methods: { FormatRowDateTimeStr, + refreshData() { + this.$refs.instance.refresh() + }, onTableEditClick(row) { console.log('onTableEditClick', row) }, diff --git a/cutejava-front/src/views/componentsDemo/index.vue b/cutejava-front/src/views/componentsDemo/index.vue index c889afe7..d7ed9363 100644 --- a/cutejava-front/src/views/componentsDemo/index.vue +++ b/cutejava-front/src/views/componentsDemo/index.vue @@ -93,6 +93,12 @@ + + + + + + @@ -111,6 +117,9 @@ + + + @@ -145,22 +154,28 @@ 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' import CuteFormDialogDemo from '@/views/componentsDemo/advanced/CuteFormDialogDemo.vue' import CuteFormDialogProDemo from '@/views/componentsDemo/advanced/CuteFormDialogProDemo.vue' import CuteFormDrawerDemo from '@/views/componentsDemo/advanced/CuteFormDrawerDemo.vue' +import CuteFormDrawerProDemo from '@/views/componentsDemo/advanced/CuteFormDrawerProDemo.vue' +import CuteSearchFormDemo from '@/views/componentsDemo/advanced/CuteSearchFormDemo.vue' +import CuteSearchFormProDemo from '@/views/componentsDemo/advanced/CuteSearchFormProDemo.vue' +import CuteSimpleTableDemo from '@/views/componentsDemo/advanced/CuteSimpleTableDemo.vue' export default { name: 'SystemComponents', components: { + CuteSimpleTableDemo, + CuteSearchFormProDemo, + CuteSearchFormDemo, + CuteFormDrawerProDemo, CuteFormDrawerDemo, CuteFormDialogProDemo, CuteFormDialogDemo, CuteEditTableDemo, CuteDragTableDemo, - CuteSimpleTableDemo, CuteFileDragUploadDemo, CuteFileUploadDemo, CuteTransferDemo,