Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

build/webpack.config.js

@@ -35,8 +35,8 @@ function wrap(render) {
 module.exports = {
   entry: {
     'vendor': ['vue', 'vue-router'],
-    'docs': './docs/index.js',
-    'examples': './docs/examples.js'
+    'zan-docs': './docs/index.js',
+    'zan-examples': './docs/examples.js'
   },
   output: {
     path: path.join(__dirname, '../docs/dist'),
@@ -100,13 +100,13 @@ module.exports = {
     StyleExtractPlugin,
     new ProgressBarPlugin(),
     new HtmlWebpackPlugin({
-      chunks: ['vendor', 'docs'],
+      chunks: ['vendor', 'zan-docs'],
       template: 'docs/index.tpl',
       filename: 'index.html',
       inject: true
     }),
     new HtmlWebpackPlugin({
-      chunks: ['vendor', 'examples'],
+      chunks: ['vendor', 'zan-examples'],
       template: 'docs/index.tpl',
       filename: 'examples.html',
       inject: true
@@ -168,7 +168,7 @@ if (process.env.NODE_ENV === 'production') {
   delete module.exports.devtool;
   module.exports.output = {
     path: path.join(__dirname, '../docs/dist'),
-    publicPath: './',
+    publicPath: '/vue',
     filename: '[name].[hash:8].js'
   };
   module.exports.plugins = module.exports.plugins.concat([

docs/examples-dist/button.vue

@@ -53,13 +53,6 @@
   </zan-col>
 </zan-row>
 
-              </example-block><example-block title="button group">
-                <div class="button-group">
-  <zan-button type="primary" size="small">确认付款</zan-button>
-  <zan-button size="small">确认收货</zan-button>
-  <zan-button size="small">取消订单</zan-button>
-</div>
-
               </example-block></section></template>
 <style>
 @component-namespace demo {

docs/examples-dist/swipe.vue

@@ -9,7 +9,7 @@
 </zan-swipe>
 
               </example-block><example-block title="自动轮播">
-                <zan-swipe :auto-play="true">
+                <zan-swipe :auto-play="true" @pagechange:end="handlePageEnd">
   <zan-swipe-item>
     <img src="https://img.yzcdn.cn/upload_files/2017/03/14/FmTPs0SeyQaAOSK1rRe1sL8RcwSY.jpeg?imageView2/2/w/980/h/980/q/75/format/webp" alt="">
   </zan-swipe-item>
@@ -33,4 +33,12 @@
 }
 </style>
 <script>
-import Vue from "vue";import ExampleBlock from "../components/example-block";Vue.component("example-block", ExampleBlock);</script>
+import Vue from "vue";import ExampleBlock from "../components/example-block";Vue.component("example-block", ExampleBlock);
+export default {
+  methods: {
+    handlePageEnd(page, index) {
+      console.log(page, index);
+    }
+  }
+};
+</script>

docs/examples-docs/progress.md

@@ -40,6 +40,7 @@
 </div>
 <div class="demo-progress__wrapper">
   <zan-progress class="demo-progress__demo1" :inactive="true" :percentage="100"></zan-progress>
+</div>
 ```
 :::
 
@@ -47,7 +48,6 @@
 ### 自定义颜色和文字
 :::demo 自定义颜色
 ```html
-</div>
 <div class="demo-progress__wrapper">
   <zan-progress class="demo-progress__demo1" pivot-text="红色" color="#ed5050" :percentage="26"></zan-progress>
 </div>

docs/examples-docs/swipe.md

@@ -12,6 +12,16 @@
 }
 </style>
 
+<script>
+export default {
+  methods: {
+    handlePageEnd(page, index) {
+      console.log(page, index);
+    }
+  }
+};
+</script>
+
 ## Swipe 轮播
 
 ### 基础用法
@@ -33,7 +43,7 @@
 
 :::demo 自动轮播
 ```html
-<zan-swipe :auto-play="true">
+<zan-swipe :auto-play="true" @pagechange:end="handlePageEnd">
   <zan-swipe-item>
     <img src="https://img.yzcdn.cn/upload_files/2017/03/14/FmTPs0SeyQaAOSK1rRe1sL8RcwSY.jpeg?imageView2/2/w/980/h/980/q/75/format/webp" alt="">
   </zan-swipe-item>
@@ -43,3 +53,16 @@
 </zan-swipe>
 ```
 :::
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       | 可选值       |
+|-----------|-----------|-----------|-------------|-------------|
+| autoPlay | 是否自动轮播 | `boolean`  |    `false`     |    `true`, `false`      |
+| showIndicators | 是否显示指示器 | `boolean`  |   `true`       |   `true`, `false`       |
+
+### 事件
+
+| 事件名       | 说明      | 参数 |
+|-----------|-----------|-----------|
+| `pagechange:end` | 每一页轮播结束后触发 | `(elem, currIndex)`：`elem`为触发页当前的DOM节点 |

docs/index.js

@@ -25,7 +25,7 @@ Vue.component('footer-nav', FooterNav);
 let routesConfig = routes(navConfig);
 routesConfig.push({
   path: '/',
-  redirect: '/component/button'
+  redirect: '/component/install'
 });
 
 const router = new VueRouter({
@@ -38,8 +38,10 @@ router.beforeEach((route, redirect, next) => {
   if (route.path !== '/') {
     window.scrollTo(0, 0);
   }
+
+  const pathname = process.env.NODE_ENV === 'production' ? '/vue/' : '/';
   if (isMobile()) {
-    window.location.replace(location.pathname + 'examples.html#' + route.path);
+    window.location.replace(pathname + 'examples.html#/');
     return;
   }
   document.title = route.meta.title || document.title;

packages/swipe/src/swipe-item.vue

@@ -6,6 +6,10 @@
 
 <script>
 export default {
-  name: 'zan-swipe-item'
+  name: 'zan-swipe-item',
+
+  beforeCreate() {
+    this.$parent.swipes.push(this);
+  }
 };
 </script>

packages/swipe/src/swipe.vue

@@ -1,6 +1,14 @@
 <template>
   <div class="zan-swipe">
-    <slot></slot>
+    <div class="zan-swipe__items">
+      <slot></slot>
+    </div>
+    <div class="zan-swipe__indicators" v-if="showIndicators">
+      <span class="zan-swipe__indicator" v-for="i in swipes.length" :class="{
+        'zan-swipe__indicator--active': currIndex === i -1
+      }">
+      </span>
+    </div>
   </div>
 </template>
 
@@ -13,16 +21,20 @@ export default {
   name: 'zan-swipe',
 
   props: {
-    autoPlay: {
+    autoPlay: Boolean,
+    showIndicators: {
       type: Boolean,
-      default: false
-    },
-    onPageChangeEnd: {
-      type: Function,
-      default: () => {}
+      default: true
     }
   },
 
+  data() {
+    return {
+      currIndex: 0,
+      swipes: []
+    };
+  },
+
   mounted() {
     this.input = new Input(this.$el, {
       listenMoving: true
@@ -53,6 +65,13 @@ export default {
 
   updated() {
     this.scroll.update();
+  },
+
+  methods: {
+    onPageChangeEnd(page, currIndex) {
+      this.currIndex = +currIndex;
+      this.$emit('pagechange:end', page, currIndex);
+    }
   }
 };
 </script>

packages/zanui-css/src/swipe.css

@@ -1,24 +1,56 @@
+@import './common/var.css';
+
 @component-namespace zan {
-    @b swipe {
-        position: relative;
-        overflow: hidden;
-        width: 100%;
+  @b swipe {
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+
+    @e indicators {
+      position: absolute;
+      bottom: 10px;
+      left: 50%;
+      transform: translateX(-50%);
     }
 
-    @b swipe-item {
-        display: none;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-        text-align: center;
+    @e indicator {
+      width: 5px;
+      height: 5px;
+      display: inline-block;
+      border-radius: 100%;
+      background: #999;
+      opacity: .8;
+      margin: 0 3px;
+      z-index: 1;
 
-        img {
-            width: 100%;
-            height: auto;
-        }
-
-        &:first-child {
-            display: block;
-        }
+      @m active {
+        background: $c-orange;
+        opacity: 1;
+      }
     }
+
+    @e items {
+      position: relative;
+      overflow: hidden;
+      position: relative;
+      height: 100%;
+    }
+  }
+
+  @b swipe-item {
+    display: none;
+    height: 100%;
+    width: 100%;
+    text-align: center;
+
+    img {
+      width: 100%;
+      height: auto;
+    }
+
+    &:first-child {
+      display: block;
+    }
+  }
 }