@mpxjs/core 2.7.11 → 2.7.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.7.11",
+  "version": "2.7.16",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -41,5 +41,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "484feb97fc5741ce3984fd235833fe0ab83593b9"
+  "gitHead": "7a2b5ae385cbd035172ec11bc0bfba84eff10243"
 }

package/src/core/proxy.js

@@ -47,6 +47,7 @@ export default class MPXProxy {
     this.ignoreProxyMap = makeMap(EXPORT_MPX.config.ignoreProxyWhiteList)
     if (__mpx_mode__ !== 'web') {
       this._watchers = []
+      this._namedWatchers = {}
       this._watcher = null
       this.localKeysMap = {} // 非props key
       this.renderData = {} // 渲染函数中收集的数据
@@ -142,6 +143,12 @@ export default class MPXProxy {
       // 强制执行render
       this.target.$forceUpdate = (...rest) => this.forceUpdate(...rest)
       this.target.$nextTick = fn => this.nextTick(fn)
+      this.target.$getPausableWatchers = () => this._watchers.filter(item => item.pausable)
+      this.target.$getWatcherByName = (name) => {
+        if (!this._namedWatchers) return null
+        return this._namedWatchers[name] || null
+      }
+      this.target.$getRenderWatcher = () => this._watcher
     }
   }
 
@@ -416,11 +423,11 @@ export default class MPXProxy {
           warn(`Failed to execute render function, degrade to full-set-data mode.`, this.options.mpxFileResource, e)
           this.render()
         }
-      }, noop)
+      }, noop, { pausable: true })
     } else {
       renderWatcher = new Watcher(this, () => {
         this.render()
-      }, noop)
+      }, noop, { pausable: true })
     }
     this._watcher = renderWatcher
   }

package/src/observer/watch.js

@@ -1,4 +1,5 @@
 import { isObject, noop } from '../helper/utils'
+import { error } from '../helper/log'
 import Watcher from './watcher'
 import { queueWatcher } from './scheduler'
 
@@ -20,6 +21,12 @@ export function watch (vm, expOrFn, cb, options) {
   options = options || {}
   options.user = true
   const watcher = new Watcher(vm, expOrFn, cb, options)
+  if (!vm._namedWatchers) vm._namedWatchers = {}
+  const name = options.name
+  if (name) {
+    if (vm._namedWatchers[name]) error(`已存在name=${name} 的 watcher，当存在多个 name 相同 watcher 时仅保留当次创建的 watcher，如需都保留请使用不同的 name！`)
+    vm._namedWatchers[name] = watcher
+  }
   if (options.immediate) {
     cb.call(vm.target, watcher.value)
   } else if (options.immediateAsync) {

package/src/observer/watcher.js

@@ -24,6 +24,7 @@ export default class Watcher {
       this.deep = !!options.deep
       this.lazy = !!options.lazy
       this.sync = !!options.sync
+      this.name = options.name
     } else {
       this.deep = this.lazy = this.sync = false
     }
@@ -31,6 +32,10 @@ export default class Watcher {
     this.id = ++uid // uid for batching
     this.active = true
     this.immediateAsync = false
+    // 是否暂停，默认为否
+    this.paused = false
+    // 是否可被暂停，默认为否，不可被暂停
+    this.pausable = !!(options && options.pausable) || false
     this.dirty = this.lazy // for lazy watchers
     this.deps = []
     this.newDeps = []
@@ -115,7 +120,7 @@ export default class Watcher {
   // 支持临时将某个异步watcher修改为sync执行，在模拟setData时使用
   update (sync) {
     /* istanbul ignore else */
-    if (this.lazy) {
+    if (this.lazy || this.paused) {
       this.dirty = true
     } else if (this.sync || sync) {
       if (sync) dequeueWatcher(this)
@@ -125,6 +130,21 @@ export default class Watcher {
     }
   }
 
+  pause () {
+    // pausable=false 不可暂停
+    if (!this.pausable) return
+    this.paused = true
+  }
+  resume () {
+    // pausable=false 不可恢复
+    if (!this.pausable) return
+    // paused 阶段被触发，则 resume 后执行一次run
+    this.paused = false
+    if (this.dirty) {
+      this.dirty = false
+      this.run()
+    }
+  }
   /**
    * Scheduler job interface.
    * Will be called by the scheduler.