From e11abd1f9a0d7f1e93e819f1012e28be5b87a6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Thu, 23 Feb 2023 00:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=A2=9E=E5=BC=BA=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=88=B0=E6=8F=92=E4=BB=B6=E4=B8=8E=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8F=8A?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=A0=E5=85=A5=E4=BA=8B=E5=8A=A1=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-admin-web/src/style/index.less | 1 + snowy-admin-web/src/views/gen/basic.vue | 151 +- snowy-admin-web/src/views/gen/config.vue | 60 +- snowy-admin-web/src/views/gen/index.vue | 55 +- snowy-admin-web/src/views/gen/preview.vue | 70 +- snowy-admin-web/src/views/gen/steps.vue | 39 +- .../gen/modular/basic/entity/GenBasic.java | 32 +- .../modular/basic/param/GenBasicAddParam.java | 34 +- .../basic/param/GenBasicEditParam.java | 34 +- .../service/impl/GenBasicServiceImpl.java | 67 +- .../resources/backend/ServiceImpl.java.btl | 2 + .../src/main/resources/_sql/snowy_mysql.sql | 2 + .../src/main/resources/_sql/snowy_oracle.sql | 2 + .../main/resources/_sql/snowy_postgres.sql | 1965 ----------------- 14 files changed, 352 insertions(+), 2162 deletions(-) delete mode 100644 snowy-web-app/src/main/resources/_sql/snowy_postgres.sql diff --git a/snowy-admin-web/src/style/index.less b/snowy-admin-web/src/style/index.less index 392074df..6c1947e7 100644 --- a/snowy-admin-web/src/style/index.less +++ b/snowy-admin-web/src/style/index.less @@ -413,6 +413,7 @@ body, .index-message-list, .ant-picker-time-panel-column, .timeline-div, +.gen-preview-content, .adminui-main{ &::-webkit-scrollbar { diff --git a/snowy-admin-web/src/views/gen/basic.vue b/snowy-admin-web/src/views/gen/basic.vue index f5e0632b..e0156b8b 100644 --- a/snowy-admin-web/src/views/gen/basic.vue +++ b/snowy-admin-web/src/views/gen/basic.vue @@ -27,11 +27,14 @@ - + + - - @@ -69,15 +72,51 @@ > - - + + + + + + + + + + + + + + + + + - + + @@ -86,33 +125,38 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -171,7 +215,7 @@ { label: '不使用', value: 'N' - }, + } ]) // 打开抽屉 const onOpen = (record) => { @@ -197,21 +241,26 @@ id: record.id } submitLoading.value = true - genBasicApi.basicDetail(params).then((data) => { - formData.value = data - // 让主键选中 - selectTableColumnsData(data.dbTable, true) - // 让模块旁边的上级菜单选中 - moduleChange(data.module, true) - }).finally(() => { - submitLoading.value = false - }) + genBasicApi + .basicDetail(params) + .then((data) => { + formData.value = data + // 让主键选中 + selectTableColumnsData(data.dbTable, true) + // 让模块旁边的上级菜单选中 + moduleChange(data.module, true) + }) + .finally(() => { + submitLoading.value = false + }) } else { formData.value = { + pluginName: 'snowy-plugin-biz', + packageName: 'vip.xiaonuo', + moduleName: 'biz', sortCode: 99, tablePrefix: 'Y', generateType: 'ZIP', - packageName: 'vip.xiaonuo', formLayout: 'vertical', gridWhether: 'N' } @@ -220,6 +269,8 @@ } // 默认要校验的 const formRules = { + pluginName: [required('请输入插件名')], + moduleName: [required('请输入模块名')], tablePrefix: [required('请选择是否移除表前缀')], dbTable: [required('请选择主表')], dbTableKey: [required('请选择主表主键')], @@ -340,19 +391,23 @@ } // 验证并提交数据 const onSubmit = () => { - return new Promise((resolve,reject) => { + return new Promise((resolve, reject) => { formRef.value .validate() .then(() => { submitLoading.value = true - genBasicApi.submitForm(formData.value, !formData.value.id).then((data) => { - resolve(data) - }).finally(() => { - submitLoading.value = false - }) - }).catch((err) => { - reject(err) - }) + genBasicApi + .submitForm(formData.value, !formData.value.id) + .then((data) => { + resolve(data) + }) + .finally(() => { + submitLoading.value = false + }) + }) + .catch((err) => { + reject(err) + }) }) } // 调用这个函数将子组件的一些数据和方法暴露出去 diff --git a/snowy-admin-web/src/views/gen/config.vue b/snowy-admin-web/src/views/gen/config.vue index 1041e87a..356576bb 100644 --- a/snowy-admin-web/src/views/gen/config.vue +++ b/snowy-admin-web/src/views/gen/config.vue @@ -33,10 +33,7 @@