sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
Former-commit-id: acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly 683fdb9f545e9858574c65a565572bcd3591cdbf [formerly 86e5bf3b6a2e4ed0bb293c8cac6dd4bb6044598d]]]]]
Former-commit-id: 984ae0d808e0f968c8dd12172e3bbf310988662a
Former-commit-id: e78d96d19aba6de61041e3dbcd0e0933b94b2409
Former-commit-id: f4a42f6f7722c736993c1fed1f7ac72f10aae6c6 [formerly 85e431d8f80651ebed3c93f787fd715d4d8777d2]
Former-commit-id: 1e36a362c661c2d30a1e9270e97c482161993178
Former-commit-id: cd12f1dc733f051ba9f3b2402a253dcf1cae7c13
Former-commit-id: dabe846961afff06e599ba799ab4e2c05bd40663
Former-commit-id: 21c48d190f3f86d1e511b640f60179efe8a13925
Former-commit-id: 71e5dc2ad87ffe2fbf2e961ff452db1a8f5a079f
This commit is contained in:
liyang
2018-08-02 14:19:44 +08:00
parent 351dbdb020 b677a6d373
commit 1a2ee5a0a5
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "d2-admin", "name": "d2-admin",
"version": "1.1.6", "version": "1.1.7",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve --open", "serve": "vue-cli-service serve --open",

11
src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
View File

@@ -21,7 +21,7 @@
</template> </template>
<script> <script>
export default { export default {
name: 'd2-contextmenu-list', name: 'd2-contextmenu-list',
props: { props: {
menulist: { menulist: {
@@ -32,13 +32,20 @@
methods: { methods: {
rowClick (event) { rowClick (event) {
let target = event.target let target = event.target
while(!target.dataset.value) { try {
let count = 0
while (!target.dataset.value && count < 6) {
target = target.parentNode target = target.parentNode
count++
} }
this.$emit('rowClick', target.dataset.value) this.$emit('rowClick', target.dataset.value)
} catch (error) {
// 不做任何处理
console.log(error)
} }
} }
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">

1
src/layout/header-aside/components/tabs/index.vue
View File

@@ -19,7 +19,6 @@
@edit="handleTabsEdit" @edit="handleTabsEdit"
@contextmenu.native="handleContextmenu"> @contextmenu.native="handleContextmenu">
<el-tab-pane <el-tab-pane
class="hello"
v-for="(page, index) in pageOpenedList" v-for="(page, index) in pageOpenedList"
:key="index" :key="index"
:label="page.meta.title || '未命名'" :label="page.meta.title || '未命名'"