From 655fca1a141fc995c48342ec475ca5c6057a5491 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 22 Feb 2018 15:09:03 +0800 Subject: [PATCH] update --- components/align/Align.vue | 3 ++- components/avatar/Avatar.vue | 6 +++--- components/badge/style/index.less | 1 + components/button/style/mixin.less | 19 ++++++++++++------- components/dropdown/style/index.less | 1 + components/style/core/iconfont.less | 10 ++++++++++ components/style/themes/default.less | 4 +++- components/trigger/Popup.vue | 1 - components/vc-select/Select.vue | 6 ++++++ components/vc-select/assets/index.less | 1 + 10 files changed, 39 insertions(+), 13 deletions(-) diff --git a/components/align/Align.vue b/components/align/Align.vue index 979c4ec55..8e4e4e794 100644 --- a/components/align/Align.vue +++ b/components/align/Align.vue @@ -4,6 +4,7 @@ import align from 'dom-align' import addEventListener from '../_util/Dom/addEventListener' import { cloneElement } from '../_util/vnode.js' import isWindow from './isWindow' +import isEqual from 'lodash.isequal' function noop () { } @@ -55,7 +56,7 @@ export default { const props = this.$props let reAlign = false if (!props.disabled) { - if (prevProps.disabled || prevProps.align !== props.align) { + if (prevProps.disabled || !isEqual(prevProps.align, props.align)) { reAlign = true } else { const lastTarget = prevProps.target() diff --git a/components/avatar/Avatar.vue b/components/avatar/Avatar.vue index 5a8506528..090c0c008 100644 --- a/components/avatar/Avatar.vue +++ b/components/avatar/Avatar.vue @@ -33,10 +33,10 @@ export default { icon: String, }, data () { + this.isExistSlot = false + this.childrenWidth = 0 return { - isExistSlot: false, scale: 1, - childrenWidth: 0, } }, computed: { @@ -44,7 +44,7 @@ export default { const { prefixCls, shape, size, src, icon } = this return { [`${prefixCls}`]: true, - [`${prefixCls}-image`]: !!src, + [`${prefixCls}-image`]: !!src && this.state.isImgExist, [`${prefixCls}-icon`]: !!icon, [`${prefixCls}-${shape}`]: true, [`${prefixCls}-lg`]: size === 'large', diff --git a/components/badge/style/index.less b/components/badge/style/index.less index 16f25bdbf..336e4dbc3 100644 --- a/components/badge/style/index.less +++ b/components/badge/style/index.less @@ -24,6 +24,7 @@ text-align: center; padding: 0 6px; font-size: @badge-font-size; + font-weight: @badge-font-weight; white-space: nowrap; transform-origin: -10% center; box-shadow: 0 0 0 1px #fff; diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less index d4995fe32..57e17b424 100644 --- a/components/button/style/mixin.less +++ b/components/button/style/mixin.less @@ -108,7 +108,6 @@ display: inline-block; > .@{btnClassName} { position: relative; - z-index: 1; &:hover, &:focus, @@ -242,6 +241,8 @@ .@{btnClassName} + .@{btnClassName}, .@{btnClassName} + &, + span + .@{btnClassName}, + .@{btnClassName} + span, & + .@{btnClassName}, & + & { margin-left: -1px; @@ -251,15 +252,19 @@ border-radius: 0; } - > .@{btnClassName}:first-child { + > .@{btnClassName}:first-child, + > span:first-child > .@{btnClassName} { margin-left: 0; - &:not(:last-child) { - border-bottom-right-radius: 0; - border-top-right-radius: 0; - } } - > .@{btnClassName}:last-child:not(:first-child) { + > .@{btnClassName}:first-child:not(:last-child), + > span:first-child:not(:last-child) > .@{btnClassName} { + border-bottom-right-radius: 0; + border-top-right-radius: 0; + } + + > .@{btnClassName}:last-child:not(:first-child), + > span:last-child:not(:first-child) > .@{btnClassName} { border-bottom-left-radius: 0; border-top-left-radius: 0; } diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less index 52feee243..d191aa502 100644 --- a/components/dropdown/style/index.less +++ b/components/dropdown/style/index.less @@ -54,6 +54,7 @@ &-submenu-popup { position: absolute; + z-index: @zindex-dropdown; } &-item, diff --git a/components/style/core/iconfont.less b/components/style/core/iconfont.less index 84470a849..efb4deef5 100644 --- a/components/style/core/iconfont.less +++ b/components/style/core/iconfont.less @@ -328,3 +328,13 @@ .@{iconfont-css-prefix}-alipay:before { content: "\e9b3"; } .@{iconfont-css-prefix}-ant-design:before { content: "\e9b2"; } .@{iconfont-css-prefix}-aliyun:before { content: "\e9f4"; } +.@{iconfont-css-prefix}-zhihu:before { content: "\e703"; } +.@{iconfont-css-prefix}-file-markdown:before { content: "\e704"; } +.@{iconfont-css-prefix}-slack:before { content: "\e705"; } +.@{iconfont-css-prefix}-slack-square:before { content: "\e706"; } +.@{iconfont-css-prefix}-behance:before { content: "\e707"; } +.@{iconfont-css-prefix}-behance-square:before { content: "\e708"; } +.@{iconfont-css-prefix}-dribbble:before { content: "\e709"; } +.@{iconfont-css-prefix}-dribbble-square:before { content: "\e70a"; } +.@{iconfont-css-prefix}-instagram:before { content: "\e70b"; } +.@{iconfont-css-prefix}-yuque:before { content: "\e70c"; } diff --git a/components/style/themes/default.less b/components/style/themes/default.less index c126bddd4..343e374e3 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -67,7 +67,7 @@ // ICONFONT @iconfont-css-prefix : anticon; -@icon-url : "https://at.alicdn.com/t/font_148784_dky7e838xq4obt9"; +@icon-url : "https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i"; // LINK @link-color : @primary-color; @@ -362,6 +362,7 @@ @badge-height: 20px; @badge-dot-size: 6px; @badge-font-size: @font-size-sm; +@badge-font-weight: normal; @badge-status-size: 6px; // Rate @@ -426,6 +427,7 @@ // --- @pagination-item-size: 32px; @pagination-item-size-sm: 24px; +@pagination-font-family: Arial; // Breadcrumb // --- diff --git a/components/trigger/Popup.vue b/components/trigger/Popup.vue index 9f8e959ed..7424f596a 100644 --- a/components/trigger/Popup.vue +++ b/components/trigger/Popup.vue @@ -167,7 +167,6 @@ export default { key='popup' ref='alignInstance' monitorWindowResize - disabled={!visible} align={align} onAlign={this.onAlign} > diff --git a/components/vc-select/Select.vue b/components/vc-select/Select.vue index 0067009b4..1a7fa7b31 100644 --- a/components/vc-select/Select.vue +++ b/components/vc-select/Select.vue @@ -166,6 +166,12 @@ export default { } }, methods: { + updateLabelAndTitleMap () { + const labelMap = {} + const titleMap = {} + this.labelMap = labelMap + this.titleMap = titleMap + }, updateState () { const { combobox, $slots } = this let value = toArray(this.value) diff --git a/components/vc-select/assets/index.less b/components/vc-select/assets/index.less index 3fdf5bd09..68bb0719b 100644 --- a/components/vc-select/assets/index.less +++ b/components/vc-select/assets/index.less @@ -104,6 +104,7 @@ position: relative; .@{selectPrefixCls}-selection-selected-value { + pointer-events: none; position: absolute; left: 0; top: 0;