diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index 22370e5c..21361b86 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -29,6 +29,8 @@ * [ 修复 ] d2-container 组件改为同步注册(之前的异步注册会有 mounted 生命周期问题,即 slot 内的页面在 mounted 生命周期内拿不到 dom) * [ 修复 ] d2-container 组件重构 flex 布局 * [ 新增 ] 404 page +* [ 新增 ] 顶栏联系方式 +* [ 新增 ] 右键菜单组件 ## v1.0.0 diff --git a/src/assets/style/fixed/vue-grid-layout.scss b/src/assets/style/fixed/vue-grid-layout.scss index 5027db69..c2c045a6 100644 --- a/src/assets/style/fixed/vue-grid-layout.scss +++ b/src/assets/style/fixed/vue-grid-layout.scss @@ -1,7 +1,5 @@ // vue-splitpane 样式补丁 -@import '~@/assets/style/unit/_color.scss'; - .vue-grid-item { &.vue-grid-placeholder { border: 1px solid $color-border-1; diff --git a/src/components/core/register.js b/src/components/core/register.js index fffddae7..0c3bf1fb 100644 --- a/src/components/core/register.js +++ b/src/components/core/register.js @@ -3,7 +3,7 @@ import Vue from 'vue' import { GridLayout, GridItem } from 'vue-grid-layout' import SplitPane from 'vue-splitpane' -// 主容器 +// 主容器 这个必须要同步注册 import d2Container from '@/components/core/d2-container' Vue.component('d2-grid-layout', GridLayout) diff --git a/src/menu/index.js b/src/menu/index.js index 588660c2..5dad5526 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -101,11 +101,14 @@ const demoComponents = { children: [ { path: `${pre}contextmenu/simple`, title: '基础' }, { path: `${pre}contextmenu/divier`, title: '分割线' }, - { path: `${pre}contextmenu/group`, title: '按钮组' } + { path: `${pre}contextmenu/group`, title: '按钮组' }, + { path: `${pre}contextmenu/submenu`, title: '子菜单' }, + { path: `${pre}contextmenu/disabled`, title: '禁用' }, + { path: `${pre}contextmenu/custom-trigger`, title: '自定义事件' } ] }, { path: `${pre}bigdata-table`, title: '百万数量级表格' }, - { path: `${pre}scrollbar`, title: 'ElementUI 滚动条组件' }, + { path: `${pre}scrollbar`, title: 'Element 滚动条组件' }, { path: `${pre}countup`, title: '数字动画' }, { path: `${pre}editor-quill`, title: '富文本编辑器' }, { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' }, @@ -142,7 +145,7 @@ const demoChart = { // 路由菜单 组件库 const demoElement = { path: '/demo/element', - title: '组件库', + title: 'Element 组件库', icon: 'puzzle-piece', children: (pre => [ { path: `${pre}index`, title: '组件库首页' }, diff --git a/src/pages/core/404/index.vue b/src/pages/core/404/index.vue index 7bc892c7..ea85f5d7 100644 --- a/src/pages/core/404/index.vue +++ b/src/pages/core/404/index.vue @@ -8,6 +8,7 @@ diff --git a/src/pages/demo/business/index/index.vue b/src/pages/demo/business/index/index.vue index a9927cb4..44750655 100644 --- a/src/pages/demo/business/index/index.vue +++ b/src/pages/demo/business/index/index.vue @@ -2,7 +2,7 @@ + sub-title="暂时还没有什么"> diff --git a/src/pages/demo/business/user-center/home/index.vue b/src/pages/demo/business/user-center/home/index.vue deleted file mode 100644 index 32734de1..00000000 --- a/src/pages/demo/business/user-center/home/index.vue +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/src/pages/demo/components/contextmenu/custom-trigger.vue b/src/pages/demo/components/contextmenu/custom-trigger.vue new file mode 100644 index 00000000..771b8ff7 --- /dev/null +++ b/src/pages/demo/components/contextmenu/custom-trigger.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/pages/demo/components/contextmenu/disabled.vue b/src/pages/demo/components/contextmenu/disabled.vue new file mode 100644 index 00000000..0c8576da --- /dev/null +++ b/src/pages/demo/components/contextmenu/disabled.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/pages/demo/components/contextmenu/group.vue b/src/pages/demo/components/contextmenu/group.vue index 927763f9..8bc3312c 100644 --- a/src/pages/demo/components/contextmenu/group.vue +++ b/src/pages/demo/components/contextmenu/group.vue @@ -1,6 +1,6 @@