new component: inline-loading

airyland · May 30, 2017 · 10b7ee2 · 10b7ee2
1 parent 714afa6
commit 10b7ee2
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 1 deletion.
diff --git a/src/components/inline-loading/index.vue b/src/components/inline-loading/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <i class="weui-loading"></i>
+</template>
+
+<style lang="less">
+@import '../../styles/weui/widget/weui-loading/weui-loading.less';
+</style>
diff --git a/src/components/inline-loading/metas.yml b/src/components/inline-loading/metas.yml
@@ -0,0 +1,7 @@
+icon: '&#xe610;'
+changes:
+  next:
+    en:
+      - '[feature] new component'
+    zh-CN:
+      - '[feature] 新组件'
diff --git a/src/components/map.json b/src/components/map.json
@@ -60,6 +60,7 @@
   "Icon": "src/components/icon/index.vue",
   "InlineCalendar": "src/components/inline-calendar/index.vue",
   "InlineDesc": "src/components/inline-desc/index.vue",
+  "InlineLoading": "src/components/inline-loading/index.vue",
   "InlineXNumber": "src/components/inline-x-number/index.vue",
   "InviewDirective": "src/directives/inview/index.js",
   "Loading": "src/components/loading/index.vue",

diff --git a/src/datas/vux_component_list.json b/src/datas/vux_component_list.json
@@ -130,6 +130,10 @@
     "name": "inline-calendar",
     "icon": "&#xe62b;"
   },
+  {
+    "name": "inline-loading",
+    "icon": "&#xe610;"
+  },
   {
     "name": "load-more",
     "icon": "&#xe610;"

diff --git a/src/demo_list.json b/src/demo_list.json
@@ -100,5 +100,6 @@
   "Issue1211#/issue/1211",
   "XTable",
   "PopupRadio",
-  "Flow"
+  "Flow",
+  "InlineLoading"
 ]
diff --git a/src/demos/InlineLoading.vue b/src/demos/InlineLoading.vue
@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <br>
+    <p style="text-align:center;">
+      <inline-loading></inline-loading>
+    </p>
+    <br>
+    <p style="text-align:center;">
+      <span style="vertical-align:middle;display:inline-block;font-size:14px;">{{ $t('loading') }}&nbsp;&nbsp;</span><inline-loading></inline-loading>
+    </p>
+    <br>
+    <p style="text-align:center;">
+      <inline-loading></inline-loading><span style="vertical-align:middle;display:inline-block;font-size:14px;">&nbsp;&nbsp;{{ $t('loading') }}</span>
+    </p>
+  </div>
+</template>
+
+<i18n>
+loading:
+  zh-CN: 加载中
+</i18n>
+
+<script>
+import { InlineLoading } from 'vux'
+
+export default {
+  components: {
+    InlineLoading
+  }
+}
+</script>