feat: update alert && update anchor

pull/666/head
wangxueliang 2019-03-11 14:43:23 +08:00
parent 75cc96eefd
commit 08821561ab
6 changed files with 31 additions and 12 deletions

View File

@ -5,6 +5,7 @@ import PropTypes from '../_util/vue-types';
import getTransitionProps from '../_util/getTransitionProps'; import getTransitionProps from '../_util/getTransitionProps';
import { getComponentFromProp, isValidElement } from '../_util/props-util'; import { getComponentFromProp, isValidElement } from '../_util/props-util';
import { cloneElement } from '../_util/vnode'; import { cloneElement } from '../_util/vnode';
import { ConfigConsumerProps } from '../config-provider';
function noop() {} function noop() {}
export const AlertProps = { export const AlertProps = {
/** /**
@ -32,9 +33,12 @@ export const AlertProps = {
}; };
const Alert = { const Alert = {
name: 'AAlert',
props: AlertProps, props: AlertProps,
mixins: [BaseMixin], mixins: [BaseMixin],
name: 'AAlert', inject: {
configProvider: { default: () => ({}) },
},
data() { data() {
return { return {
closing: true, closing: true,
@ -65,7 +69,10 @@ const Alert = {
}, },
render() { render() {
const { prefixCls = 'ant-alert', banner, closing, closed } = this; const { prefixCls: customizePrefixCls, banner, closing, closed } = this;
const getPrefixCls = this.configProvider.getPrefixCls || ConfigConsumerProps.getPrefixCls;
const prefixCls = getPrefixCls('alert', customizePrefixCls);
let { closable, type, showIcon, iconType } = this; let { closable, type, showIcon, iconType } = this;
const closeText = getComponentFromProp(this, 'closeText'); const closeText = getComponentFromProp(this, 'closeText');
const description = getComponentFromProp(this, 'description'); const description = getComponentFromProp(this, 'description');

View File

@ -6,6 +6,7 @@ import getScroll from '../_util/getScroll';
import raf from 'raf'; import raf from 'raf';
import { initDefaultProps } from '../_util/props-util'; import { initDefaultProps } from '../_util/props-util';
import BaseMixin from '../_util/BaseMixin'; import BaseMixin from '../_util/BaseMixin';
import { ConfigConsumerProps } from '../config-provider';
function getDefaultContainer() { function getDefaultContainer() {
return window; return window;
@ -91,14 +92,16 @@ export default {
mixins: [BaseMixin], mixins: [BaseMixin],
inheritAttrs: false, inheritAttrs: false,
props: initDefaultProps(AnchorProps, { props: initDefaultProps(AnchorProps, {
prefixCls: 'ant-anchor',
affix: true, affix: true,
showInkInFixed: false, showInkInFixed: false,
getContainer: getDefaultContainer, getContainer: getDefaultContainer,
}), }),
inject: {
configProvider: { default: () => ({}) },
},
data() { data() {
this.links = []; this.links = [];
this._sPrefixCls = '';
return { return {
activeLink: null, activeLink: null,
}; };
@ -200,8 +203,8 @@ export default {
if (typeof document === 'undefined') { if (typeof document === 'undefined') {
return; return;
} }
const { prefixCls } = this; const { _sPrefixCls } = this;
const linkNode = this.$el.getElementsByClassName(`${prefixCls}-link-title-active`)[0]; const linkNode = this.$el.getElementsByClassName(`${_sPrefixCls}-link-title-active`)[0];
if (linkNode) { if (linkNode) {
this.$refs.linkNode.style.top = `${linkNode.offsetTop + linkNode.clientHeight / 2 - 4.5}px`; this.$refs.linkNode.style.top = `${linkNode.offsetTop + linkNode.clientHeight / 2 - 4.5}px`;
} }
@ -209,7 +212,11 @@ export default {
}, },
render() { render() {
const { prefixCls, offsetTop, affix, showInkInFixed, activeLink, $slots, getContainer } = this; const { prefixCls: customizePrefixCls, offsetTop, affix, showInkInFixed, activeLink, $slots, getContainer } = this;
const getPrefixCls = this.configProvider.getPrefixCls || ConfigConsumerProps.getPrefixCls;
const prefixCls = getPrefixCls('anchor', customizePrefixCls);
this._sPrefixCls = prefixCls;
const inkClass = classNames(`${prefixCls}-ink-ball`, { const inkClass = classNames(`${prefixCls}-ink-ball`, {
visible: activeLink, visible: activeLink,

View File

@ -1,6 +1,7 @@
import PropTypes from '../_util/vue-types'; import PropTypes from '../_util/vue-types';
import { initDefaultProps, getComponentFromProp } from '../_util/props-util'; import { initDefaultProps, getComponentFromProp } from '../_util/props-util';
import classNames from 'classnames'; import classNames from 'classnames';
import { ConfigConsumerProps } from '../config-provider';
export const AnchorLinkProps = { export const AnchorLinkProps = {
prefixCls: PropTypes.string, prefixCls: PropTypes.string,
@ -11,12 +12,12 @@ export const AnchorLinkProps = {
export default { export default {
name: 'AAnchorLink', name: 'AAnchorLink',
props: initDefaultProps(AnchorLinkProps, { props: initDefaultProps(AnchorLinkProps, {
prefixCls: 'ant-anchor',
href: '#', href: '#',
}), }),
inject: { inject: {
antAnchor: { default: () => ({}) }, antAnchor: { default: () => ({}) },
antAnchorContext: { default: () => ({}) }, antAnchorContext: { default: () => ({}) },
configProvider: { default: () => ({}) },
}, },
watch: { watch: {
href(val, oldVal) { href(val, oldVal) {
@ -44,7 +45,11 @@ export default {
}, },
}, },
render() { render() {
const { prefixCls, href, $slots } = this; const { prefixCls: customizePrefixCls, href, $slots } = this;
const getPrefixCls = this.configProvider.getPrefixCls || ConfigConsumerProps.getPrefixCls;
const prefixCls = getPrefixCls('anchor', customizePrefixCls);
const title = getComponentFromProp(this, 'title'); const title = getComponentFromProp(this, 'title');
const active = this.antAnchor.$data.activeLink === href; const active = this.antAnchor.$data.activeLink === href;
const wrapperClassName = classNames(`${prefixCls}-link`, { const wrapperClassName = classNames(`${prefixCls}-link`, {

View File

@ -12,7 +12,7 @@ The simplest usage.
<template> <template>
<a-anchor> <a-anchor>
<a-anchor-link href="#components-anchor-demo-basic" title="Basic demo" /> <a-anchor-link href="#components-anchor-demo-basic" title="Basic demo" />
<a-anchor-link href="#components-anchor-demo-static-anchor" title="Fixed demo" /> <a-anchor-link href="#components-anchor-demo-static" title="Static demo" />
<a-anchor-link href="#API" title="API"> <a-anchor-link href="#API" title="API">
<a-anchor-link href="#Anchor-Props" title="Anchor Props" /> <a-anchor-link href="#Anchor-Props" title="Anchor Props" />
<a-anchor-link href="#Link-Props" title="Link Props" /> <a-anchor-link href="#Link-Props" title="Link Props" />

View File

@ -12,7 +12,7 @@ Clicking on an anchor does not record history.
<template> <template>
<a-anchor :affix="false" @click="handleClick"> <a-anchor :affix="false" @click="handleClick">
<a-anchor-link href="#components-anchor-demo-basic" title="Basic demo" /> <a-anchor-link href="#components-anchor-demo-basic" title="Basic demo" />
<a-anchor-link href="#components-anchor-demo-static-anchor" title="Fixed demo" /> <a-anchor-link href="#components-anchor-demo-static" title="Static demo" />
<a-anchor-link href="#API" title="API"> <a-anchor-link href="#API" title="API">
<a-anchor-link href="#Anchor-Props" title="Anchor Props" /> <a-anchor-link href="#Anchor-Props" title="Anchor Props" />
<a-anchor-link href="#Link-Props" title="Link Props" /> <a-anchor-link href="#Link-Props" title="Link Props" />

View File

@ -12,7 +12,7 @@ Do not change state when page is scrolling.
<template> <template>
<a-anchor :affix="false"> <a-anchor :affix="false">
<a-anchor-link href="#components-anchor-demo-basic" title="Basic demo" /> <a-anchor-link href="#components-anchor-demo-basic" title="Basic demo" />
<a-anchor-link href="#components-anchor-demo-static-anchor" title="Fixed demo" /> <a-anchor-link href="#components-anchor-demo-static" title="Static demo" />
<a-anchor-link href="#API" title="API"> <a-anchor-link href="#API" title="API">
<a-anchor-link href="#Anchor-Props" title="Anchor Props" /> <a-anchor-link href="#Anchor-Props" title="Anchor Props" />
<a-anchor-link href="#Link-Props" title="Link Props" /> <a-anchor-link href="#Link-Props" title="Link Props" />