From 3d88404c57792527ece43831ebfb11ff5ee894e7 Mon Sep 17 00:00:00 2001
From: lcoln <875482941@qq.com>
Date: Sun, 17 Sep 2017 23:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=9D=A5=E5=A1=AB=E5=85=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20:ok=5Fhand:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/lib/sliders/Readme.md | 27 ++++++++++++---------------
 js/lib/sliders/main.htm  | 11 ++++++-----
 js/lib/sliders/main.js   | 23 +++++++++++++++--------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/js/lib/sliders/Readme.md b/js/lib/sliders/Readme.md
index 48b2512..c72caf7 100644
--- a/js/lib/sliders/Readme.md
+++ b/js/lib/sliders/Readme.md
@@ -4,7 +4,6 @@
 
 ```json
     {
-        
         sliderList: [{src: '', link: '', title: '', titleStyle: ''}],       //src: 图片地址; link: 点击链接; title: 幻灯片标题(可以是文本或html); titleStyle: 标题样式
         autoSlide: boolean,     //true: 自动轮播; false: 停止轮播
         time: int,     //轮播间隔时间
@@ -28,21 +27,19 @@ name属性可以设定组件的$id值，方便各模块之间进行通讯
 <!--  引入幻灯片组件  -->
 <script src="//dist.doui.cc/js/yua.js"></script>
 <script>
-    ;(function(yua){
-        require(['//doui.lt/js/lib/sliders/main.js'],function(){
-            var vm = yua({
-                $id: "test",
-                sliderOpts: {
-                    sliderList: [{src: '', link: '', title: '', titleStyle: ''}],
-                    autoSlide: false,
-                    time: 0,
-                    preview: true
+    require(['//dist.doui.cc/js/lib/sliders/main.js'],function(){
+        var vm = yua({
+            $id: "test",
+            sliderOpts: {
+                sliderList: [{src: '', link: '', title: '', titleStyle: ''}],
+                autoSlide: false,
+                time: 0,
+                preview: true
 
-                }
-            })
-
-            yua.scan()
+            }
         })
-    })(yua)
+
+        yua.scan()
+    })
 </script>
 ```
diff --git a/js/lib/sliders/main.htm b/js/lib/sliders/main.htm
index 7ab84ad..8d69a22 100644
--- a/js/lib/sliders/main.htm
+++ b/js/lib/sliders/main.htm
@@ -4,20 +4,21 @@
 
     <div class="container">
         <div class="box"
-            :attr="{style: 'width: ' + sliderList.length * 100 + '%;' + transform}">
+            :attr="{style: 'width:' + sliderList.length * 100 + '%;' + transform}">
             <a  target="_blank"
                 :repeat="sliderList"
-                :attr="{style: 'width: ' + currWidth + ';', href: el.link || 'javascript:;'}">
-                <img :attr="{src: el.src}">
+                :css="{width: currWidth}"
+                :attr="{href: el.link || 'javascript:;'}">
+                <img :attr-src="el.src">
                 <p :if="el.title" 
-                    :attr="{style: el.titlaStyle + ';' ? el.titleStyle : ';'}"
+                    :attr="{style: el.titlaStyle ? el.titleStyle + ';' : ''}"
                     :html="el.title"
                     class="default-class"></p>
             </a>
         </div>
     </div>
 
-    <div class="btn" :attr="{style: 'bottom:' + (preview ? '-120px' : '0;')}">
+    <div class="btn" :css="{bottom: (preview ? '-120px' : '0;')}">
         <span :if="!preview"
             href="javascript:;"
             :class="{'no-preview-act': curr === $index}"
diff --git a/js/lib/sliders/main.js b/js/lib/sliders/main.js
index ae4637e..39f2df4 100644
--- a/js/lib/sliders/main.js
+++ b/js/lib/sliders/main.js
@@ -6,8 +6,6 @@
 
 define(["yua", "text!./main.htm", "css!./main"], function(yua, tpl){
 
-    var auto
-
     /**
      * [获取当前幻灯片元素宽度]
      */
@@ -48,10 +46,10 @@ define(["yua", "text!./main.htm", "css!./main"], function(yua, tpl){
      * @return {[type]}    [description]
      */
     function autoSlide(vm){
-        var timer = setInterval(function(){
+        vm.auto = setTimeout(function(){
             vm.$go(1)
+            autoSlide(vm)
         }, vm.time)
-        return timer
     }
 
     return yua.component("sliders", {
@@ -78,13 +76,17 @@ define(["yua", "text!./main.htm", "css!./main"], function(yua, tpl){
 
             vm.$stopSlide = function(){
                 if(vm.autoSlide){
-                    clearInterval(auto)
+                    clearTimeout(vm.auto)
                 }
             }
 
             vm.$startSlide = function(){
                 if(vm.autoSlide)
-                    auto = autoSlide(vm)
+                    autoSlide(vm)
+            }
+
+            vm.$setSliderList = function(list){
+                vm.sliderList = list
             }
 
             vm.$watch('curr', function(val, old) {
@@ -109,25 +111,30 @@ define(["yua", "text!./main.htm", "css!./main"], function(yua, tpl){
                     vm.sliderBtnList = getBtnList(vm)
             }, false)
 
+            vm.$onSuccess(vm)
         },
         $ready: function(vm){
             vm.currWidth = getWidth()
             if(vm.autoSlide)
-                auto = autoSlide(vm)
+                autoSlide(vm)
 
-            vm.sliderBtnList = getBtnList(vm)
+            if(vm.preview)
+                vm.sliderBtnList = getBtnList(vm)
         },
         currWidth: 0,
         transform: '',
         curr: 0,
         sliderBtnList: [],
         maxNum: '',
+        auto: '',
 
         sliderList: [],
         autoSlide: '',
         time: 3000,
         preview: true,
 
+        $onSuccess: yua.noop,
+        $setSliderList: yua.noop,
         $jump: yua.noop,
         $stopSlide: yua.noop,
         $startSlide: yua.noop,