From d1a19c525fec504f7eeb8f60daa82c1baa9d0d63 Mon Sep 17 00:00:00 2001 From: likui628 <90845831+likui628@users.noreply.github.com> Date: Sun, 14 Jul 2024 14:02:55 +0800 Subject: [PATCH] chore: fix typecheck fail --- apps/web-antd/src/views/_core/fallback/coming-soon.vue | 2 +- apps/web-antd/src/views/demos/access/admin-visible.vue | 2 +- apps/web-antd/src/views/demos/access/menu-visible-403.vue | 2 +- apps/web-antd/src/views/demos/access/super-visible.vue | 2 +- apps/web-antd/src/views/demos/access/user-visible.vue | 2 +- .../src/views/demos/features/hide-menu-children/parent.vue | 2 +- apps/web-antd/src/views/demos/nested/menu-1.vue | 2 +- apps/web-antd/src/views/demos/nested/menu-2-1.vue | 2 +- apps/web-antd/src/views/demos/nested/menu-3-1.vue | 2 +- apps/web-antd/src/views/demos/nested/menu-3-2-1.vue | 2 +- packages/@core/locales/src/langs/en-US.json | 2 +- packages/@core/locales/src/langs/zh-CN.json | 2 +- packages/@core/shared/typings/src/app.d.ts | 1 - packages/effects/common-ui/src/authentication/register.vue | 2 +- 14 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/web-antd/src/views/_core/fallback/coming-soon.vue b/apps/web-antd/src/views/_core/fallback/coming-soon.vue index fca33921..f394930f 100644 --- a/apps/web-antd/src/views/_core/fallback/coming-soon.vue +++ b/apps/web-antd/src/views/_core/fallback/coming-soon.vue @@ -3,5 +3,5 @@ import { Fallback } from '@vben/common-ui'; diff --git a/apps/web-antd/src/views/demos/access/admin-visible.vue b/apps/web-antd/src/views/demos/access/admin-visible.vue index 88612b0b..59611f89 100644 --- a/apps/web-antd/src/views/demos/access/admin-visible.vue +++ b/apps/web-antd/src/views/demos/access/admin-visible.vue @@ -7,7 +7,7 @@ defineOptions({ name: 'AccessAdminVisible' }); diff --git a/apps/web-antd/src/views/demos/access/menu-visible-403.vue b/apps/web-antd/src/views/demos/access/menu-visible-403.vue index ccb9596f..a9969928 100644 --- a/apps/web-antd/src/views/demos/access/menu-visible-403.vue +++ b/apps/web-antd/src/views/demos/access/menu-visible-403.vue @@ -7,7 +7,7 @@ defineOptions({ name: 'AccessMenuVisible403' }); diff --git a/apps/web-antd/src/views/demos/access/super-visible.vue b/apps/web-antd/src/views/demos/access/super-visible.vue index a234d095..9e909a1c 100644 --- a/apps/web-antd/src/views/demos/access/super-visible.vue +++ b/apps/web-antd/src/views/demos/access/super-visible.vue @@ -7,7 +7,7 @@ defineOptions({ name: 'AccessSuperVisible' }); diff --git a/apps/web-antd/src/views/demos/access/user-visible.vue b/apps/web-antd/src/views/demos/access/user-visible.vue index 6f745786..f6ae5743 100644 --- a/apps/web-antd/src/views/demos/access/user-visible.vue +++ b/apps/web-antd/src/views/demos/access/user-visible.vue @@ -7,7 +7,7 @@ defineOptions({ name: 'AccessUserVisible' }); diff --git a/apps/web-antd/src/views/demos/features/hide-menu-children/parent.vue b/apps/web-antd/src/views/demos/features/hide-menu-children/parent.vue index 59f32d84..255fe310 100644 --- a/apps/web-antd/src/views/demos/features/hide-menu-children/parent.vue +++ b/apps/web-antd/src/views/demos/features/hide-menu-children/parent.vue @@ -7,7 +7,7 @@ defineOptions({ name: 'HideMenuChildren' }); diff --git a/apps/web-antd/src/views/demos/nested/menu-1.vue b/apps/web-antd/src/views/demos/nested/menu-1.vue index 31659feb..707844c4 100644 --- a/apps/web-antd/src/views/demos/nested/menu-1.vue +++ b/apps/web-antd/src/views/demos/nested/menu-1.vue @@ -5,5 +5,5 @@ defineOptions({ name: 'Menu1' }); diff --git a/apps/web-antd/src/views/demos/nested/menu-2-1.vue b/apps/web-antd/src/views/demos/nested/menu-2-1.vue index 2bced6e4..057b54fc 100644 --- a/apps/web-antd/src/views/demos/nested/menu-2-1.vue +++ b/apps/web-antd/src/views/demos/nested/menu-2-1.vue @@ -5,5 +5,5 @@ defineOptions({ name: 'Menu21' }); diff --git a/apps/web-antd/src/views/demos/nested/menu-3-1.vue b/apps/web-antd/src/views/demos/nested/menu-3-1.vue index a0ab57ae..97d7f699 100644 --- a/apps/web-antd/src/views/demos/nested/menu-3-1.vue +++ b/apps/web-antd/src/views/demos/nested/menu-3-1.vue @@ -5,5 +5,5 @@ defineOptions({ name: 'Menu31' }); diff --git a/apps/web-antd/src/views/demos/nested/menu-3-2-1.vue b/apps/web-antd/src/views/demos/nested/menu-3-2-1.vue index 506a2574..be4009df 100644 --- a/apps/web-antd/src/views/demos/nested/menu-3-2-1.vue +++ b/apps/web-antd/src/views/demos/nested/menu-3-2-1.vue @@ -5,5 +5,5 @@ defineOptions({ name: 'Menu321' }); diff --git a/packages/@core/locales/src/langs/en-US.json b/packages/@core/locales/src/langs/en-US.json index 7ef68fda..32e9bdd2 100644 --- a/packages/@core/locales/src/langs/en-US.json +++ b/packages/@core/locales/src/langs/en-US.json @@ -101,7 +101,7 @@ "confirmPassword": "Comfirm Password", "confirmPasswordTip": "The passwords do not match", "agree": "I agree to", - "agreeprivacyPolicy": "Privacy-policy", + "privacyPolicy": "Privacy-policy", "terms": "Terms", "agreeTip": "Please agree to the Privacy Policy and Terms", "goToLogin": "Login instead", diff --git a/packages/@core/locales/src/langs/zh-CN.json b/packages/@core/locales/src/langs/zh-CN.json index 1d56b6d8..ba8750f3 100644 --- a/packages/@core/locales/src/langs/zh-CN.json +++ b/packages/@core/locales/src/langs/zh-CN.json @@ -101,7 +101,7 @@ "confirmPassword": "确认密码", "confirmPasswordTip": "两次输入的密码不一致", "agree": "我同意", - "agreeprivacyPolicy": "隐私政策", + "privacyPolicy": "隐私政策", "terms": "条款", "agreeTip": "请同意隐私政策和条款", "goToLogin": "去登录", diff --git a/packages/@core/shared/typings/src/app.d.ts b/packages/@core/shared/typings/src/app.d.ts index be2b6e9d..120ab8dd 100644 --- a/packages/@core/shared/typings/src/app.d.ts +++ b/packages/@core/shared/typings/src/app.d.ts @@ -14,7 +14,6 @@ type BuiltinThemeType = | 'deep-blue' | 'deep-green' | 'default' - | 'default' | 'gray' | 'green' | 'neutral' diff --git a/packages/effects/common-ui/src/authentication/register.vue b/packages/effects/common-ui/src/authentication/register.vue index e2c91273..df002acf 100644 --- a/packages/effects/common-ui/src/authentication/register.vue +++ b/packages/effects/common-ui/src/authentication/register.vue @@ -134,7 +134,7 @@ function goToLogin() { > {{ $t('authentication.agree') }} {{ - $t('authentication.agreeprivacyPolicy') + $t('authentication.privacyPolicy') }} &