From 2f3f97a12c3c20092ec17788aaabf01a7dab40df Mon Sep 17 00:00:00 2001 From: syuilo <syuilotan@yahoo.co.jp> Date: Sun, 18 Feb 2018 13:48:40 +0900 Subject: [PATCH] wip --- .../desktop/views/components/context-menu-menu.vue | 11 ++++++----- src/web/app/desktop/views/components/context-menu.vue | 2 +- src/web/app/desktop/views/components/dialog.vue | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/web/app/desktop/views/components/context-menu-menu.vue b/src/web/app/desktop/views/components/context-menu-menu.vue index 423ea0a1f0..c4ecc74a44 100644 --- a/src/web/app/desktop/views/components/context-menu-menu.vue +++ b/src/web/app/desktop/views/components/context-menu-menu.vue @@ -4,6 +4,9 @@ <template v-if="item.type == 'item'"> <p @click="click(item)"><span class="icon" v-if="item.icon" v-html="item.icon"></span>{{ item.text }}</p> </template> + <template v-if="item.type == 'link'"> + <a :href="item.href" :target="item.target" @click="click(item)"><span class="icon" v-if="item.icon" v-html="item.icon"></span>{{ item.text }}</a> + </template> <template v-else-if="item.type == 'nest'"> <p><span class="icon" v-if="item.icon" v-html="item.icon"></span>{{ item.text }}...<span class="caret">%fa:caret-right%</span></p> <me-nu :menu="item.menu" @x="click"/> @@ -31,11 +34,9 @@ export default Vue.extend({ $item-height = 38px $padding = 10px - ul - display block - margin 0 - padding $padding 0 - list-style none + margin 0 + padding $padding 0 + list-style none li display block diff --git a/src/web/app/desktop/views/components/context-menu.vue b/src/web/app/desktop/views/components/context-menu.vue index 9f5787e476..3ba475e111 100644 --- a/src/web/app/desktop/views/components/context-menu.vue +++ b/src/web/app/desktop/views/components/context-menu.vue @@ -1,5 +1,5 @@ <template> -<div class="context-menu" :style="{ x: `${x}px`, y: `${y}px` }" @contextmenu.prevent="() => {}"> +<div class="context-menu" :style="{ left: `${x}px`, top: `${y}px` }" @contextmenu.prevent="() => {}"> <me-nu :menu="menu" @x="click"/> </div> </template> diff --git a/src/web/app/desktop/views/components/dialog.vue b/src/web/app/desktop/views/components/dialog.vue index af65d5d21e..e92050dbad 100644 --- a/src/web/app/desktop/views/components/dialog.vue +++ b/src/web/app/desktop/views/components/dialog.vue @@ -16,7 +16,7 @@ import Vue from 'vue'; import * as anime from 'animejs'; export default Vue.extend({ - props: { + props: ['title', 'text', 'buttons', 'modal']/*{ title: { type: String }, @@ -30,7 +30,7 @@ export default Vue.extend({ type: Boolean, default: false } - }, + }*/, mounted() { this.$nextTick(() => { (this.$refs.bg as any).style.pointerEvents = 'auto';