feat(core): added global mixin api

Tencent · Sep 16, 2018 · be65c8b · be65c8b
1 parent d784902
commit be65c8b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/packages/core/dist/wepy.js b/packages/core/dist/wepy.js
@@ -1963,6 +1963,8 @@ var config$1 = {
   }
 };
 
+var globalMixinPatched = false;
+
 var defaultStrat = function (parentVal, childVal) { return childVal ? childVal : parentVal; };
 var strats = null;
 
@@ -2003,6 +2005,12 @@ function patchMixins (output, option, mixins) {
     return;
   }
 
+  if (!globalMixinPatched) {
+    var globalMixin = $global.mixin || {};
+    mixins = [].concat(mixins).concat(globalMixin);
+    globalMixinPatched = true;
+  }
+
   if (isArr(mixins)) {
     mixins.forEach(function (mixin) { return patchMixins(output, option, mixin); });
   } else {
@@ -2090,6 +2098,12 @@ function use (plugin) {
   plugin.installed = 1;
 }
 
+function mixin (options) {
+  if ( options === void 0 ) options = {};
+
+  $global.mixin = options;
+}
+
 var wepy = Base;
 
 Object.assign(wepy, {
@@ -2099,7 +2113,8 @@ Object.assign(wepy, {
   global: $global,
 
   // global apis
-  use: use
+  use: use,
+  mixin: mixin
 });
 
 module.exports = wepy;
diff --git a/packages/core/weapp/apis/index.js b/packages/core/weapp/apis/index.js
@@ -1 +1,2 @@
 export * from './use';
+export * from './mixin';
diff --git a/packages/core/weapp/apis/mixin.js b/packages/core/weapp/apis/mixin.js
@@ -0,0 +1,5 @@
+import $global from '../global';
+
+export function mixin (options = {}) {
+  $global.mixin = options;
+}
diff --git a/packages/core/weapp/init/mixins.js b/packages/core/weapp/init/mixins.js
@@ -3,6 +3,9 @@ import { WEAPP_LIFECYCLE } from '../../shared/index';
 import { patchProps } from './props';
 import { patchData } from './data';
 import { config } from '../config';
+import $global from '../global';
+
+let globalMixinPatched = false;
 
 const defaultStrat = (parentVal, childVal) => childVal ? childVal : parentVal;
 let strats = null;
@@ -44,6 +47,12 @@ export function patchMixins (output, option, mixins) {
     return;
   }
 
+  if (!globalMixinPatched) {
+    const globalMixin = $global.mixin || {};
+    mixins = [].concat(mixins).concat(globalMixin);
+    globalMixinPatched = true;
+  }
+
   if (isArr(mixins)) {
     mixins.forEach(mixin => patchMixins(output, option, mixin));
   } else {

diff --git a/packages/core/weapp/wepy.js b/packages/core/weapp/wepy.js
@@ -3,7 +3,7 @@ import page from './page';
 import app from './app';
 import component from './component';
 import $global from './global';
-import { use } from './apis/index';
+import { use, mixin } from './apis/index';
 
 
 let wepy = Base;
@@ -15,7 +15,8 @@ Object.assign(wepy, {
   global: $global,
 
   // global apis
-  use
+  use,
+  mixin
 });