diff --git a/src/base/combination/navigation.js b/src/base/combination/navigation.js index efbf68404..adc3e5ad4 100644 --- a/src/base/combination/navigation.js +++ b/src/base/combination/navigation.js @@ -43,9 +43,10 @@ BI.Navigation = BI.inherit(BI.Widget, { return self.showIndex + v; }, cardCreator: function (v) { + BI.Widget.pushContext(self); var card = o.cardCreator(v); + BI.Widget.popContext(); self.cardMap[v] = card; - return card; }, afterCardCreated: BI.bind(this.afterCardCreated, this), diff --git a/src/core/4.widget.js b/src/core/4.widget.js index 9910f010f..bca87b9fc 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -903,7 +903,7 @@ BI.useContext = function (inject) { // 通过组件找最近的store - var vm = BI.Widget.findStore(BI.Widget.current); + var vm = BI.Widget.findStore(BI.Widget.current || BI.Widget.context); if (vm) { if (inject) { if (vm.$$computed && inject in vm.$$computed) {