diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index e44ada5f..08824f12 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -937f5369a5d9b43eeb3c7fa2991f76724481721c \ No newline at end of file +3ae82b79660726c08077289a8873ef5ff3ff6471 \ No newline at end of file diff --git a/package.json b/package.json index f4d3bc44..b59968e6 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "flex.css": "^1.1.7", "github-markdown-css": "^2.10.0", "highlight.js": "^9.12.0", + "hotkeys-js": "^3.3.6", "js-cookie": "^2.2.0", "lodash": "^4.17.10", "lowdb": "^1.0.0", diff --git a/src/assets/style/theme/theme-base.scss.REMOVED.git-id b/src/assets/style/theme/theme-base.scss.REMOVED.git-id index 76786659..0313b944 100644 --- a/src/assets/style/theme/theme-base.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme-base.scss.REMOVED.git-id @@ -1 +1 @@ -27d62e35e945646beaa49ba9850fdbce60ed9e66 \ No newline at end of file +76c08deda5f3f6bd81e91aeb695cae984eab131e \ No newline at end of file diff --git a/src/assets/svg-icons/icons/d2-admin-text.svg b/src/assets/svg-icons/icons/d2-admin-text.svg new file mode 100644 index 00000000..abdcf0b8 --- /dev/null +++ b/src/assets/svg-icons/icons/d2-admin-text.svg @@ -0,0 +1,19 @@ + + + + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/layout/header-aside/components/header-search/index.vue b/src/layout/header-aside/components/header-search/index.vue new file mode 100644 index 00000000..4241920c --- /dev/null +++ b/src/layout/header-aside/components/header-search/index.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/layout/header-aside/components/mixin/menu.js b/src/layout/header-aside/components/mixin/menu.js index 78316f3a..7160b58f 100644 --- a/src/layout/header-aside/components/mixin/menu.js +++ b/src/layout/header-aside/components/mixin/menu.js @@ -3,7 +3,7 @@ import util from '@/libs/util.js' export default { methods: { handleMenuSelect (index, indexPath) { - if (/^d2-menu-empty-\d+$/.test(index)) { + if (/^d2-menu-empty-\d+$/.test(index) || index === undefined) { this.$message.warning('临时菜单') } else if (/^https:\/\/|http:\/\//.test(index)) { util.open(index) diff --git a/src/layout/header-aside/components/panel-search/components/panel-search-item/index.vue b/src/layout/header-aside/components/panel-search/components/panel-search-item/index.vue new file mode 100644 index 00000000..73a6f843 --- /dev/null +++ b/src/layout/header-aside/components/panel-search/components/panel-search-item/index.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/layout/header-aside/components/panel-search/index.vue b/src/layout/header-aside/components/panel-search/index.vue new file mode 100644 index 00000000..751d03d3 --- /dev/null +++ b/src/layout/header-aside/components/panel-search/index.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue index 04dce9ce..3a15413c 100644 --- a/src/layout/header-aside/layout.vue +++ b/src/layout/header-aside/layout.vue @@ -8,7 +8,12 @@
-
+
@@ -20,6 +25,7 @@
+ @@ -33,21 +39,39 @@ flex-box="0" ref="aside" class="d2-theme-container-aside" - :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}"> + :style="{ + width: asideCollapse ? asideWidthCollapse : asideWidth, + opacity: this.searchActive ? 0.3 : 1 + }">
-
-
- -
-
- - - - - -
+
+ + +
+ +
+
+ + +
+ +
+ +
+ +
+ + + + + +
+
+
@@ -56,13 +80,18 @@