diff --git a/src/utils/request.js b/src/utils/request.js index c4b397e5..d7ba1333 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,7 +8,7 @@ import cache from '@/plugins/cache' import { saveAs } from 'file-saver' import { encryptCBC, decryptCBC } from '@/utils/aescbc' import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' -const systemConfig = { +const systemConfig = JSON.parse(localStorage.getItem('systemConfig')) || { requestConfig: { encryptRequest: false, checkIntegrity: false, encryptResponse: false } }; diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index ba4e99ee..ffa6dc26 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -583,7 +583,7 @@ export default { handleCommand(command, row) { switch (command) { case 'handleResetPwd': - this.handleResetPwd(row) + this.confirmResetPwd(row) break case 'handleAuthRole': this.handleAuthRole(row) @@ -653,6 +653,32 @@ export default { }).catch(() => { }) }, + confirmResetPwd(row){ + this.$prompt('请输入密码,鉴别用户', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + closeOnClickModal: false, + inputPattern: /^.{8,16}$/, + inputErrorMessage: '用户密码长度必须介于 8 和 16 之间', + inputValidator: (value) => { + // 调用 validateNewPassword 校验 + const errorMessage=function(error) { + if (error) { + return error.message; + } else { + console.log('验证通过'); + } + }; + validateNewPassword(null, value, errorMessage); + } + }).then(({ value }) => { + confirmPassword(value).then(response => { + this.$modal.msgSuccess('验证成功') + this.handleResetPwd(row) + }) + }).catch(() => { + }) + }, /** 重置密码按钮操作 */ handleResetPwd(row) { this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {