From 276a623f68860c9778e9563670dac7f798ac853a Mon Sep 17 00:00:00 2001
From: Young <young@finereport.com>
Date: Mon, 22 Jan 2018 11:16:06 +0800
Subject: [PATCH] update

---
 dist/bundle.js                                |  3 +--
 dist/case.js                                  |  3 +--
 dist/fineui.js                                | 24 ++++++++-----------
 .../icontextvaluecombo/combo.icontextvalue.js |  3 +--
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/dist/bundle.js b/dist/bundle.js
index 93b87d3f1..006ac8d1c 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -67811,8 +67811,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
             baseClass: "bi-icon-text-value-combo",
             height: 30,
-            value: "",
-            el: {}
+            value: ""
         });
     },
 
diff --git a/dist/case.js b/dist/case.js
index 1400f2398..3cb40ac41 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -5474,8 +5474,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
             baseClass: "bi-icon-text-value-combo",
             height: 30,
-            value: "",
-            el: {}
+            value: ""
         });
     },
 
diff --git a/dist/fineui.js b/dist/fineui.js
index 05ef0d7c5..ca3d0e34c 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -27351,11 +27351,11 @@ Data.Source = BISource = {
             }
             this._parent = Model.target;
             var state = _.isFunction(this.state) ? this.state() : this.state;
-            var computed = _.isFunction(this.computed) ? this.computed() : this.computed;
-            var context = _.isFunction(this.context) ? this.context() : this.context;
-            var childContext = _.isFunction(this.childContext) ? this.childContext() : this.childContext;
-            var watch$$1 = _.isFunction(this.watch) ? this.watch() : this.watch;
-            var actions = _.isFunction(this.actions) ? this.actions() : this.actions;
+            var computed = this.computed;
+            var context = this.context;
+            var childContext = this.childContext;
+            var watch$$1 = this.watch;
+            var actions = this.actions;
             var keys = _.keys(this.$$model).concat(_.keys(state)).concat(_.keys(computed)).concat(context || []);
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
@@ -27392,13 +27392,6 @@ Data.Source = BISource = {
         return Model;
     }();
 
-    Model.prototype.state = {};
-    Model.prototype.computed = {};
-    Model.prototype.context = [];
-    Model.prototype.childContext = [];
-    Model.prototype.watch = {};
-    Model.prototype.actions = {};
-
     function toJSON(model) {
         var result = void 0;
         if (_.isArray(model)) {
@@ -27560,10 +27553,14 @@ Data.Source = BISource = {
 
     var _render = BI.Widget.prototype._render;
     BI.Widget.prototype._render = function () {
+        var needPop = false;
         if (window.Fix && this._store) {
+            needPop = true;
+            pushTarget(this.store);
             initWatch(this, this.watch);
         }
         _render.apply(this, arguments);
+        needPop && popTarget();
     };
 
     var unMount = BI.Widget.prototype.__d;
@@ -69540,8 +69537,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
             baseClass: "bi-icon-text-value-combo",
             height: 30,
-            value: "",
-            el: {}
+            value: ""
         });
     },
 
diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
index 2b317ed38..eedaf2aca 100644
--- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
@@ -7,8 +7,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
             baseClass: "bi-icon-text-value-combo",
             height: 30,
-            value: "",
-            el: {}
+            value: ""
         });
     },