fix: button, pull

- button disable is true, prevent click emit
- pull  when refresh done，not reset loadstate

Author: chuanshuoye

example/components/pullPage.vue

@@ -93,14 +93,15 @@ export default {
       return () => new Promise((resolve, reject) => {
         this[`refreshing${index}`] = true;
         setTimeout(() => {
-          let length = index == 1 ? this.myData1.length : this.myData2.length
+          let length = index == 1 ? this.myData1.length : 15;
           this[`myData${index}`] = this.random(length);
           resolve(true);
           this[`refreshing${index}`] = false;
         }, 1000)
       })
     },
     loadData() {
+      console.log('loadData');
       this.loading = true
       return new Promise((resolve, reject) => {
         setTimeout(() => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarm-vue",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "zarm in vue",
   "tags": [
     "zarm",

src/button/src/button.vue

@@ -75,14 +75,11 @@ export default {
       default: false,
     },
   },
-  data() {
-    return {
-
-    };
-  },
   methods: {
     handleClick(event) {
-      this.$emit('click', event);
+      if (!this.disabled) {
+        this.$emit('click', event);
+      }
     },
   },
 };

src/pull/src/pull.vue

@@ -83,6 +83,7 @@ export default {
   watch: {
     refreshing(val) {
       const refreshState = val ? REFRESH_STATE.loading : REFRESH_STATE.normal;
+      this.loadState = '';
       this.doRefreshAction(refreshState);
     },
     loading(val) {
@@ -147,8 +148,7 @@ export default {
       }
     },
     onSrcoll() {
-      if (this.refreshState !== REFRESH_STATE.normal ||
-        this.loadState !== LOAD_STATE.normal) {
+      if (this.refreshState !== REFRESH_STATE.normal || this.loadState === LOAD_STATE.loading || this.loadState === LOAD_STATE.complete) {
         return;
       }
       const { onLoad } = this;