diff --git a/package.json b/package.json index 2ea8319b..63df783f 100755 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@bytemd/plugin-gfm": "^1.21.0", "@bytemd/vue-next": "^1.21.0", "@headlessui/vue": "^1.7.17", + "@imengyu/vue3-context-menu": "^1.3.6", "@tinymce/tinymce-vue": "^5.1.1", "@vueuse/core": "^10.7.1", "@vueuse/integrations": "^10.7.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index da07365d..d3bc61c9 100755 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ dependencies: '@headlessui/vue': specifier: ^1.7.17 version: 1.7.17(vue@3.4.8) + '@imengyu/vue3-context-menu': + specifier: ^1.3.6 + version: 1.3.6 '@tinymce/tinymce-vue': specifier: ^5.1.1 version: 5.1.1(vue@3.4.8) @@ -2963,6 +2966,10 @@ packages: vue: 3.4.8(typescript@5.3.3) dev: true + /@imengyu/vue3-context-menu@1.3.6: + resolution: {integrity: sha512-xjA37derX5pVKyWjMe0mzbTEIBG6YJRYEMdLBjN3thoSVUuBTRObJ2Uc0sejU6QqM31pSr3PbITBgnXV6P1heg==} + dev: false + /@isaacs/cliui@8.0.2: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index 9523d070..6e20f387 100755 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -8,6 +8,8 @@ --g-sub-sidebar-collapse-width: 64px; // 侧边栏 Logo 区域高度 --g-sidebar-logo-height: 50px; + // 标签栏高度 + --g-tabbar-height: 50px; // 工具栏高度 --g-toolbar-height: 50px; } diff --git a/src/layouts/components/AppSetting/index.vue b/src/layouts/components/AppSetting/index.vue index 1015c69a..e15cd811 100755 --- a/src/layouts/components/AppSetting/index.vue +++ b/src/layouts/components/AppSetting/index.vue @@ -173,6 +173,29 @@ function handleCopy() { ]" /> +
+
+ 标签栏 +
+
+
+ 是否启用 +
+ +
+
+
+ 是否显示图标 +
+ +
+
+
+ 是否启用快捷键 +
+ +
+
工具栏
diff --git a/src/layouts/components/HotkeysIntro/index.vue b/src/layouts/components/HotkeysIntro/index.vue index a9e63371..a71478e7 100755 --- a/src/layouts/components/HotkeysIntro/index.vue +++ b/src/layouts/components/HotkeysIntro/index.vue @@ -50,6 +50,38 @@ onMounted(() => { +
+

+ 标签栏 +

+ +
diff --git a/src/layouts/components/Topbar/Tabbar/index.vue b/src/layouts/components/Topbar/Tabbar/index.vue new file mode 100644 index 00000000..3d4da8aa --- /dev/null +++ b/src/layouts/components/Topbar/Tabbar/index.vue @@ -0,0 +1,464 @@ + + + + + + + diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index e9dd6d14..cbb17f17 100755 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -1,4 +1,5 @@