Merge pull request #65 from suyuan32/dev

Dev
suyuan32 · Jun 19, 2023 · 96cf4ec · 96cf4ec
2 parents 17bc48c + f5529c5
commit 96cf4ec
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/views/dashboard/workbench/components/data.ts b/src/views/dashboard/workbench/components/data.ts
@@ -52,5 +52,5 @@ export const navItems: NavItem[] = [
 
 export const systemInfoData = [
   ['sys.sys.Name', 'Simple Admin'],
-  ['sys.sys.version', 'V 1.0.9'],
+  ['sys.sys.version', 'V 1.0.10'],
 ];
diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue
@@ -158,8 +158,8 @@
         username: data.account,
         captcha: data.captcha,
         captchaId: data.captchaId,
-        mode: 'none',
         goHome: false,
+        mode: 'notice',
       })
       .then(() => {
         loading.value = false;

diff --git a/src/views/sys/user/user.data.ts b/src/views/sys/user/user.data.ts
@@ -8,7 +8,6 @@ import { getRoleList } from '/@/api/sys/role';
 import { getDepartmentList } from '/@/api/sys/department';
 import { getPositionList } from '/@/api/sys/position';
 import { updateUser } from '/@/api/sys/user';
-import { ParentIdEnum } from '/@/enums/appEnum';
 
 const { t } = useI18n();
 
@@ -178,7 +177,6 @@ export const formSchema: FormSchema[] = [
     field: 'password',
     label: t('sys.login.password'),
     component: 'Input',
-    rules: [{ min: 6 }],
   },
   {
     field: 'roleIds',
@@ -212,12 +210,6 @@ export const formSchema: FormSchema[] = [
       resultField: 'data.data',
       labelField: 'trans',
       valueField: 'id',
-      defaultValue: {
-        id: ParentIdEnum.DEFAULT,
-        parentId: -1,
-        label: t('sys.department.firstLevelDepartment'),
-        value: ParentIdEnum.DEFAULT,
-      },
     },
   },
   {