From 28922ec116ad4c0649005c51863f5e2d987e85fa Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:20:59 +0800
Subject: [PATCH] no message
Former-commit-id: cba677736e2f60aabfec82226a8a91c8c8714bac [formerly cba677736e2f60aabfec82226a8a91c8c8714bac [formerly cba677736e2f60aabfec82226a8a91c8c8714bac [formerly cba677736e2f60aabfec82226a8a91c8c8714bac [formerly 6c59c3126086bb46805ad046ce51d7d4eb6409e8 [formerly 5467b975994329dc9e7921e786e62bd26f7c9d7a]]]]]
Former-commit-id: e842168fc72d8aae90aa42c79ca42c9474c602a4
Former-commit-id: 831db109565a97d9ecf4ae7836e39625026e00f2
Former-commit-id: dc6fa891be376efc3a1d1abeda1c1f33e62c486f [formerly 75ca46019a8418b8b9282f4f57788ae467d9387f]
Former-commit-id: debe3ffba91eccc2a771b7591d3b1829e5367875
Former-commit-id: e1861989ed53d1e14aaa713d00b06c622246eeef
Former-commit-id: 8ecf0e44d957e858f993583808f2e4aff36d7cda
Former-commit-id: 3ee82394ea19e2dd0ef6dfc15063ade1e1fc23c2
Former-commit-id: a603969620a081be6b48e0677b7f4e506fe835ea
---
src/menu/index.js | 4 +-
.../demo/components/contextmenu/disabled.vue | 38 ++++++++++++++++++
.../demo/components/contextmenu/group.vue | 2 +-
.../demo/components/contextmenu/submenu.vue | 40 +++++++++++++++++++
src/router/index.js.REMOVED.git-id | 2 +-
5 files changed, 83 insertions(+), 3 deletions(-)
create mode 100644 src/pages/demo/components/contextmenu/disabled.vue
create mode 100644 src/pages/demo/components/contextmenu/submenu.vue
diff --git a/src/menu/index.js b/src/menu/index.js
index 588660c2..3c48efd4 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -101,7 +101,9 @@ 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}bigdata-table`, title: '百万数量级表格' },
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 @@
+
+
+ 禁用
+
+ 菜单1
+ 菜单2
+
+
+ 菜单3
+
+
+ 菜单5
+
+ 菜单4
+
+
+
+
+
+
+
+
+
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 @@
- 分割线
+ 按钮组
菜单1
diff --git a/src/pages/demo/components/contextmenu/submenu.vue b/src/pages/demo/components/contextmenu/submenu.vue
new file mode 100644
index 00000000..4dbabcf4
--- /dev/null
+++ b/src/pages/demo/components/contextmenu/submenu.vue
@@ -0,0 +1,40 @@
+
+
+ 子菜单
+
+ 菜单 1
+ 菜单 2
+
+
+ 菜单 3-1
+
+
+ 菜单 3-2-1
+
+ 菜单 3-3
+ 菜单 3-4
+ 菜单 3-5
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index 43600d62..4a49c396 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-ca9703fe75f6928e93a03443767f2b87cbe5ef2a
\ No newline at end of file
+339b0329c6d4d368603852cd4bc5ec119ad52832
\ No newline at end of file