+3
-3
| { | ||
| "name": "elsass", | ||
| "version": "0.1.21", | ||
| "version": "0.1.22", | ||
| "description": "A UI component library based on Vue2.0", | ||
@@ -22,5 +22,5 @@ "main": "./src/main.js", | ||
| "eslint-plugin-promise": "^4.2.1", | ||
| "iview": "^3.4.2", | ||
| "iview": "3.4.2", | ||
| "store": "^2.0.12", | ||
| "vue": "^2.6.10", | ||
| "vue": "2.6.10", | ||
| "vue-quill-editor": "3.0.6", | ||
@@ -27,0 +27,0 @@ "quill-image-drop-module": "1.0.3", |
@@ -14,5 +14,17 @@ <template> | ||
| <DropdownItem :key="`drop-${child.name}`" :name="getNameOrHref(child)" > | ||
| <RIcon class="menu-icon" :icon-class="child.icon || '' " style="margin-right: 3px"></RIcon> | ||
| <span class="menu-title" :title="get_title(parentItem)"> | ||
| {{ show_title(child) }}</span></DropdownItem> | ||
| <!-- <RIcon class="menu-icon" :icon-class="child.icon || '' " style="margin-right: 3px"></RIcon> | ||
| <span class="menu-title" :title="get_title(parentItem)"> | ||
| {{ show_title(child) }}</span> --> | ||
| <LinkMenuItem | ||
| :name="getName(child)" | ||
| :path="child.path" | ||
| :icon="child.icon" | ||
| :title="get_title(child)" | ||
| :type="child.type" | ||
| :target="child.target" | ||
| :key="`menu-${child.name}`" | ||
| :depth="2" | ||
| @click.native="handleClick(getNameOrHref(child))" | ||
| class="second-ivu-menu-item" /> | ||
| </DropdownItem> | ||
| </template> | ||
@@ -25,2 +37,3 @@ </DropdownMenu> | ||
| import itemMixin from './item-mixin' | ||
| import LinkMenuItem from './link-menu-item.vue' | ||
| import { findNodeUpperByClasses } from './util' | ||
@@ -31,2 +44,3 @@ | ||
| mixins: [ mixin, itemMixin ], | ||
| components: { LinkMenuItem }, | ||
| props: { | ||
@@ -33,0 +47,0 @@ hideTitle: { |
@@ -13,5 +13,4 @@ <template> | ||
| :openNames="openedNames" | ||
| width="auto" | ||
| :accordion="accordion" | ||
| :class="menuClass"> | ||
| :class="`${menuClass} r-collapse-menu`"> | ||
| <template v-for="item in menuList"> | ||
@@ -58,4 +57,4 @@ <template v-if="item.children && item.children.length === 1"> | ||
| </Menu> | ||
| <div class="menu-collapsed" v-show="isCollapsed" :list="menuList"> | ||
| <template v-for="item in menuList"> | ||
| <div class="menu-collapsed" v-show="isCollapsed"> | ||
| <div v-for="item in menuList" :key="`collapsed-drop-menu-${item.name}`"> | ||
| <collapsed-menu v-if="item.children && item.children.length >= 1" | ||
@@ -67,9 +66,11 @@ @on-click="collapsedSelect" | ||
| :parent-item="item" | ||
| :key="`drop-menu-${item.name}`"></collapsed-menu> | ||
| <Tooltip transfer v-else :content="get_title(item)" placement="right" :key="`drop-menu-${item.name}`"> | ||
| <a @click="handleSelect(getNameOrHref(item))" class="drop-menu-a" :style="{textAlign: 'center'}"> | ||
| ></collapsed-menu> | ||
| <Tooltip transfer v-else :content="get_title(item)" placement="right"> | ||
| <a @click="handleSelect(getNameOrHref(item))" | ||
| class="drop-menu-a" | ||
| :style="{textAlign: 'center'}"> | ||
| <RIcon :icon-class="item.icon || '' "></RIcon> | ||
| </a> | ||
| </Tooltip> | ||
| </template> | ||
| </div> | ||
| </div> | ||
@@ -196,3 +197,4 @@ <template v-if="!hideTrigger" v-slot:trigger> | ||
| collapsedSelect (name) { | ||
| this.$emit('on-select', name) | ||
| // this.$emit('on-select', name) | ||
| this.$emit('on-select-collapsed-item', name) | ||
| if (name.indexOf('isTurnByHref-') > -1) { | ||
@@ -204,7 +206,3 @@ // isTurnByHref_ index => 13 | ||
| window.open(path,target) | ||
| return | ||
| } | ||
| this.$router.push({ | ||
| name | ||
| }) | ||
| }, | ||
@@ -211,0 +209,0 @@ emitSelect (data) { |
@@ -140,2 +140,4 @@ @import './main' | ||
| margin: 0 | ||
| span | ||
| vertical-align: middle | ||
| li.ivu-menu-item | ||
@@ -152,2 +154,3 @@ height: 100% | ||
| @include menu_icon_color | ||
| // line-height: $header-height | ||
| a | ||
@@ -154,0 +157,0 @@ display: block |
@@ -103,2 +103,7 @@ @import './main' | ||
| overflow: -moz-scrollbars-none | ||
| .r-collapse-menu | ||
| width: 230px | ||
| .menu-collapsed | ||
| .ivu-dropdown | ||
| display: block | ||
| &.r-minimalism-side-menu | ||
@@ -105,0 +110,0 @@ @include minimalism_menu_border |
@@ -261,3 +261,3 @@ // 颜色、字体、尺寸定义文件 | ||
| $font-family: "Microsoft YaHei", "Heiti SC", "WenQuanYi Micro Hei", sans-serif | ||
| $font-family: "Microsoft YaHei", "苹方", Tahoma, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "WenQuanYi Micro Hei", sans-serif | ||
@@ -264,0 +264,0 @@ $n: 3px |
+0
-1
@@ -15,3 +15,2 @@ <template> | ||
| #app { | ||
| font-family: 'Avenir', Helvetica, Arial, sans-serif; | ||
| -webkit-font-smoothing: antialiased; | ||
@@ -18,0 +17,0 @@ -moz-osx-font-smoothing: grayscale; |
326008
0.21%+ Added
+ Added
+ Added
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
- Removed
Updated
Updated