Merge branch 'master' into b_lms2

lms/nladmin-ui/src/views/system/user/index.vue

@@ -383,6 +383,10 @@ export default {
         person_name: [
           { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '请输入用户密码', trigger: 'blur' },
+          { pattern: /^(?=.*\d)(?=.*[A-z])[\da-zA-Z]{6,12}$/, message: '长度6位以上，数字+密码', trigger: 'blur' }
         ]
       },
       syncDrawer: false,
@@ -469,7 +473,7 @@ export default {
     },
     // 新增前将多选的值设置为空
     [CRUD.HOOK.beforeToAdd]() {
-      this.form.password = '123456'
+      this.form.password = 'HL123456'
       this.roleDatas = []
     },
     // 初始化编辑时候的角色与岗位
@@ -627,10 +631,10 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        row.password = '123456'
+        row.password = 'HL123456'
         crudUser.edit(row).then(res => {
           this.crud.toQuery()
-          this.crud.notify('密码重置成功，密码:123456', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.notify('密码重置成功，密码:HL123456', CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
       })
     },