Merge remote-tracking branch 'origin/master'

src/views/system/dept/index.vue

@@ -32,13 +32,13 @@
         </template>
       </template>
     </BasicTable>
-    <MenuDrawer @register="registerDrawer" @success="handleSuccess" />
+    <deptDrawer @register="registerDrawer" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup>
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { useDrawer } from '@/components/Drawer';
-  import MenuDrawer from './MenuDrawer.vue';
+  import deptDrawer from './deptDrawer.vue';
   import { columns, searchFormSchema } from './dept.data';
   import { getDeptList,deleteById } from "@/api/system/dept/dept";
   import { useMessage } from "@/hooks/web/useMessage";

src/views/system/user/account.data.ts

@@ -127,6 +127,13 @@ export const resetPasswordFormSchema: any[] = [
     // ifShow: false,
   },
 ]
+const passwordCheck = (rule, value, callback) => {
+  const pattern = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/
+  if (!pattern.test(value)) {
+    callback(new Error('新密码必须为数字与字母的组合'))
+  }
+  callback()
+}
 export const accountFormSchema: any[] = [
   {
     field: 'username',
@@ -144,7 +151,17 @@ export const accountFormSchema: any[] = [
     field: 'password',
     label: '密码',
     component: 'InputPassword',
+    rules: [
+      {
         required: true,
+        message: '请输入用户密码',
+      },
+      { min: 8, max: 16, message: '长度在 8 到 16 个字符', trigger: 'blur' },
+      {
+        validator: passwordCheck,
+        trigger: 'blur'
+      }
+    ],
   },
   {
     field: 'name',
@@ -173,16 +190,40 @@ export const accountFormSchema: any[] = [
     field: 'phone',
     label: '手机号码',
     component: 'Input',
+    rules: [
+      { required: false, message: '请输入手机号码', trigger: 'blur' },
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur'
+      }
+    ],
   },
   {
     field: 'idNumber',
     label: '身份证号',
     component: 'Input',
+    rules: [
+      {
+        required: false,
+        message: '请输入身份证号',
+        trigger: 'blur'
+      },
+      { min: 18, max: 18, message: '长度18字符', trigger: 'blur' }
+    ],
   },
   {
     field: 'email',
     label: '邮箱',
     component: 'Input',
+    rules: [
+      { required: false, message: '请输入邮箱地址', trigger: 'blur' },
+      {
+        type: 'email',
+        message: '请输入正确的邮箱地址',
+        trigger: ['blur', 'change']
+      }
+    ],
   },
   {
     field: 'flag',