From c627070cb87543e7b3459ee24469167655405233 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Tue, 9 Mar 2021 19:42:41 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8Bc?=
 =?UTF-8?q?ontext=E7=9A=84=E4=BC=A0=E9=80=92"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e0311e8d2ffa014e3deaae857b3223b135184b9c.

# Conflicts:
#	src/core/base.js
#	src/core/shortcut.js
#	src/core/widget.js
---
 dist/fix/fix.compact.ie.js |  4 ++--
 dist/fix/fix.compact.js    |  4 ++--
 examples/dev.html          | 30 ++++++++++--------------------
 src/core/base.js           |  4 ++--
 src/core/shortcut.js       |  5 ++---
 src/core/widget.js         | 11 +++++++++--
 6 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/dist/fix/fix.compact.ie.js b/dist/fix/fix.compact.ie.js
index 7adb412601..29450ec7a1 100644
--- a/dist/fix/fix.compact.ie.js
+++ b/dist/fix/fix.compact.ie.js
@@ -82,7 +82,7 @@
             if (p instanceof Fix.Model || p.store || p.__cacheStore) {
                 break;
             }
-            p = p._context || p._parent || (p.options && p.options.element);
+            p = p._parent || (p.options && p.options.element);
         }
         if (p) {
             if (p instanceof Fix.Model) {
@@ -121,7 +121,7 @@
     function createStore () {
         var needPop = false;
         if (_global.Fix && this._store) {
-            var store = findStore(this.options.context || p._context || this._parent || this.options.element);
+            var store = findStore(this.options.context || this._parent || this.options.element);
             if (store) {
                 pushTarget(store);
                 needPop = true;
diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js
index 89e0a155c7..773ee7e47a 100644
--- a/dist/fix/fix.compact.js
+++ b/dist/fix/fix.compact.js
@@ -86,7 +86,7 @@
             if (p instanceof Fix.Model || p.store || p.__cacheStore) {
                 break;
             }
-            p = p._context || p._parent || (p.options && p.options.element);
+            p = p._parent || (p.options && p.options.element);
         }
         if (p) {
             if (p instanceof Fix.Model) {
@@ -134,7 +134,7 @@
     function createStore () {
         var needPop = false;
         if (_global.Fix && this._store) {
-            var store = findStore(this.options.context || this._context || this._parent || this.options.element);
+            var store = findStore(this.options.context || this._parent || this.options.element);
             if (store) {
                 pushTarget(store);
                 needPop = true;
diff --git a/examples/dev.html b/examples/dev.html
index 3e7f62056d..6b6eb4f0cb 100644
--- a/examples/dev.html
+++ b/examples/dev.html
@@ -45,8 +45,14 @@
             return {
                 render: function () {
                     return {
-                        type: "bi.button",
-                        text: store.model.text
+                        type: "bi.vertical",
+                        items: [{
+                            type: "bi.button",
+                            text: store.model.text
+                        }, {
+                            type: "bi.label",
+                            text: store.model.text
+                        }]
                     };
                 }
             };
@@ -67,7 +73,7 @@
                 store.toggle();
             }, 1000);
             BI.watch("text", function () {
-                // child.reset();
+                child.populate();
             });
             return function () {
                 return {
@@ -79,23 +85,7 @@
                             child = _ref;
                         }
                     }, {
-                        type: "bi.combo",
-                        el: {
-                            type: "bi.button",
-                            text: "点击"
-                        },
-                        popup: {
-                            el: {
-                                type: "bi.tab",
-                                height: 100,
-                                showIndex: 0,
-                                cardCreator: function () {
-                                    return {
-                                        type: "demo.child"
-                                    };
-                                }
-                            }
-                        }
+                        type: "demo.child"
                     }]
                 };
             };
diff --git a/src/core/base.js b/src/core/base.js
index 2bdc87d653..b7948bf333 100644
--- a/src/core/base.js
+++ b/src/core/base.js
@@ -70,7 +70,7 @@ if (!_global.BI) {
         },
 
         isWidget: function (widget) {
-            return widget instanceof BI.Widget;
+            return widget instanceof BI.Widget || (BI.View && widget instanceof BI.View);
         },
 
         createWidgets: function (items, options, context) {
@@ -107,7 +107,7 @@ if (!_global.BI) {
                         el: innerAttr.shift()
                     });
                 }
-                if (item.el instanceof BI.Widget) {
+                if (item.el instanceof BI.Widget || (BI.View && item.el instanceof BI.View)) {
                     innerAttr.shift();
                     return BI.extend({}, outerAttr.shift(), { type: null }, item);
                 }
diff --git a/src/core/shortcut.js b/src/core/shortcut.js
index 704d2a6b93..9f3b8492b7 100644
--- a/src/core/shortcut.js
+++ b/src/core/shortcut.js
@@ -18,12 +18,11 @@
             throw new Error("组件" + config.type + "未定义");
         }
         var pushed = false;
-        var widget = new cls();
-        widget._context = BI.Widget.context || context;
-        if (!BI.Widget.context && context) {
+        if (context) {
             pushed = true;
             BI.Widget.pushContext(context);
         }
+        var widget = new cls();
         widget._initProps(config);
         widget._constructed();
         widget._initRoot();
diff --git a/src/core/widget.js b/src/core/widget.js
index f398de5d4b..42628f1d4a 100644
--- a/src/core/widget.js
+++ b/src/core/widget.js
@@ -152,9 +152,16 @@
             this._children = {};
             if (BI.isWidget(o.element)) {
                 this.element = this.options.element.element;
-                this._parent = o.element;
-                this._parent.addWidget(this.widgetName, this);
+                if (o.element instanceof BI.Widget) {
+                    this._parent = o.element;
+                    this._parent.addWidget(this.widgetName, this);
+                } else {
+                    this._isRoot = true;
+                }
             } else if (o.element) {
+                // if (o.root !== true) {
+                //     throw new Error("root is a required property");
+                // }
                 this.element = BI.Widget._renderEngine.createElement(this);
                 this._isRoot = true;
             } else {