From 89d58a4e5f13ba7fc254b19ad2bb12f96b20b468 Mon Sep 17 00:00:00 2001 From: Odboy Date: Mon, 4 Aug 2025 19:49:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(module-system):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在用户查询 SQL 中添加 enabled = 1 条件，只返回启用的用户 - 调整前端组件的高度计算方式 - 修复 CuteYamlEditor 组件的 change 事件 - 更新 CuteSimpleTableDemo 和 CuteYamlEditorDemo 的示例 --- .../views/components/dev/CuteDragTable.vue | 2 +- .../views/components/dev/CuteFormDrawer.vue | 2 +- .../components/dev/CutePreviewDrawer.vue | 2 +- .../views/components/dev/CuteSimpleTable.vue | 2 +- .../views/components/dev/CuteYamlEditor.vue | 1 + .../componentsDemo/CuteSimpleTableDemo.vue | 38 +++++++++---------- .../componentsDemo/CuteYamlEditorDemo.vue | 4 +- .../resources/mapper/SystemUserMapper.xml | 3 ++ 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/cutejava-front/src/views/components/dev/CuteDragTable.vue b/cutejava-front/src/views/components/dev/CuteDragTable.vue index dc0fe2e6..72131e73 100644 --- a/cutejava-front/src/views/components/dev/CuteDragTable.vue +++ b/cutejava-front/src/views/components/dev/CuteDragTable.vue @@ -119,7 +119,7 @@ export default { }, computed: { height() { - return document.documentElement.clientHeight - 250 + return document.documentElement.clientHeight - 300 } }, mounted() { diff --git a/cutejava-front/src/views/components/dev/CuteFormDrawer.vue b/cutejava-front/src/views/components/dev/CuteFormDrawer.vue index 3ef3ca75..7899a5cb 100644 --- a/cutejava-front/src/views/components/dev/CuteFormDrawer.vue +++ b/cutejava-front/src/views/components/dev/CuteFormDrawer.vue @@ -85,7 +85,7 @@ export default { .container-form { overflow-y: scroll; /* 启用滚动 */ scrollbar-width: none; /* Firefox */ - height: 88%; + height: 85%; padding-right: 20px; -ms-overflow-style: none; /* Internet Explorer 10+ */ } diff --git a/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue b/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue index bcc7faf1..5a71bf6a 100644 --- a/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue +++ b/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue @@ -53,7 +53,7 @@ export default { .container-form { overflow-y: scroll; /* 启用滚动 */ scrollbar-width: none; /* Firefox */ - height: 88%; + height: 85%; padding-right: 20px; -ms-overflow-style: none; /* Internet Explorer 10+ */ } diff --git a/cutejava-front/src/views/components/dev/CuteSimpleTable.vue b/cutejava-front/src/views/components/dev/CuteSimpleTable.vue index 62aa356e..f5b27be0 100644 --- a/cutejava-front/src/views/components/dev/CuteSimpleTable.vue +++ b/cutejava-front/src/views/components/dev/CuteSimpleTable.vue @@ -118,7 +118,7 @@ export default { }, computed: { height() { - return document.documentElement.clientHeight - 250 + return document.documentElement.clientHeight - 300 } }, mounted() { diff --git a/cutejava-front/src/views/components/dev/CuteYamlEditor.vue b/cutejava-front/src/views/components/dev/CuteYamlEditor.vue index 20f86522..cdc24e5d 100644 --- a/cutejava-front/src/views/components/dev/CuteYamlEditor.vue +++ b/cutejava-front/src/views/components/dev/CuteYamlEditor.vue @@ -68,6 +68,7 @@ export default { this.editor.setOption('readOnly', this.readOnly) this.editor.on('change', cm => { this.$emit('change', cm.getValue()) + this.$emit('input', cm.getValue()) }) }, methods: { diff --git a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue index 67cd84ce..462ef548 100644 --- a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue +++ b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue @@ -41,23 +41,23 @@ :operate-column="curd.operateColumn" :page-props="curd.pageProps" /> - + - + - + - + - + - + @@ -126,20 +126,18 @@ export default { total: 0 } }, - createForm: { - model: { - name: '', - region: '' - }, - rules: { - name: [ - { required: true, message: '请输入活动名称', trigger: 'blur' }, - { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } - ], - region: [ - { required: true, message: '请选择活动区域', trigger: 'change' } - ] - } + createFormModel: { + name: '', + region: '' + }, + createFormRules: { + name: [ + { required: true, message: '请输入活动名称', trigger: 'blur' }, + { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } + ], + region: [ + { required: true, message: '请选择活动区域', trigger: 'change' } + ] } } }, diff --git a/cutejava-front/src/views/componentsDemo/CuteYamlEditorDemo.vue b/cutejava-front/src/views/componentsDemo/CuteYamlEditorDemo.vue index ad63cbfd..6cd2a7f7 100644 --- a/cutejava-front/src/views/componentsDemo/CuteYamlEditorDemo.vue +++ b/cutejava-front/src/views/componentsDemo/CuteYamlEditorDemo.vue @@ -50,8 +50,8 @@ export default { ' shutdown: graceful\n' + 'spring:\n' + ' application:\n' + - ' name: cutejava\n' + - ' title: CuteJava后台管理系统\n' + + ' name: kenaito-devops\n' + + ' title: Kenaito DevOps\n' + ' lifecycle:\n' + ' # 采用java.time.Duration格式的值,如果在这个时间内，优雅停机没有停掉应用，超过这个时间就会强制停止应用\n' + ' timeout-per-shutdown-phase: 30s\n' + diff --git a/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml index 6ab11ef3..a6dfa31f 100644 --- a/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml @@ -134,16 +134,19 @@ from system_user u left join system_dept d on u.dept_id = d.dept_id where u.username = #{username} + and u.enabled = 1 update system_user