diff --git a/src/components/global-setting/index.vue b/src/components/global-setting/index.vue
index da2a4c3..90af1fe 100644
--- a/src/components/global-setting/index.vue
+++ b/src/components/global-setting/index.vue
@@ -7,18 +7,21 @@
{{ $t('settings.title') }}
+ {{ $t('settings.alertContent') }}
- {{ $t('settings.alertContent') }}
+
+
+ {{ $t('settings.copySettings') }}
+
+
@@ -94,5 +97,9 @@ const setVisible = () => {
font-size: 18px;
vertical-align: -4px;
}
+
+ .arco-drawer-footer > .arco-btn {
+ margin-left: 0;
+ }
}
diff --git a/src/components/navbar/index.vue b/src/components/navbar/index.vue
index 13faac1..81c270f 100644
--- a/src/components/navbar/index.vue
+++ b/src/components/navbar/index.vue
@@ -2,10 +2,7 @@
-
+
-
-
-
-
-
-
-
+
+
+ -
+
+
+
+
-
-
-
+
-
-
-
-
+
+
-
+
+ -
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
+
+
@@ -202,6 +173,7 @@ import useLocale from '@/hooks/locale';
import useUser from '@/hooks/user';
import Menu from '@/components/menu/index.vue';
import MessageBox from '../message-box/index.vue';
+import logoSvg from '@/assets/logo.svg';
const appStore = useAppStore();
const userStore = useUserStore();
@@ -209,9 +181,6 @@ const { logout } = useUser();
const { changeLocale, currentLocale } = useLocale();
const { isFullscreen, toggle: toggleFullScreen } = useFullscreen();
const locales = [...LOCALE_OPTIONS];
-const avatar = computed(() => {
- return userStore.avatar;
-});
const theme = computed(() => {
return appStore.theme;
});
@@ -234,6 +203,9 @@ const handleToggleTheme = () => {
const setVisible = () => {
appStore.updateSettings({ globalSettings: true });
};
+const handleReload = () => {
+ window.location.reload();
+};
const refBtn = ref();
const triggerBtn = ref();
const setPopoverVisible = () => {
@@ -293,7 +265,7 @@ const toggleDrawerMenu = inject('toggleDrawerMenu') as () => void;
li {
display: flex;
align-items: center;
- padding: 0 10px;
+ padding: 0 4px;
}
a {
@@ -302,9 +274,27 @@ const toggleDrawerMenu = inject('toggleDrawerMenu') as () => void;
}
.nav-btn {
- font-size: 16px;
+ position: relative;
+ box-sizing: border-box;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 32px;
+ height: 32px;
+ // transition: all 0.1s cubic-bezier(0, 0, 1, 1);
+ font-size: 18px;
+ font-weight: 400;
+ line-height: 1.5715;
color: rgb(var(--gray-8));
- border-color: rgb(var(--gray-2));
+ text-align: center;
+ white-space: nowrap;
+ cursor: pointer;
+ border-radius: var(--border-radius-circle);
+ outline: none;
+
+ &:hover {
+ border: 1px solid rgb(var(--gray-2));
+ }
}
.trigger-btn,
diff --git a/src/components/tab-bar/readme.md b/src/components/tab-bar/readme.md
deleted file mode 100644
index cea5c93..0000000
--- a/src/components/tab-bar/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## 组件说明
-
-该组件非官方最终设计规范,以单独组件存在。
-
-同时仅仅提供最基本的功能,后续进行优化及更改。
-
-
-## Component description
-
-The component unofficial final design specification exists as a separate component.
-
-At the same time, only the most basic functions are provided, and subsequent optimizations and changes will be made.
\ No newline at end of file
diff --git a/src/locale/en-US/index.json b/src/locale/en-US/index.json
index f5f1086..118aad1 100644
--- a/src/locale/en-US/index.json
+++ b/src/locale/en-US/index.json
@@ -1,16 +1,17 @@
{
+ "common.add": "Add",
+ "common.back": "Back",
+ "common.cancel": "Cancel",
+ "common.close": "Close",
+ "common.confirm": "Confirm",
+ "common.copy": "Copy",
+ "common.delete": "Delete",
+ "common.edit": "Edit",
"common.login": "Login",
"common.logout": "Logout",
"common.ok": "OK",
- "common.cancel": "Cancel",
"common.save": "Save",
- "common.delete": "Delete",
- "common.confirm": "Confirm",
- "common.add": "Add",
- "common.edit": "Edit",
- "common.copy": "Copy",
- "common.close": "Close",
- "common.back": "Back",
+ "common.signin": "Sign in",
"login-agreement": "I have read and agree",
"login-agreement-and": "and",
"login-privacy-policy": "Privacy Policy",
@@ -30,7 +31,22 @@
"login.form.username.msg": "Please enter account/email",
"login.form.username.placeholder": "Account/Email",
"login.more": "More",
+ "messageBox.logout": "Logout",
+ "messageBox.switchRoles": "Switch Roles",
+ "messageBox.userCenter": "User Center",
+ "messageBox.userSettings": "User Settings",
+ "settings.alertContent": "The current modifications serve for previewing configuration changes in real-time. To apply them permanently to the project, click the \"Copy Configuration\" button below and paste the configuration into the src/config/settings.ts file.",
"settings.close": "",
- "settings.copySettings": "",
- "common.signin": "Sign in"
+ "settings.copySettings": "Copy Settings",
+ "settings.language": "language",
+ "settings.navbar.alerts": "Alerts",
+ "settings.navbar.screen.toExit": "Exit full",
+ "settings.navbar.screen.toFull": "Full",
+ "settings.navbar.theme.toDark": "Click to use Dark mode",
+ "settings.navbar.theme.toLight": "Click to use light mode",
+ "settings.reload": "Reload",
+ "settings.source": "Source",
+ "settings.sync": "Sync",
+ "settings.title": "Application configuration",
+ "signin": ""
}
diff --git a/src/locale/zh-CN/index.json b/src/locale/zh-CN/index.json
index b3e01e5..9102b48 100644
--- a/src/locale/zh-CN/index.json
+++ b/src/locale/zh-CN/index.json
@@ -1,15 +1,17 @@
{
+ "common.add": "添加",
+ "common.back": "返回",
+ "common.cancel": "取消",
+ "common.close": "关闭",
+ "common.confirm": "",
+ "common.copy": "复制",
+ "common.delete": "删除",
+ "common.edit": "编辑",
"common.login": "登录",
"common.logout": "退出",
"common.ok": "确定",
- "common.cancel": "取消",
"common.save": "保存",
- "common.delete": "删除",
- "common.add": "添加",
- "common.edit": "编辑",
- "common.copy": "复制",
- "common.close": "关闭",
- "common.back": "返回",
+ "common.signin": "",
"login-agreement": "我已阅读并同意",
"login-agreement-and": "和",
"login-privacy-policy": "隐私政策",
@@ -29,7 +31,22 @@
"login.form.username.msg": "请输入账号/邮箱",
"login.form.username.placeholder": "账号/邮箱",
"login.more": "更多方式",
+ "messageBox.logout": "退出登录",
+ "messageBox.switchRoles": "切换权限",
+ "messageBox.userCenter": "用户中心",
+ "messageBox.userSettings": "用户设置",
+ "settings.alertContent": "当前更改仅是实时预览配置效果。要真正作用于项目,点击下方的「复制配置」按钮,将配置粘贴到 src/config/settings.ts 中即可。",
"settings.close": "关闭",
- "settings.copySettings": "确定",
+ "settings.copySettings": "复制配置",
+ "settings.language": "语言",
+ "settings.navbar.alerts": "消息通知",
+ "settings.navbar.screen.toExit": "退出全屏",
+ "settings.navbar.screen.toFull": "全屏",
+ "settings.navbar.theme.toDark": "点击切换为暗黑模式",
+ "settings.navbar.theme.toLight": "点击切换为亮色模式",
+ "settings.reload": "重新加载",
+ "settings.source": "源码",
+ "settings.sync": "刷新",
+ "settings.title": "应用配置",
"signin": "注册"
}
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index e58e304..3ba7ba2 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -50,6 +50,7 @@ declare module 'vue' {
APopover: typeof import('@arco-design/web-vue')['Popover']
ARadio: typeof import('@arco-design/web-vue')['Radio']
ARadioGroup: typeof import('@arco-design/web-vue')['RadioGroup']
+ ARangePicker: typeof import('@arco-design/web-vue')['RangePicker']
AResult: typeof import('@arco-design/web-vue')['Result']
ARow: typeof import('@arco-design/web-vue')['Row']
ASelect: typeof import('@arco-design/web-vue')['Select']
@@ -93,6 +94,7 @@ declare module 'vue' {
IconCommand: typeof import('@arco-design/web-vue/es/icon')['IconCommand']
IconDesktop: typeof import('@arco-design/web-vue/es/icon')['IconDesktop']
IconDownload: typeof import('@arco-design/web-vue/es/icon')['IconDownload']
+ IconDragArrow: typeof import('@arco-design/web-vue/es/icon')['IconDragArrow']
IconExport: typeof import('@arco-design/web-vue/es/icon')['IconExport']
IconFaceSmileFill: typeof import('@arco-design/web-vue/es/icon')['IconFaceSmileFill']
IconFolderDelete: typeof import('@arco-design/web-vue/es/icon')['IconFolderDelete']
@@ -102,12 +104,14 @@ declare module 'vue' {
IconHome: typeof import('@arco-design/web-vue/es/icon')['IconHome']
IconLanguage: typeof import('@arco-design/web-vue/es/icon')['IconLanguage']
IconLarkColor: typeof import('@arco-design/web-vue/es/icon')['IconLarkColor']
+ IconLineHeight: typeof import('@arco-design/web-vue/es/icon')['IconLineHeight']
IconLocation: typeof import('@arco-design/web-vue/es/icon')['IconLocation']
IconLock: typeof import('@arco-design/web-vue/es/icon')['IconLock']
IconMenuFold: typeof import('@arco-design/web-vue/es/icon')['IconMenuFold']
IconMoonFill: typeof import('@arco-design/web-vue/es/icon')['IconMoonFill']
IconMore: typeof import('@arco-design/web-vue/es/icon')['IconMore']
IconNotification: typeof import('@arco-design/web-vue/es/icon')['IconNotification']
+ IconPlus: typeof import('@arco-design/web-vue/es/icon')['IconPlus']
IconRefresh: typeof import('@arco-design/web-vue/es/icon')['IconRefresh']
IconSearch: typeof import('@arco-design/web-vue/es/icon')['IconSearch']
IconSettings: typeof import('@arco-design/web-vue/es/icon')['IconSettings']
@@ -115,6 +119,7 @@ declare module 'vue' {
IconStop: typeof import('@arco-design/web-vue/es/icon')['IconStop']
IconSunFill: typeof import('@arco-design/web-vue/es/icon')['IconSunFill']
IconSwap: typeof import('@arco-design/web-vue/es/icon')['IconSwap']
+ IconSync: typeof import('@arco-design/web-vue/es/icon')['IconSync']
IconTag: typeof import('@arco-design/web-vue/es/icon')['IconTag']
IconTags: typeof import('@arco-design/web-vue/es/icon')['IconTags']
IconTiktokColor: typeof import('@arco-design/web-vue/es/icon')['IconTiktokColor']