github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: skeleton error

pull/2682/head
tanjinzhou 2020-08-03 17:52:03 +08:00
parent 8f19769cce
commit ed1c0147d4
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
antdv-demo

@ -1 +1 @@
Subproject commit bb1ff4ddc529b85b5ab492d80d391b057fdd6eaa Subproject commit e03b6665dabc7b2d464ab9c7f44de66702ca1727

3
components/_util/wave.jsx
View File

@ -45,7 +45,6 @@ export default {
if (this.clickWaveTimeoutId) { if (this.clickWaveTimeoutId) {
clearTimeout(this.clickWaveTimeoutId); clearTimeout(this.clickWaveTimeoutId);
} }
this.destroy = true;
}, },
methods: { methods: {
onClick(node, waveColor) { onClick(node, waveColor) {
@ -89,7 +88,7 @@ export default {
TransitionEvents.addEndEventListener(node, this.onTransitionEnd); TransitionEvents.addEndEventListener(node, this.onTransitionEnd);
}, },
onTransitionStart(e) { onTransitionStart(e) {
if (this.destroy) return; if (this._.isUnmounted) return;
const node = findDOMNode(this); const node = findDOMNode(this);
if (!e || e.target !== node) { if (!e || e.target !== node) {

4
components/skeleton/__tests__/__snapshots__/index.test.js.snap
View File

@ -80,6 +80,7 @@ exports[`Skeleton avatar size 4`] = `
exports[`Skeleton paragraph rows 1`] = ` exports[`Skeleton paragraph rows 1`] = `
<div class="ant-skeleton"> <div class="ant-skeleton">
<!---->
<div class="ant-skeleton-content"> <div class="ant-skeleton-content">
<h3 class="ant-skeleton-title" style="width: 38%;"></h3> <h3 class="ant-skeleton-title" style="width: 38%;"></h3>
<ul class="ant-skeleton-paragraph"> <ul class="ant-skeleton-paragraph">
@ -95,6 +96,7 @@ exports[`Skeleton paragraph rows 1`] = `
exports[`Skeleton paragraph width 1`] = ` exports[`Skeleton paragraph width 1`] = `
<div class="ant-skeleton"> <div class="ant-skeleton">
<!---->
<div class="ant-skeleton-content"> <div class="ant-skeleton-content">
<h3 class="ant-skeleton-title" style="width: 38%;"></h3> <h3 class="ant-skeleton-title" style="width: 38%;"></h3>
<ul class="ant-skeleton-paragraph"> <ul class="ant-skeleton-paragraph">
@ -108,6 +110,7 @@ exports[`Skeleton paragraph width 1`] = `
exports[`Skeleton paragraph width 2`] = ` exports[`Skeleton paragraph width 2`] = `
<div class="ant-skeleton"> <div class="ant-skeleton">
<!---->
<div class="ant-skeleton-content"> <div class="ant-skeleton-content">
<h3 class="ant-skeleton-title" style="width: 38%;"></h3> <h3 class="ant-skeleton-title" style="width: 38%;"></h3>
<ul class="ant-skeleton-paragraph"> <ul class="ant-skeleton-paragraph">
@ -121,6 +124,7 @@ exports[`Skeleton paragraph width 2`] = `
exports[`Skeleton title width 1`] = ` exports[`Skeleton title width 1`] = `
<div class="ant-skeleton"> <div class="ant-skeleton">
<!---->
<div class="ant-skeleton-content"> <div class="ant-skeleton-content">
<h3 class="ant-skeleton-title" style="width: 93%;"></h3> <h3 class="ant-skeleton-title" style="width: 93%;"></h3>
<ul class="ant-skeleton-paragraph"> <ul class="ant-skeleton-paragraph">

2
components/skeleton/__tests__/index.test.js
View File

@ -11,7 +11,7 @@ describe('Skeleton', () => {
...props, ...props,
}, },
slots: { slots: {
default: 'Bamboo', default: () => 'Bamboo',
}, },
sync: false, sync: false,
}; };

2
examples/App.vue
View File

@ -4,7 +4,7 @@
</div> </div>
</template> </template>
<script> <script>
import demo from '../antdv-demo/docs/result/demo/index'; import demo from '../antdv-demo/docs/skeleton/demo/index';
export default { export default {
components: { components: {