perf: 开发修改密码和平台设置板块

portal-manager-ui/admin/src/utils/js/validate.js

@@ -43,10 +43,20 @@ export const changeAccount = (rule, value, callback) => {
 
 // 验证密码
 export const changePassWord = (rule, value, callback) => {
+  let reg =
+    /^\S*(?=\S{8,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*()_+{}|:;<>,.?~])\S*$/;
   if (!value) {
-    callback(new Error("请输入密码"));
-  } else if (!/^[a-zA-Z0-9_!@#$%^&*`~()-+=]{5,18}$/.test(value)) {
-    callback(new Error("5到18位(字母、数字、特殊字符)"));
+    if (rule.required) {
+      callback(new Error(rule.msg || "请输入密码"));
+    } else {
+      callback();
+    }
+  } else if (!reg.test(value)) {
+    callback(
+      new Error(
+        "最少8位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符"
+      )
+    );
   } else {
     callback();
   }

portal-manager-ui/admin/src/views/home/components/changePassword.vue

@@ -56,7 +56,7 @@ export default {
   data() {
     const changePwdAgain = (rule, value, callback) => {
       if (!value) {
-        callback(new Error("请再次输入密码"));
+        callback(new Error("请再次输入新密码"));
       } else if (value !== this.form.newPwd) {
         callback(new Error("两次密码输入不一致"));
       } else {
@@ -75,10 +75,19 @@ export default {
         //   { required: true, validator: changeAccount, trigger: "blur" },
         // ],
         oldPwd: [
-          { required: true, validator: changePassWord, trigger: "blur" },
+          {
+            required: true,
+            message: "请输入原密码",
+            trigger: "blur",
+          },
         ],
         newPwd: [
-          { required: true, validator: changePassWord, trigger: "blur" },
+          {
+            required: true,
+            msg: "请输入新密码",
+            validator: changePassWord,
+            trigger: "blur",
+          },
         ],
         newPwdAgain: [
           { required: true, validator: changePwdAgain, trigger: "blur" },

portal-manager-ui/admin/src/views/home/home.vue

@@ -61,9 +61,9 @@
             <a-icon type="down" />
           </a>
           <a-menu slot="overlay">
-            <!-- <a-menu-item>
+            <a-menu-item>
               <a href="javascript:;" @click="fnChangePassword">修改密码</a>
-            </a-menu-item> -->
+            </a-menu-item>
             <a-menu-item>
               <a href="javascript:;" @click="Logout">退出登录</a>
             </a-menu-item>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditPwd.vue

@@ -13,10 +13,10 @@
         :model="form"
         :rules="rules"
         ref="formData"
-        :label-col="{ span: 5 }"
-        :wrapper-col="{ span: 19 }"
+        :label-col="{ span: 6 }"
+        :wrapper-col="{ span: 18 }"
       >
-        <a-form-model-item label="用户名" prop="loginName">
+        <a-form-model-item label="用户名">
           <a-input
             disabled
             v-model="form.loginName"
@@ -24,10 +24,15 @@
           />
         </a-form-model-item>
         <a-form-model-item label="新密码" prop="newPwd">
-          <a-input-password v-model="form.newPwd" placeholder="请输入新密码" />
+          <a-input-password
+            allowClear
+            v-model="form.newPwd"
+            placeholder="请输入新密码"
+          />
         </a-form-model-item>
         <a-form-model-item label="确认新密码" prop="newPwdAgain">
           <a-input-password
+            allowClear
             v-model="form.newPwdAgain"
             placeholder="请再次输入新密码"
           />
@@ -58,7 +63,7 @@ export default {
   data() {
     const changePwdAgain = (rule, value, callback) => {
       if (!value) {
-        callback(new Error("请再次输入密码"));
+        callback(new Error("请再次输入新密码"));
       } else if (value !== this.form.newPwd) {
         callback(new Error("两次密码输入不一致"));
       } else {
@@ -76,7 +81,12 @@ export default {
           { required: true, validator: changeAccount, trigger: "blur" },
         ],
         newPwd: [
-          { required: true, validator: changePassWord, trigger: "blur" },
+          {
+            required: true,
+            msg: "请输入新密码",
+            validator: changePassWord,
+            trigger: "blur",
+          },
         ],
         newPwdAgain: [
           { required: true, validator: changePwdAgain, trigger: "blur" },
@@ -121,5 +131,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>
\ No newline at end of file