fix(module-system): 修复用户查询相关问题
- 在用户查询 SQL 中添加 enabled = 1 条件,只返回启用的用户 - 调整前端组件的高度计算方式 - 修复 CuteYamlEditor 组件的 change 事件 - 更新 CuteSimpleTableDemo 和 CuteYamlEditorDemo 的示例
This commit is contained in:
@@ -119,7 +119,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
height() {
|
height() {
|
||||||
return document.documentElement.clientHeight - 250
|
return document.documentElement.clientHeight - 300
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ export default {
|
|||||||
.container-form {
|
.container-form {
|
||||||
overflow-y: scroll; /* 启用滚动 */
|
overflow-y: scroll; /* 启用滚动 */
|
||||||
scrollbar-width: none; /* Firefox */
|
scrollbar-width: none; /* Firefox */
|
||||||
height: 88%;
|
height: 85%;
|
||||||
padding-right: 20px;
|
padding-right: 20px;
|
||||||
-ms-overflow-style: none; /* Internet Explorer 10+ */
|
-ms-overflow-style: none; /* Internet Explorer 10+ */
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default {
|
|||||||
.container-form {
|
.container-form {
|
||||||
overflow-y: scroll; /* 启用滚动 */
|
overflow-y: scroll; /* 启用滚动 */
|
||||||
scrollbar-width: none; /* Firefox */
|
scrollbar-width: none; /* Firefox */
|
||||||
height: 88%;
|
height: 85%;
|
||||||
padding-right: 20px;
|
padding-right: 20px;
|
||||||
-ms-overflow-style: none; /* Internet Explorer 10+ */
|
-ms-overflow-style: none; /* Internet Explorer 10+ */
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
height() {
|
height() {
|
||||||
return document.documentElement.clientHeight - 250
|
return document.documentElement.clientHeight - 300
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ export default {
|
|||||||
this.editor.setOption('readOnly', this.readOnly)
|
this.editor.setOption('readOnly', this.readOnly)
|
||||||
this.editor.on('change', cm => {
|
this.editor.on('change', cm => {
|
||||||
this.$emit('change', cm.getValue())
|
this.$emit('change', cm.getValue())
|
||||||
|
this.$emit('input', cm.getValue())
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
@@ -41,23 +41,23 @@
|
|||||||
:operate-column="curd.operateColumn"
|
:operate-column="curd.operateColumn"
|
||||||
:page-props="curd.pageProps"
|
:page-props="curd.pageProps"
|
||||||
/>
|
/>
|
||||||
<cute-form-dialog ref="dialogForm" :form="createForm" title="演示:表单对话框" @submit="onDialogFormSubmit">
|
<cute-form-dialog ref="dialogForm" :model="createFormModel" :rules="createFormRules" title="演示:表单对话框" @submit="onDialogFormSubmit">
|
||||||
<el-form-item label="活动名称" prop="name" label-width="100px">
|
<el-form-item label="活动名称" prop="name" label-width="100px">
|
||||||
<el-input v-model="createForm.model.name" placeholder="请输入" style="width: 100%" />
|
<el-input v-model="createFormModel.name" placeholder="请输入" style="width: 100%" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="活动区域" prop="region" label-width="100px">
|
<el-form-item label="活动区域" prop="region" label-width="100px">
|
||||||
<el-select v-model="createForm.model.region" placeholder="请选择" style="width: 100%">
|
<el-select v-model="createFormModel.region" placeholder="请选择" style="width: 100%">
|
||||||
<el-option label="区域一" value="shanghai" />
|
<el-option label="区域一" value="shanghai" />
|
||||||
<el-option label="区域二" value="beijing" />
|
<el-option label="区域二" value="beijing" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</cute-form-dialog>
|
</cute-form-dialog>
|
||||||
<cute-form-drawer ref="drawerFrom" :form="createForm" title="演示:表单抽屉" @submit="onDrawerFormSubmit">
|
<cute-form-drawer ref="drawerFrom" :model="createFormModel" :rules="createFormRules" title="演示:表单抽屉" @submit="onDrawerFormSubmit">
|
||||||
<el-form-item label="活动名称" prop="name" label-width="100px">
|
<el-form-item label="活动名称" prop="name" label-width="100px">
|
||||||
<el-input v-model="createForm.model.name" placeholder="请输入" style="width: 100%" />
|
<el-input v-model="createFormModel.name" placeholder="请输入" style="width: 100%" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="活动区域" prop="region" label-width="100px">
|
<el-form-item label="活动区域" prop="region" label-width="100px">
|
||||||
<el-select v-model="createForm.model.region" placeholder="请选择" style="width: 100%">
|
<el-select v-model="createFormModel.region" placeholder="请选择" style="width: 100%">
|
||||||
<el-option label="区域一" value="shanghai" />
|
<el-option label="区域一" value="shanghai" />
|
||||||
<el-option label="区域二" value="beijing" />
|
<el-option label="区域二" value="beijing" />
|
||||||
</el-select>
|
</el-select>
|
||||||
@@ -126,12 +126,11 @@ export default {
|
|||||||
total: 0
|
total: 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
createForm: {
|
createFormModel: {
|
||||||
model: {
|
|
||||||
name: '',
|
name: '',
|
||||||
region: ''
|
region: ''
|
||||||
},
|
},
|
||||||
rules: {
|
createFormRules: {
|
||||||
name: [
|
name: [
|
||||||
{ required: true, message: '请输入活动名称', trigger: 'blur' },
|
{ required: true, message: '请输入活动名称', trigger: 'blur' },
|
||||||
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
|
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
|
||||||
@@ -141,7 +140,6 @@ export default {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.initData()
|
this.initData()
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ export default {
|
|||||||
' shutdown: graceful\n' +
|
' shutdown: graceful\n' +
|
||||||
'spring:\n' +
|
'spring:\n' +
|
||||||
' application:\n' +
|
' application:\n' +
|
||||||
' name: cutejava\n' +
|
' name: kenaito-devops\n' +
|
||||||
' title: CuteJava后台管理系统\n' +
|
' title: Kenaito DevOps\n' +
|
||||||
' lifecycle:\n' +
|
' lifecycle:\n' +
|
||||||
' # 采用java.time.Duration格式的值,如果在这个时间内,优雅停机没有停掉应用,超过这个时间就会强制停止应用\n' +
|
' # 采用java.time.Duration格式的值,如果在这个时间内,优雅停机没有停掉应用,超过这个时间就会强制停止应用\n' +
|
||||||
' timeout-per-shutdown-phase: 30s\n' +
|
' timeout-per-shutdown-phase: 30s\n' +
|
||||||
|
|||||||
@@ -134,16 +134,19 @@
|
|||||||
from system_user u
|
from system_user u
|
||||||
left join system_dept d on u.dept_id = d.dept_id
|
left join system_dept d on u.dept_id = d.dept_id
|
||||||
where u.username = #{username}
|
where u.username = #{username}
|
||||||
|
and u.enabled = 1
|
||||||
</select>
|
</select>
|
||||||
<select id="getUserByEmail" resultType="cn.odboy.system.dal.dataobject.SystemUserTb">
|
<select id="getUserByEmail" resultType="cn.odboy.system.dal.dataobject.SystemUserTb">
|
||||||
select user_id as id, username
|
select user_id as id, username
|
||||||
from system_user
|
from system_user
|
||||||
where email = #{email}
|
where email = #{email}
|
||||||
|
and u.enabled = 1
|
||||||
</select>
|
</select>
|
||||||
<select id="getUserByPhone" resultType="cn.odboy.system.dal.dataobject.SystemUserTb">
|
<select id="getUserByPhone" resultType="cn.odboy.system.dal.dataobject.SystemUserTb">
|
||||||
select user_id as id, username
|
select user_id as id, username
|
||||||
from system_user
|
from system_user
|
||||||
where phone = #{phone}
|
where phone = #{phone}
|
||||||
|
and u.enabled = 1
|
||||||
</select>
|
</select>
|
||||||
<update id="updateUserPasswordByUsername">
|
<update id="updateUserPasswordByUsername">
|
||||||
update system_user
|
update system_user
|
||||||
|
|||||||
Reference in New Issue
Block a user