From 90d48a783cb3bb6aa36250ea5286668dcffd4c78 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Thu, 30 Nov 2017 10:21:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/BI4.1'

# Conflicts:
#	dist/bundle.min.js
---
 demo/js/config/fix.js | 14 +++++++-------
 dist/demo.js          | 14 +++++++-------
 dist/fix/fix.js       |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/demo/js/config/fix.js b/demo/js/config/fix.js
index 32c8d4b8f..14310478b 100644
--- a/demo/js/config/fix.js
+++ b/demo/js/config/fix.js
@@ -94,37 +94,37 @@ Demo.FIX_CONFIG = [{
     text: "state属性",
     value: "demo.fix_state"
 }, {
-    id: 78,
+    id: 73,
     pId: 7,
     text: "计算属性",
     value: "demo.fix_computed"
 }, {
-    id: 73,
+    id: 74,
     pId: 7,
     text: "store",
     value: "demo.fix_store"
 }, {
-    id: 74,
+    id: 75,
     pId: 7,
     text: "watcher且或表达式",
     value: "demo.fix_watcher"
 }, {
-    id: 75,
+    id: 76,
     pId: 7,
     text: "watcher星号表达式",
     value: "demo.fix_global_watcher"
 }, {
-    id: 76,
+    id: 77,
     pId: 7,
     text: "context",
     value: "demo.fix_context"
 }, {
-    id: 77,
+    id: 78,
     pId: 7,
     text: "一个混合的例子",
     value: "demo.fix"
 }, {
-    id: 78,
+    id: 79,
     pId: 7,
     text: "场景",
     value: "demo.fix_scene"
diff --git a/dist/demo.js b/dist/demo.js
index 7267b9ded..809d34e1a 100644
--- a/dist/demo.js
+++ b/dist/demo.js
@@ -5268,37 +5268,37 @@ Demo.FIX_CONFIG = [{
     text: "state属性",
     value: "demo.fix_state"
 }, {
-    id: 78,
+    id: 73,
     pId: 7,
     text: "计算属性",
     value: "demo.fix_computed"
 }, {
-    id: 73,
+    id: 74,
     pId: 7,
     text: "store",
     value: "demo.fix_store"
 }, {
-    id: 74,
+    id: 75,
     pId: 7,
     text: "watcher且或表达式",
     value: "demo.fix_watcher"
 }, {
-    id: 75,
+    id: 76,
     pId: 7,
     text: "watcher星号表达式",
     value: "demo.fix_global_watcher"
 }, {
-    id: 76,
+    id: 77,
     pId: 7,
     text: "context",
     value: "demo.fix_context"
 }, {
-    id: 77,
+    id: 78,
     pId: 7,
     text: "一个混合的例子",
     value: "demo.fix"
 }, {
-    id: 78,
+    id: 79,
     pId: 7,
     text: "场景",
     value: "demo.fix_scene"
diff --git a/dist/fix/fix.js b/dist/fix/fix.js
index 0f4f4f7cb..1656f98eb 100644
--- a/dist/fix/fix.js
+++ b/dist/fix/fix.js
@@ -1159,7 +1159,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
                             return vm.$$state[key];
                         }
                         if (vm.$$model && key in vm.$$model) {
-                            return vm.$$model;
+                            return vm.$$model[key];
                         }
                         var p = vm._parent;
                         while (p) {