From 57452b50ab5baf1f31d5fd581db42a1b403951be Mon Sep 17 00:00:00 2001 From: Ryan SU Date: Mon, 19 Jun 2023 09:04:07 +0800 Subject: [PATCH 1/2] fix: remove default value for department --- src/views/sys/user/user.data.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/views/sys/user/user.data.ts b/src/views/sys/user/user.data.ts index 8c5c2838..8433f6c1 100644 --- 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(); @@ -212,12 +211,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, - }, }, }, { From f5529c537b72d88c6d0e70a2fb63b51b94ae448c Mon Sep 17 00:00:00 2001 From: Ryan SU Date: Mon, 19 Jun 2023 20:23:03 +0800 Subject: [PATCH 2/2] fix: new system version and login request --- src/views/dashboard/workbench/components/data.ts | 2 +- src/views/sys/login/LoginForm.vue | 2 +- src/views/sys/user/user.data.ts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/dashboard/workbench/components/data.ts b/src/views/dashboard/workbench/components/data.ts index 62535cf7..10c8bce1 100644 --- 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 index 740f8cc4..f2abf827 100644 --- 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 index 8433f6c1..5a16dbc3 100644 --- a/src/views/sys/user/user.data.ts +++ b/src/views/sys/user/user.data.ts @@ -177,7 +177,6 @@ export const formSchema: FormSchema[] = [ field: 'password', label: t('sys.login.password'), component: 'Input', - rules: [{ min: 6 }], }, { field: 'roleIds',