build new version

imtaotao · Nov 12, 2019 · bda023e · bda023e
1 parent 8006b1f
commit bda023e
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 53 deletions.
diff --git a/demo/store/mpstore.esm.js b/demo/store/mpstore.esm.js
@@ -392,7 +392,7 @@ function restore(obj, patchs) {
   return obj;
 }
 
-function applyPatchs(component, patchs) {
+function applyPatchs(component, patchs, callback) {
   var destObject = {};
 
   for (var i = 0, len = patchs.length; i < len; i++) {
@@ -402,14 +402,30 @@ function applyPatchs(component, patchs) {
     destObject[path] = value;
   }
 
-  component.setData(destObject);
+  component.setData(destObject, callback);
 }
-function updateComponents(store) {
+function updateComponents(store, callback) {
+  var total = 0;
   var hooks = store.hooks,
       GLOBALWORD = store.GLOBALWORD,
       depComponents = store.depComponents;
   var len = depComponents.length;
-  if (len === 0) return;
+
+  if (len === 0) {
+    if (typeof callback === 'function') {
+      callback();
+    }
+
+    return;
+  }
+
+  var renderedCallback = function renderedCallback() {
+    if (++total === len) {
+      if (typeof callback === 'function') {
+        callback();
+      }
+    }
+  };
 
   for (var i = 0; i < len; i++) {
     var _depComponents$i = depComponents[i],
@@ -424,6 +440,7 @@ function updateComponents(store) {
 
       if (typeof willUpdate === 'function') {
         if (willUpdate.call(store, component, newPartialState) === false) {
+          renderedCallback();
           continue;
         }
       }
@@ -434,10 +451,11 @@ function updateComponents(store) {
         var params = [component, newPartialState, patchs, isPage];
 
         if (callHook(hooks, 'willUpdate', params) === false) {
+          renderedCallback();
           continue;
         }
 
-        applyPatchs(component, patchs);
+        applyPatchs(component, patchs, renderedCallback);
 
         if (typeof didUpdate === 'function') {
           didUpdate.call(store, component, newPartialState, patchs);
@@ -448,7 +466,11 @@ function updateComponents(store) {
         if (component.timeTravel) {
           component.timeTravel.push(patchs);
         }
+      } else {
+        renderedCallback();
       }
+    } else {
+      renderedCallback();
     }
   }
 }
@@ -685,7 +707,7 @@ function () {
     this.depComponents = [];
     this.GLOBALWORD = 'global';
     this.isDispatching = false;
-    this.version = '0.0.9';
+    this.version = '0.0.10';
     this.state = Object.freeze({});
     this.middleware = new Middleware(this);
   }
@@ -734,11 +756,7 @@ function () {
           restoreProcessState();
         }
 
-        updateComponents(_this);
-
-        if (typeof callback === 'function') {
-          callback();
-        }
+        updateComponents(_this, callback);
       });
     }
   }, {
@@ -823,7 +841,7 @@ function () {
             var patchs = diff(component.data[GLOBALWORD], createState(), GLOBALWORD);
 
             if (patchs.length > 0) {
-              applyPatchs(component, patchs);
+              applyPatchs(component, patchs, GLOBALWORD);
             }
           }
         }
@@ -862,7 +880,7 @@ function () {
   return Store;
 }();
 
-var version = '0.0.9';
+var version = '0.0.10';
 var nativePage = Page;
 var nativeComponent = Component;
 

diff --git a/dist/mpstore.common.js b/dist/mpstore.common.js
@@ -396,7 +396,7 @@ function restore(obj, patchs) {
   return obj;
 }
 
-function applyPatchs(component, patchs) {
+function applyPatchs(component, patchs, callback) {
   var destObject = {};
 
   for (var i = 0, len = patchs.length; i < len; i++) {
@@ -406,14 +406,30 @@ function applyPatchs(component, patchs) {
     destObject[path] = value;
   }
 
-  component.setData(destObject);
+  component.setData(destObject, callback);
 }
-function updateComponents(store) {
+function updateComponents(store, callback) {
+  var total = 0;
   var hooks = store.hooks,
       GLOBALWORD = store.GLOBALWORD,
       depComponents = store.depComponents;
   var len = depComponents.length;
-  if (len === 0) return;
+
+  if (len === 0) {
+    if (typeof callback === 'function') {
+      callback();
+    }
+
+    return;
+  }
+
+  var renderedCallback = function renderedCallback() {
+    if (++total === len) {
+      if (typeof callback === 'function') {
+        callback();
+      }
+    }
+  };
 
   for (var i = 0; i < len; i++) {
     var _depComponents$i = depComponents[i],
@@ -428,6 +444,7 @@ function updateComponents(store) {
 
       if (typeof willUpdate === 'function') {
         if (willUpdate.call(store, component, newPartialState) === false) {
+          renderedCallback();
           continue;
         }
       }
@@ -438,10 +455,11 @@ function updateComponents(store) {
         var params = [component, newPartialState, patchs, isPage];
 
         if (callHook(hooks, 'willUpdate', params) === false) {
+          renderedCallback();
           continue;
         }
 
-        applyPatchs(component, patchs);
+        applyPatchs(component, patchs, renderedCallback);
 
         if (typeof didUpdate === 'function') {
           didUpdate.call(store, component, newPartialState, patchs);
@@ -452,7 +470,11 @@ function updateComponents(store) {
         if (component.timeTravel) {
           component.timeTravel.push(patchs);
         }
+      } else {
+        renderedCallback();
       }
+    } else {
+      renderedCallback();
     }
   }
 }
@@ -689,7 +711,7 @@ function () {
     this.depComponents = [];
     this.GLOBALWORD = 'global';
     this.isDispatching = false;
-    this.version = '0.0.9';
+    this.version = '0.0.10';
     this.state = Object.freeze({});
     this.middleware = new Middleware(this);
   }
@@ -738,11 +760,7 @@ function () {
           restoreProcessState();
         }
 
-        updateComponents(_this);
-
-        if (typeof callback === 'function') {
-          callback();
-        }
+        updateComponents(_this, callback);
       });
     }
   }, {
@@ -827,7 +845,7 @@ function () {
             var patchs = diff(component.data[GLOBALWORD], createState(), GLOBALWORD);
 
             if (patchs.length > 0) {
-              applyPatchs(component, patchs);
+              applyPatchs(component, patchs, GLOBALWORD);
             }
           }
         }
@@ -866,7 +884,7 @@ function () {
   return Store;
 }();
 
-var version = '0.0.9';
+var version = '0.0.10';
 var nativePage = Page;
 var nativeComponent = Component;
 

diff --git a/dist/mpstore.es6m.js b/dist/mpstore.es6m.js
@@ -257,22 +257,35 @@ function restore (obj, patchs) {
   return obj
 }
 
-function applyPatchs (component, patchs) {
+function applyPatchs (component, patchs, callback) {
   const destObject = {};
   for (let i = 0, len = patchs.length; i < len; i++) {
     const { value, path } = patchs[i];
     destObject[path] = value;
   }
-  component.setData(destObject);
+  component.setData(destObject, callback);
 }
-function updateComponents (store) {
+function updateComponents (store, callback) {
+  let total = 0;
   const {
     hooks,
     GLOBALWORD,
     depComponents,
   } = store;
   const len = depComponents.length;
-  if (len === 0) return
+  if (len === 0) {
+    if (typeof callback === 'function') {
+      callback();
+    }
+    return
+  }
+  const renderedCallback = () => {
+    if (++total === len) {
+      if (typeof callback === 'function') {
+        callback();
+      }
+    }
+  };
   for (let i = 0; i < len; i++) {
     const {
       isPage,
@@ -285,24 +298,30 @@ function updateComponents (store) {
       const newPartialState = createState();
       if (typeof willUpdate === 'function') {
         if (willUpdate.call(store, component, newPartialState) === false) {
+          renderedCallback();
           continue
         }
       }
       const patchs = diff(component.data[GLOBALWORD], newPartialState, GLOBALWORD);
       if (patchs.length > 0) {
         const params = [component, newPartialState, patchs, isPage];
         if (callHook(hooks, 'willUpdate', params) === false) {
+          renderedCallback();
           continue
         }
-        applyPatchs(component, patchs);
+        applyPatchs(component, patchs, renderedCallback);
         if (typeof didUpdate === 'function') {
           didUpdate.call(store, component, newPartialState, patchs);
         }
         callHook(hooks, 'didUpdate', [component, newPartialState, isPage]);
         if (component.timeTravel) {
           component.timeTravel.push(patchs);
         }
+      } else {
+        renderedCallback();
       }
+    } else {
+      renderedCallback();
     }
   }
 }
@@ -504,7 +523,7 @@ class Store {
     this.depComponents = [];
     this.GLOBALWORD = 'global';
     this.isDispatching = false;
-    this.version = '0.0.9';
+    this.version = '0.0.10';
     this.state = Object.freeze({});
     this.middleware = new Middleware(this);
   }
@@ -548,10 +567,7 @@ class Store {
          this.isDispatching = false;
         restoreProcessState();
       }
-      updateComponents(this);
-      if (typeof callback === 'function') {
-        callback();
-      }
+      updateComponents(this, callback);
     });
   }
   use (action, fn) {
@@ -623,7 +639,7 @@ class Store {
           });
           const patchs = diff(component.data[GLOBALWORD], createState(), GLOBALWORD);
           if (patchs.length > 0) {
-            applyPatchs(component, patchs);
+            applyPatchs(component, patchs, GLOBALWORD);
           }
         }
       }
@@ -665,7 +681,7 @@ class Store {
   }
 }
 
-const version = '0.0.9';
+const version = '0.0.10';
 const nativePage = Page;
 const nativeComponent = Component;
 function expandConfig (config, expandMethods, isPage) {