From d8dca2cdcc0d45ba5efeb6ba797ae4bbb6301cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A0=E5=A3=B0?= <ivestszheng@qq.com>
Date: Tue, 19 Oct 2021 11:28:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8D=95?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devui/skeleton/__tests__/skeleton.spec.ts | 48 +++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/devui/skeleton/__tests__/skeleton.spec.ts b/devui/skeleton/__tests__/skeleton.spec.ts
index e55e134a..a5f90504 100644
--- a/devui/skeleton/__tests__/skeleton.spec.ts
+++ b/devui/skeleton/__tests__/skeleton.spec.ts
@@ -3,59 +3,59 @@ import { ref } from 'vue';
 import DSkeleton from '../src/skeleton';
 
 describe('skeleton 组件', () => {
-  it('render basic skeleton successfully', () => {
-    const row = ref(4);
+  it('render basic skeleton', () => {
+    const row = ref(4)
     const wrapper = mount({
       components: { DSkeleton },
       template: `<d-skeleton :row="row" />`,
       setup() {
         return {
           row
-        };
+        }
       },
-    });
+    })
 
     expect(wrapper.classes()).toContain('devui-skeleton')
     expect(wrapper.classes()).toContain('devui-skeleton-animated')
-    expect(wrapper.element.childElementCount).toBe(1)
-    // 渲染个数应当与传入的 row 的数量相同
-    expect(wrapper.element.children[0].childElementCount).toBe(4)
+    expect(wrapper.element.childElementCount).toBe(2)
+    expect(wrapper.element.children[1].children[1].childElementCount).toBe(4)
   })
 
   it('render skeleton without animate', () => {
-    const animate = ref(false);
+    const animate = ref(false)
     const wrapper = mount({
       components: { DSkeleton },
       template: `<d-skeleton :animate="animate" />`,
       setup() {
         return {
           animate
-        };
+        }
       },
-    });
+    })
 
-    expect(wrapper.classes()).toContain('devui-skeleton-no-animated')
+    expect(wrapper.classes()).toEqual(['devui-skeleton'])
   })
 
-  it('render skeleton with avatar', () => {
-    const avatar = ref(true);
+  it('render skeleton without title and paragraph', () => {
+    const title = ref(false)
+    const paragraph = ref(false)
     const wrapper = mount({
       components: { DSkeleton },
-      template: `<d-skeleton :avatar="avatar" />`,
+      template: `<d-skeleton :title="title" :paragraph="paragraph" />`,
       setup() {
         return {
-          avatar
-        };
+          title,
+          paragraph
+        }
       },
-    });
-
-    expect(wrapper.element.childElementCount).toBe(2)
-    expect(wrapper.element.children[0].innerHTML).toBe('<div class="avatar"></div>')
+    })
+    
+    expect(wrapper.element.children[1].childElementCount).toBe(2)
   })
 
   it('hide skeleton and show real content', () => {
-    const row = ref(4);
-    const loading = ref(false);
+    const row = ref(4)
+    const loading = ref(false)
     const wrapper = mount({
       components: { DSkeleton },
       template: `
@@ -71,9 +71,9 @@ describe('skeleton 组件', () => {
         return {
           row,
           loading
-        };
+        }
       },
-    });
+    })
 
     expect(wrapper.classes()).toContain('devui-skeleton')
     expect(wrapper.element.children[0].innerHTML).toBe('<div>content1</div><div>content2</div><div>content3</div><div>content4</div>')
-- 
Gitee


From d1fd9f190a2be6095e46c1e5bcf74f3f59ed4b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A0=E5=A3=B0?= <ivestszheng@qq.com>
Date: Tue, 19 Oct 2021 13:51:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20yarn=20dev=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/components/ripple/index.md | 55 +--------------------------------
 1 file changed, 1 insertion(+), 54 deletions(-)

diff --git a/docs/components/ripple/index.md b/docs/components/ripple/index.md
index 0abefb4f..3b64a92a 100644
--- a/docs/components/ripple/index.md
+++ b/docs/components/ripple/index.md
@@ -1,7 +1,6 @@
 # Ripple 水波纹指令
 
 <span color="#409EFF">`v-ripple`</span> 指令 用于用户动作交互场景, 可以应用于任何块级元素
-
 ### 使用
 
 用户 可以在组件 或者 HTML 元素上任意使用 <span color="#409EFF">`v-ripple`</span> 指令 使用基本的 <span color="#409EFF">`v-ripple`</span> 指令， `v-ripple` 接收 一个对象
@@ -18,16 +17,6 @@
     </div>
   </div>
 </template>
-
-<script lang="ts">
-import { defineComponent, ref, reactive } from "vue";
-
-export default defineComponent({
-  setup() {
-    return {};
-  },
-});
-</script>
 <style scoped>
 .ripple-button {
   display: flex;
@@ -36,7 +25,6 @@ export default defineComponent({
 ```
 
 :::
-
 ### 自定义色彩
 
 ### 通过修改文本颜色来动态改变
@@ -65,7 +53,6 @@ export default defineComponent({
 ```
 
 :::
-
 ### 自定义颜色
 
 :::demo
@@ -95,7 +82,6 @@ export default defineComponent({
 ```
 
 :::
-
 ### 应用于其他组件
 
 Button
@@ -131,16 +117,6 @@ Button
     >
   </div>
 </template>
-
-<script lang="ts">
-import { defineComponent, ref, reactive } from "vue";
-
-export default defineComponent({
-  setup() {
-    return {};
-  },
-});
-</script>
 <style scoped>
 .ripple-button {
   display: flex;
@@ -149,7 +125,6 @@ export default defineComponent({
 ```
 
 :::
-
 Icon
 
 :::demo
@@ -169,16 +144,6 @@ Icon
     ></d-icon>
   </div>
 </template>
-
-<script lang="ts">
-import { defineComponent, ref, reactive } from "vue";
-
-export default defineComponent({
-  setup() {
-    return {};
-  },
-});
-</script>
 <style scoped>
 .ripple-button {
     display: flex;
@@ -186,29 +151,11 @@ export default defineComponent({
 .ripple-icon {
     padding： 25px;
 }
-</style>
+<style>
 ```
 
 :::
 
-<style scoped>
-.ripple-htmlElement {
-    width: 600px;
-    height: 150px; 
-    background-color: #eee; 
-    text-align: center; 
-    line-height: 150px;
-    border: 1px solid #eee50;
-    box-shadow: 0 3px 1px -2px rgba(0,0,0,.2),0 2px 2px 0 rgba(0,0,0,.14),0 1px 5px 0 rgba(0,0,0,.12)!important;
-    user-select: none;
-}
-.ripple-changeTextColor {
-    display: block;
-    padding: 10px 15px;
-    user-select: none;
-}
-</style>
-
 ### API
 
 |      参数       |   类型   |   默认   | 说明                              |
-- 
Gitee


From bb755aed99e869d0a3f75f75e8d6759cffec2c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A0=E5=A3=B0?= <ivestszheng@qq.com>
Date: Tue, 19 Oct 2021 06:06:02 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20devu?=
 =?UTF-8?q?i/skeleton/=5F=5Ftests=5F=5F/skeleton.spec.ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devui/skeleton/__tests__/skeleton.spec.ts | 81 -----------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 devui/skeleton/__tests__/skeleton.spec.ts

diff --git a/devui/skeleton/__tests__/skeleton.spec.ts b/devui/skeleton/__tests__/skeleton.spec.ts
deleted file mode 100644
index a5f90504..00000000
--- a/devui/skeleton/__tests__/skeleton.spec.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { mount } from '@vue/test-utils';
-import { ref } from 'vue';
-import DSkeleton from '../src/skeleton';
-
-describe('skeleton 组件', () => {
-  it('render basic skeleton', () => {
-    const row = ref(4)
-    const wrapper = mount({
-      components: { DSkeleton },
-      template: `<d-skeleton :row="row" />`,
-      setup() {
-        return {
-          row
-        }
-      },
-    })
-
-    expect(wrapper.classes()).toContain('devui-skeleton')
-    expect(wrapper.classes()).toContain('devui-skeleton-animated')
-    expect(wrapper.element.childElementCount).toBe(2)
-    expect(wrapper.element.children[1].children[1].childElementCount).toBe(4)
-  })
-
-  it('render skeleton without animate', () => {
-    const animate = ref(false)
-    const wrapper = mount({
-      components: { DSkeleton },
-      template: `<d-skeleton :animate="animate" />`,
-      setup() {
-        return {
-          animate
-        }
-      },
-    })
-
-    expect(wrapper.classes()).toEqual(['devui-skeleton'])
-  })
-
-  it('render skeleton without title and paragraph', () => {
-    const title = ref(false)
-    const paragraph = ref(false)
-    const wrapper = mount({
-      components: { DSkeleton },
-      template: `<d-skeleton :title="title" :paragraph="paragraph" />`,
-      setup() {
-        return {
-          title,
-          paragraph
-        }
-      },
-    })
-    
-    expect(wrapper.element.children[1].childElementCount).toBe(2)
-  })
-
-  it('hide skeleton and show real content', () => {
-    const row = ref(4)
-    const loading = ref(false)
-    const wrapper = mount({
-      components: { DSkeleton },
-      template: `
-      <d-skeleton :row="4" :loading="loading">
-        <div>
-          <div>content1</div>
-          <div>content2</div>
-          <div>content3</div>
-          <div>content4</div>
-        </div>
-      </d-skeleton>`,
-      setup() {
-        return {
-          row,
-          loading
-        }
-      },
-    })
-
-    expect(wrapper.classes()).toContain('devui-skeleton')
-    expect(wrapper.element.children[0].innerHTML).toBe('<div>content1</div><div>content2</div><div>content3</div><div>content4</div>')
-  })
-})
\ No newline at end of file
-- 
Gitee