|
@@ -124,7 +124,7 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
|
- <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
|
|
|
|
|
|
+ <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password" :rules="pwdValidator">
|
|
|
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
|
|
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -188,10 +188,12 @@
|
|
|
import TreePanel from "@/components/TreePanel"
|
|
import TreePanel from "@/components/TreePanel"
|
|
|
import ExcelImportDialog from "@/components/ExcelImportDialog"
|
|
import ExcelImportDialog from "@/components/ExcelImportDialog"
|
|
|
import UserViewDrawer from "./view"
|
|
import UserViewDrawer from "./view"
|
|
|
|
|
+import { usePasswordRule } from "@/utils/passwordRule"
|
|
|
import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"
|
|
import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"
|
|
|
|
|
|
|
|
const router = useRouter()
|
|
const router = useRouter()
|
|
|
const { proxy } = getCurrentInstance()
|
|
const { proxy } = getCurrentInstance()
|
|
|
|
|
+const { pwdValidator, pwdPromptValidator } = usePasswordRule()
|
|
|
const { sys_normal_disable, sys_user_sex } = useDict("sys_normal_disable", "sys_user_sex")
|
|
const { sys_normal_disable, sys_user_sex } = useDict("sys_normal_disable", "sys_user_sex")
|
|
|
|
|
|
|
|
const userList = ref([])
|
|
const userList = ref([])
|
|
@@ -233,7 +235,6 @@ const data = reactive({
|
|
|
rules: {
|
|
rules: {
|
|
|
userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
|
|
userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
|
|
|
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
|
|
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
|
|
|
- password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符:< > \" ' \\\ |", trigger: "blur" }],
|
|
|
|
|
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
|
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
|
|
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
|
|
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
|
|
|
}
|
|
}
|
|
@@ -345,17 +346,11 @@ function handleAuthRole(row) {
|
|
|
|
|
|
|
|
/** 重置密码按钮操作 */
|
|
/** 重置密码按钮操作 */
|
|
|
function handleResetPwd(row) {
|
|
function handleResetPwd(row) {
|
|
|
- proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
|
|
|
|
|
|
|
+ proxy.$prompt(`请输入「${row.userName}」的新密码`, "重置密码", {
|
|
|
confirmButtonText: "确定",
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
cancelButtonText: "取消",
|
|
|
closeOnClickModal: false,
|
|
closeOnClickModal: false,
|
|
|
- inputPattern: /^.{5,20}$/,
|
|
|
|
|
- inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
|
|
|
|
|
- inputValidator: (value) => {
|
|
|
|
|
- if (/<|>|"|'|\||\\/.test(value)) {
|
|
|
|
|
- return "不能包含非法字符:< > \" ' \\\ |"
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ inputValidator: pwdPromptValidator
|
|
|
}).then(({ value }) => {
|
|
}).then(({ value }) => {
|
|
|
resetUserPwd(row.userId, value).then(() => {
|
|
resetUserPwd(row.userId, value).then(() => {
|
|
|
proxy.$modal.msgSuccess("修改成功,新密码是:" + value)
|
|
proxy.$modal.msgSuccess("修改成功,新密码是:" + value)
|