From a5ca701ce0bb9b7969260bb2e2c026d690c56b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E6=B6=9B?= <594641717@qq.com>
Date: Fri, 16 Nov 2018 10:06:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=89=E8=A3=85=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加vue-resource，更改IP为localhost
---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5f1be7a6..ad53cfe3 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "url": "https://github.com/ydcss/vue-ydui.git"
   },
   "scripts": {
-    "dev": "webpack-dev-server --content-base example/ --port 4321 --inline --hot --host 0.0.0.0 --config build/webpack.dev.conf.js",
+    "dev": "webpack-dev-server --content-base example/ --port 4321 --inline --hot --host localhost --config build/webpack.dev.conf.js",
     "build:rem:components": "webpack --config build/webpack.dist.components.rem.conf.js",
     "build:px:components": "webpack --config build/webpack.dist.components.px.conf.js",
     "build:prod": "webpack --config build/webpack.dist.prod.conf.js",
@@ -57,6 +57,7 @@
     "style-loader": "^0.13.1",
     "vue": "^2.5.2",
     "vue-loader": "^10.0.2",
+    "vue-resource": "^1.0.3",
     "vue-router": "^2.1.1",
     "vue-template-compiler": "^2.5.2",
     "webpack": "^1.14.0",

From ba2032d23c24beb7ef7a289cfc39f944d53f3f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E6=B6=9B?= <594641717@qq.com>
Date: Fri, 16 Nov 2018 10:17:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

页面增加上下滚动事件，并支持回调时候回到原来位置。
---
 src/components/layout/src/layout.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/layout/src/layout.vue b/src/components/layout/src/layout.vue
index e65e4a52..e20cb8bc 100644
--- a/src/components/layout/src/layout.vue
+++ b/src/components/layout/src/layout.vue
@@ -10,7 +10,7 @@
 
         <slot name="top"></slot>
 
-        <section class="yd-scrollview" ref="scrollView" id="scrollView">
+        <section class="yd-scrollview" ref="scrollView" id="scrollView" @scroll="scroll">
             <slot></slot>
         </section>
 
@@ -23,14 +23,30 @@
 <script type="text/babel">
     export default {
         name: 'yd-layout',
+        data(){
+            return {scrollTop:0};
+        },
         props: {
             link: String,
             title: String,
             showNavbar: {
                 type: Boolean,
                 default: true
+            },
+            onScroll:{
+                type:Function,
+                default:null
             }
-        }
+        },
+        methods: {
+            scroll() {
+                this.scrollTop=event.target.scrollTop;
+                this.onScroll&&this.onScroll(event,this);
+            }
+        },
+        activated(){
+            this.$refs['scrollView'].scrollTop = this.scrollTop;
+        },
     }
 </script>
 

From f6edbbf367d21e2a3cdb49a7e2db7444b7a3fde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E6=B6=9B?= <594641717@qq.com>
Date: Fri, 16 Nov 2018 10:43:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?button=E5=A2=9E=E5=8A=A0click?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

render模式下button无法响应click。
---
 src/components/button/src/button.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/button/src/button.vue b/src/components/button/src/button.vue
index 67b9b9db..8a83e412 100644
--- a/src/components/button/src/button.vue
+++ b/src/components/button/src/button.vue
@@ -1,5 +1,5 @@
 <template>
-    <button :disabled="disabled || loading" :class="classes" :style="{backgroundColor: bgcolor, color: color}" :type="actionType">
+    <button :disabled="disabled || loading" :class="classes" :style="{backgroundColor: bgcolor, color: color}" :type="actionType" @click="handleClickLink">
         <span class="yd-btn-loading" v-if="loading">
             <span class="yd-btn-rolling" :class="rollingClasses" :style="{marginRight: loadingTxt ? '8px' : '0'}"><i></i></span>
             <template v-if="size === 'large'">{{loadingTxt}}</template>
@@ -103,6 +103,12 @@
 
                 return s + t + r;
             }
+        },
+        methods: {
+            handleClickLink (event) {
+                this.$emit('click', event);
+                this.handleCheckClick(event);
+            }
         }
     }
 </script>