From e6f23cc7163ead7fe45961fe05ef2fdf379203bd Mon Sep 17 00:00:00 2001 From: dujie Date: Thu, 6 Apr 2023 17:49:24 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=E7=A6=85=E9=81=93bug=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tools/UserPassword.vue | 8 +++---- jero-web/src/mixins/JeroListMixin.js | 24 ++++++++++++------- jero-web/src/views/system/DictItemList.vue | 2 ++ .../src/views/system/SysDataSourceList.vue | 21 ++++++++-------- jero-web/src/views/system/UserList.vue | 3 ++- .../views/system/modules/DictItemModal.vue | 4 ++-- .../views/system/modules/RoleAssignment.vue | 4 +++- .../src/views/system/modules/UserModal.vue | 14 +++++------ .../system/modules/UserRecycleBinModal.vue | 10 ++++---- 9 files changed, 53 insertions(+), 37 deletions(-) diff --git a/jero-web/src/components/tools/UserPassword.vue b/jero-web/src/components/tools/UserPassword.vue index 76bff2df..6fab94aa 100644 --- a/jero-web/src/components/tools/UserPassword.vue +++ b/jero-web/src/components/tools/UserPassword.vue @@ -22,14 +22,14 @@ :labelCol="labelCol" :wrapperCol="wrapperCol" label="新密码"> - + - + @@ -58,14 +58,14 @@ export default { password: { rules: [ { required: true, message: '请输入新密码!' }, - { pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!' }, + { pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8-20位数字、大小写字母和特殊符号组成!' }, { validator: this.validateToNextPassword } ] }, confirmpassword: { rules: [ { required: true, message: '请确认新密码!' }, - { pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!' }, + { pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8-20位数字、大小写字母和特殊符号组成!' }, { validator: this.validateToNextPassword } ] } diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js index 82fcb7fa..052929a2 100644 --- a/jero-web/src/mixins/JeroListMixin.js +++ b/jero-web/src/mixins/JeroListMixin.js @@ -200,14 +200,22 @@ export const JeroListMixin = { return } const that = this - postAction(that.url.delete, { id: id }).then((res) => { - if (res.success) { - // 重新计算分页问题 - that.reCalculatePage(1) - that.$message.success(res.message) - that.loadData() - } else { - that.$message.warning(res.message) + this.$confirm({ + title: '确认删除', + content: '确定要删除此条数据吗?', + onOk: function () { + postAction(that.url.delete, { id: id }).then((res) => { + if (res.success) { + that.$message.success(res.message) + // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一 + if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) { + that.ipagination.current -= 1 + } + that.loadData() + } else { + that.$message.warning(res.message) + } + }) } }) }, diff --git a/jero-web/src/views/system/DictItemList.vue b/jero-web/src/views/system/DictItemList.vue index 0c0dc83b..21fccd41 100644 --- a/jero-web/src/views/system/DictItemList.vue +++ b/jero-web/src/views/system/DictItemList.vue @@ -93,6 +93,8 @@ export default { { title: '名称', align: 'center', + ellipsis: true, + width: 300, dataIndex: 'itemText' }, { diff --git a/jero-web/src/views/system/SysDataSourceList.vue b/jero-web/src/views/system/SysDataSourceList.vue index 82d2f176..c2779b02 100644 --- a/jero-web/src/views/system/SysDataSourceList.vue +++ b/jero-web/src/views/system/SysDataSourceList.vue @@ -77,16 +77,17 @@ 编辑 - - 更多 - - - - 删除 - - - - + 删除 + + + + + + + + + + diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 58860a44..02f79f12 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -195,7 +195,7 @@ - + @@ -439,6 +439,7 @@ export default { } }, rolevisibleMethods () { + this.onClearSelected() this.selectedRowKeys = [] } } diff --git a/jero-web/src/views/system/modules/DictItemModal.vue b/jero-web/src/views/system/modules/DictItemModal.vue index 4d6d175c..7c2af8dd 100644 --- a/jero-web/src/views/system/modules/DictItemModal.vue +++ b/jero-web/src/views/system/modules/DictItemModal.vue @@ -16,7 +16,7 @@ :wrapperCol="wrapperCol" prop="itemText" label="名称"> - + - +
@@ -111,8 +112,9 @@ export default { postAction('/sys/user/setRole', param).then((res) => { this.visible = false if (res.success) { - this.$emit('rolevisible', false) + this.$emit('ok', false) this.$message.success(res.message) + this.selectedRole = [] } else { this.$message.warning(res.message) } diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index ee913993..85688dfe 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -23,21 +23,21 @@ - + - + @@ -111,7 +111,7 @@ - + @@ -164,7 +164,7 @@ export default { validatorRules: { username: [{ required: true, message: '请输入用户账号!' }, { validator: this.validateUsername }], - password: [{ required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!' }, + password: [{ required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8-20位数字、大小写字母和特殊符号组成!' }, { validator: this.validateToNextPassword, trigger: 'change' }], confirmpassword: [{ required: true, message: '请重新输入登录密码!' }, { validator: this.compareToFirstPassword }], @@ -425,7 +425,7 @@ export default { if (!value) { callback() } else { - if (new RegExp(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/).test(value)) { + if (new RegExp(/^\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/).test(value)) { const params = { tableName: 'sys_user', fieldName: 'email', diff --git a/jero-web/src/views/system/modules/UserRecycleBinModal.vue b/jero-web/src/views/system/modules/UserRecycleBinModal.vue index a59b39f6..5ff746d0 100644 --- a/jero-web/src/views/system/modules/UserRecycleBinModal.vue +++ b/jero-web/src/views/system/modules/UserRecycleBinModal.vue @@ -66,7 +66,7 @@ function superRequest (options) { } }).catch(e => { console.error('查询已删除的用户失败：', e) - this.$message.warning('查询已删除的用户失败：' + (e.message || e)) + // this.$message.warning('查询已删除的用户失败：' + (e.message || e)) }).finally(() => { this.loading = false }) @@ -134,17 +134,19 @@ export default { this.innerVisible = false }, // 还原用户 - handleRevert (userIds) { + handleRevert (userIds, userName) { this.$confirm({ title: '恢复用户', - content: `您确定要恢复这 ${userIds.length} 个用户吗？`, + // content: `您确定要恢复这 ${userIds.length} 个用户吗？`, + content: `是否还原选中用户？`, centered: true, onOk: () => { postAction(this.url.putRecycleBin, { userIds: userIds.join(',') }).then((res) => { if (res.success) { this.handleOk() this.handleClearSelection() - this.$message.success(`还原 ${userIds.length} 个用户成功！`) + // this.$message.success(`还原 ${userIds.length} 个用户成功！`) + this.$message.success(`选中用户还原成功！`) } }) }