Merge remote-tracking branch 'origin/master'

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-12 16:30:22 */
+/*! time: 2020-10-12 18:30:19 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -90748,6 +90748,25 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
         vm.$$context = createViewModel$1({}, props);
     }
 
+    function getInjectValue(vm, key) {
+        var p = vm._parent;
+        while (p) {
+            if (p.$$context && key in p.$$context) {
+                return p.$$context[key];
+            }
+            p = p._parent;
+        }
+    }
+
+    function getInjectValues(vm) {
+        var inject = vm.inject || [];
+        var result = {};
+        _.each(inject, function (key) {
+            result[key] = getInjectValue(vm, key);
+        });
+        return result;
+    }
+
     var Model = function () {
         function Model() {
             _classCallCheck(this, Model);
@@ -90766,17 +90785,18 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
             var state = _.isFunction(this.state) ? this.state() : this.state;
             var computed = this.computed;
             var context = this.context;
+            var inject = this.inject;
             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 || []);
+            var keys = _.keys(this.$$model).concat(_.keys(state)).concat(_.keys(computed)).concat(inject || []).concat(context || []);
             var mixins = this.mixins;
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             initMixins(this, mixins);
             this.init();
-            initState(this, state);
+            initState(this, _.extend(getInjectValues(this), state));
             initComputed(this, computed);
             initWatch(this, watch$$1);
             initMethods(this, actions);

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-12 16:30:22 */
+/*! time: 2020-10-12 18:30:19 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -90748,6 +90748,25 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
         vm.$$context = createViewModel$1({}, props);
     }
 
+    function getInjectValue(vm, key) {
+        var p = vm._parent;
+        while (p) {
+            if (p.$$context && key in p.$$context) {
+                return p.$$context[key];
+            }
+            p = p._parent;
+        }
+    }
+
+    function getInjectValues(vm) {
+        var inject = vm.inject || [];
+        var result = {};
+        _.each(inject, function (key) {
+            result[key] = getInjectValue(vm, key);
+        });
+        return result;
+    }
+
     var Model = function () {
         function Model() {
             _classCallCheck(this, Model);
@@ -90766,17 +90785,18 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
             var state = _.isFunction(this.state) ? this.state() : this.state;
             var computed = this.computed;
             var context = this.context;
+            var inject = this.inject;
             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 || []);
+            var keys = _.keys(this.$$model).concat(_.keys(state)).concat(_.keys(computed)).concat(inject || []).concat(context || []);
             var mixins = this.mixins;
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             initMixins(this, mixins);
             this.init();
-            initState(this, state);
+            initState(this, _.extend(getInjectValues(this), state));
             initComputed(this, computed);
             initWatch(this, watch$$1);
             initMethods(this, actions);

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-12 16:30:22 */
+/*! time: 2020-10-12 18:30:19 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -90743,6 +90743,25 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
         vm.$$context = createViewModel$1({}, props);
     }
 
+    function getInjectValue(vm, key) {
+        var p = vm._parent;
+        while (p) {
+            if (p.$$context && key in p.$$context) {
+                return p.$$context[key];
+            }
+            p = p._parent;
+        }
+    }
+
+    function getInjectValues(vm) {
+        var inject = vm.inject || [];
+        var result = {};
+        _.each(inject, function (key) {
+            result[key] = getInjectValue(vm, key);
+        });
+        return result;
+    }
+
     var Model = function () {
         function Model() {
             _classCallCheck(this, Model);
@@ -90761,17 +90780,18 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
             var state = _.isFunction(this.state) ? this.state() : this.state;
             var computed = this.computed;
             var context = this.context;
+            var inject = this.inject;
             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 || []);
+            var keys = _.keys(this.$$model).concat(_.keys(state)).concat(_.keys(computed)).concat(inject || []).concat(context || []);
             var mixins = this.mixins;
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             initMixins(this, mixins);
             this.init();
-            initState(this, state);
+            initState(this, _.extend(getInjectValues(this), state));
             initComputed(this, computed);
             initWatch(this, watch$$1);
             initMethods(this, actions);

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-12 16:30:22 */
+/*! time: 2020-10-12 18:30:19 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -67941,6 +67941,25 @@ exports.Model = Model;
         vm.$$context = createViewModel$1({}, props);
     }
 
+    function getInjectValue(vm, key) {
+        var p = vm._parent;
+        while (p) {
+            if (p.$$context && key in p.$$context) {
+                return p.$$context[key];
+            }
+            p = p._parent;
+        }
+    }
+
+    function getInjectValues(vm) {
+        var inject = vm.inject || [];
+        var result = {};
+        _.each(inject, function (key) {
+            result[key] = getInjectValue(vm, key);
+        });
+        return result;
+    }
+
     var Model = function () {
         function Model() {
             _classCallCheck(this, Model);
@@ -67959,17 +67978,18 @@ exports.Model = Model;
             var state = _.isFunction(this.state) ? this.state() : this.state;
             var computed = this.computed;
             var context = this.context;
+            var inject = this.inject;
             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 || []);
+            var keys = _.keys(this.$$model).concat(_.keys(state)).concat(_.keys(computed)).concat(inject || []).concat(context || []);
             var mixins = this.mixins;
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             initMixins(this, mixins);
             this.init();
-            initState(this, state);
+            initState(this, _.extend(getInjectValues(this), state));
             initComputed(this, computed);
             initWatch(this, watch$$1);
             initMethods(this, actions);

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-12 16:30:22 */
+/*! time: 2020-10-12 18:30:19 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20201012163249",
+  "version": "2.0.20201012183231",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",