Merge pull request #159 in FUI/fineui from ~GUY/fineui:master to master

* commit '84e2c00424126979fb49d292f390f53f7343485b':
  update
  update
  numbereditor加allowBlank
  update
  update
  update

Gruntfile.js

@@ -285,7 +285,7 @@ module.exports = function (grunt) {
 
         uglify: {
             options: {
-                banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+                banner: '/*! <%= pkg.name %> */\n'
             },
             dist: {
                 files: {

bi/widget.js

@@ -1088,7 +1088,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
                 region.el.element.css({
                     width: region.width
                 });
-                region.el._width = region.left;
+                region.el._width = region.width;
             }
             if (region.el._height !== region.height) {
                 region.el.element.css({
@@ -12036,6 +12036,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
                 return v;
             },
             value: 0,
+            allowBlank: false,
             errorText: "",
             step: 1
         })
@@ -12047,6 +12048,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
+            allowBlank: o.allowBlank,
             value: o.valueFormatter(o.value),
             validationChecker: o.validationChecker,
             errorText: o.errorText

demo/js/fix-2.0/demo.js

@@ -1,35 +1,35 @@
-var model = new Fix.Observer({
+var model = Fix.define({
     name: 1,
     arr: [{
         n: 'a'
     }, {
         n: 'b'
     }]
-}).model;
+});
 Demo.Computed = BI.inherit(Fix.VM, {
     computed: {
         b: function () {
-            return this.model.name + 1
+            return this.name + 1
         },
         c: function () {
-            return this.model.name + this.model.b
+            return this.arr[1].n + this.b
         }
-    },
+    }
 })
 
 Demo.Store = BI.inherit(Fix.VM, {
     _init: function () {
-        this.computed = new Demo.Computed(model).model;
+        this.comp = new Demo.Computed(model).model;
     },
     computed: {
         b: function () {
-            return this.computed.c + 1
+            return this.comp.c + 1
-        },
+        }
     },
-    methods: {
+    actions: {
         run: function () {
-            var t = this.model.b;
+            this.comp.name = 2;
-            this.computed.name = 2;
+            this.comp.arr[1].n = "c"
         }
     }
 });

dist/bundle.js

@@ -76184,7 +76184,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
                 region.el.element.css({
                     width: region.width
                 });
-                region.el._width = region.left;
+                region.el._width = region.width;
             }
             if (region.el._height !== region.height) {
                 region.el.element.css({
@@ -87132,6 +87132,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
                 return v;
             },
             value: 0,
+            allowBlank: false,
             errorText: "",
             step: 1
         })
@@ -87143,6 +87144,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
+            allowBlank: o.allowBlank,
             value: o.valueFormatter(o.value),
             validationChecker: o.validationChecker,
             errorText: o.errorText

dist/demo.js

@@ -10070,38 +10070,38 @@ Demo.Func = BI.inherit(BI.Widget, {
     }
 });
 BI.shortcut("demo.tmp", Demo.Func);
-var model = new Fix.Observer({
+var model = Fix.define({
     name: 1,
     arr: [{
         n: 'a'
     }, {
         n: 'b'
     }]
-}).model;
+});
 Demo.Computed = BI.inherit(Fix.VM, {
     computed: {
         b: function () {
-            return this.model.name + 1
+            return this.name + 1
         },
         c: function () {
-            return this.model.name + this.model.b
+            return this.arr[1].n + this.b
         }
-    },
+    }
 })
 
 Demo.Store = BI.inherit(Fix.VM, {
     _init: function () {
-        this.computed = new Demo.Computed(model).model;
+        this.comp = new Demo.Computed(model).model;
     },
     computed: {
         b: function () {
-            return this.computed.c + 1
+            return this.comp.c + 1
-        },
+        }
     },
-    methods: {
+    actions: {
         run: function () {
-            var t = this.model.b;
+            this.comp.name = 2;
-            this.computed.name = 2;
+            this.comp.arr[1].n = "c"
         }
     }
 });

dist/fix/fix.compact.js

@@ -38,9 +38,9 @@
         _init.apply(this, arguments);
     };
 
-    var destroy = BI.Widget.prototype.destroy;
+    var unMount = BI.Widget.prototype._unMount;
-    BI.Widget.prototype.destroy = function () {
+    BI.Widget.prototype._unMount = function () {
-        destroy.apply(this, arguments);
+        unMount.apply(this, arguments);
         this.store && this.store.destroy();
         BI.each(this._watchers, function (i, unwatch) {
             unwatch();

dist/fix/fix.js

@@ -212,6 +212,42 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         Dep.target = targetStack.pop();
     }
 
+    var arrayProto = Array.prototype;
+    var arrayMethods = [];
+    _.each(['push', 'pop', 'shift', 'unshift', 'splice', 'sort', 'reverse'], function (method) {
+        var original = arrayProto[method];
+        arrayMethods[method] = function mutator() {
+            for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+                args[_key] = arguments[_key];
+            }
+
+            var ob = this.__ob__;
+            var inserted = void 0;
+            switch (method) {
+                case 'push':
+                case 'unshift':
+                    inserted = args;
+                    break;
+                case 'splice':
+                    inserted = args.slice(2);
+                    break;
+            }
+            if (inserted) inserted = ob.observeArray(inserted);
+            switch (method) {
+                case 'push':
+                case 'unshift':
+                    args = inserted;
+                    break;
+                case 'splice':
+                    args = [args[0], args[1]].concat(inserted ? inserted : []);
+                    break;
+            }
+            var result = original.apply(this, args);
+            ob.dep.notify();
+            return result;
+        };
+    });
+
     //如果浏览器不支持ecma262v5的Object.defineProperties或者存在BUG，比如IE8
     //标准浏览器使用__defineGetter__, __defineSetter__实现
     var canHideProperty = true;
@@ -328,6 +364,184 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
     var createViewModel$1 = createViewModel;
 
+    var arrayKeys = _.keys(arrayMethods);
+
+    var observerState = {
+        shouldConvert: true
+    };
+
+    /**
+     * Observer class that are attached to each observed
+     * object. Once attached, the observer converts target
+     * object's property keys into getter/setters that
+     * collect dependencies and dispatches updates.
+     */
+
+    var Observer = function () {
+        function Observer(value) {
+            _classCallCheck(this, Observer);
+
+            this.value = value;
+            this.dep = new Dep();
+            this.vmCount = 0;
+            if (_.isArray(value)) {
+                var augment = hasProto ? protoAugment : copyAugment;
+                augment(value, arrayMethods, arrayKeys);
+                this.model = this.observeArray(value);
+            } else {
+                this.model = this.walk(value);
+            }
+            this.model['__ob__'] = this;
+        }
+
+        Observer.prototype.walk = function walk(obj) {
+            return defineReactive(obj);
+        };
+
+        Observer.prototype.observeArray = function observeArray(items) {
+            for (var i = 0, l = items.length; i < l; i++) {
+                items[i] = observe(items[i]).model;
+            }
+            return items;
+        };
+
+        return Observer;
+    }();
+
+    function protoAugment(target, src, keys) {
+        /* eslint-disable no-proto */
+        target.__proto__ = src;
+        /* eslint-enable no-proto */
+    }
+
+    /* istanbul ignore next */
+    function copyAugment(target, src, keys) {
+        for (var i = 0, l = keys.length; i < l; i++) {
+            var key = keys[i];
+            target[key] = src[key];
+        }
+    }
+
+    function observe(value, asRootData) {
+        if (!_.isObject(value)) {
+            return;
+        }
+        var ob = void 0;
+        if (_.has(value, '__ob__') && value.__ob__ instanceof Observer) {
+            ob = value.__ob__;
+        } else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value)) && !value._isVue) {
+            ob = new Observer(value);
+        }
+        if (asRootData && ob) {
+            ob.vmCount++;
+        }
+        return ob;
+    }
+
+    function defineReactive(obj, shallow) {
+
+        var props = {};
+        _.each(obj, function (val, key) {
+            if (key in $$skipArray) {
+                return;
+            }
+            var dep = new Dep();
+            var childOb = !shallow && observe(val);
+            props[key] = {
+                enumerable: true,
+                configurable: true,
+                get: function reactiveGetter() {
+                    var value = val;
+                    if (Dep.target) {
+                        dep.depend();
+                        if (childOb) {
+                            childOb.dep.depend();
+                            if (_.isArray(value)) {
+                                dependArray(value);
+                            }
+                        }
+                    }
+                    return value;
+                },
+                set: function reactiveSetter(newVal) {
+                    var value = val;
+                    if (newVal === value || newVal !== newVal && value !== value) {
+                        return;
+                    }
+                    val = newVal;
+                    childOb = !shallow && observe(newVal);
+                    obj[key] = childOb ? childOb.model : newVal;
+                    dep.notify();
+                }
+            };
+        });
+        return createViewModel$1(obj, props);
+    }
+
+    /**
+     * Set a property on an object. Adds the new property and
+     * triggers change notification if the property doesn't
+     * already exist.
+     */
+    function set(target, key, val) {
+        if (_.isArray(target)) {
+            target.length = Math.max(target.length, key);
+            target.splice(key, 1, val);
+            return val;
+        }
+        if (_.has(target, key)) {
+            target[key] = val;
+            return val;
+        }
+        var ob = target.__ob__;
+        if (target._isVue || ob && ob.vmCount) {
+            return val;
+        }
+        if (!ob) {
+            target[key] = val;
+            return val;
+        }
+        defineReactive(ob.value, key, val);
+        ob.dep.notify();
+        return val;
+    }
+
+    /**
+     * Delete a property and trigger change if necessary.
+     */
+    function del(target, key) {
+        if (_.isArray(target)) {
+            target.splice(key, 1);
+            return;
+        }
+        var ob = target.__ob__;
+        if (target._isVue || ob && ob.vmCount) {
+            return;
+        }
+        if (!_.has(target, key)) {
+            return;
+        }
+        delete target[key];
+        if (!ob) {
+            return;
+        }
+        ob.dep.notify();
+    }
+
+    /**
+     * Collect dependencies on array elements when the array is touched, since
+     * we cannot intercept array element access like property getters.
+     */
+    function dependArray(value) {
+        for (var e, i = 0, l = value.length; i < l; i++) {
+            e = value[i];
+            e && e.__ob__ && e.__ob__.dep.depend();
+            if (_.isArray(e)) {
+                dependArray(e);
+            }
+        }
+    }
+
     var queue = [];
     var activatedChildren = [];
     var has = {};
@@ -582,220 +796,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         }
     }
 
-    var arrayProto = Array.prototype;
-    var arrayMethods = [];
-    _.each(['push', 'pop', 'shift', 'unshift', 'splice', 'sort', 'reverse'], function (method) {
-        var original = arrayProto[method];
-        arrayMethods[method] = function mutator() {
-            for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-                args[_key] = arguments[_key];
-            }
-
-            var ob = this.__ob__;
-            var inserted = void 0;
-            switch (method) {
-                case 'push':
-                case 'unshift':
-                    inserted = args;
-                    break;
-                case 'splice':
-                    inserted = args.slice(2);
-                    break;
-            }
-            if (inserted) inserted = ob.observeArray(inserted);
-            switch (method) {
-                case 'push':
-                case 'unshift':
-                    args = inserted;
-                    break;
-                case 'splice':
-                    args = [args[0], args[1]].concat(inserted ? inserted : []);
-                    break;
-            }
-            var result = original.apply(this, args);
-            ob.dep.notify();
-            return result;
-        };
-    });
-
-    var arrayKeys = _.keys(arrayMethods);
-
-    var observerState = {
-        shouldConvert: true
-    };
-
-    /**
-     * Observer class that are attached to each observed
-     * object. Once attached, the observer converts target
-     * object's property keys into getter/setters that
-     * collect dependencies and dispatches updates.
-     */
-
-    var Observer = function () {
-        function Observer(value) {
-            _classCallCheck(this, Observer);
-
-            this.value = value;
-            this.dep = new Dep();
-            this.vmCount = 0;
-            if (_.isArray(value)) {
-                var augment = hasProto ? protoAugment : copyAugment;
-                augment(value, arrayMethods, arrayKeys);
-                this.model = this.observeArray(value);
-            } else {
-                this.model = this.walk(value);
-            }
-            this.model['__ob__'] = this;
-        }
-
-        Observer.prototype.walk = function walk(obj) {
-            return defineReactive(obj);
-        };
-
-        Observer.prototype.observeArray = function observeArray(items) {
-            for (var i = 0, l = items.length; i < l; i++) {
-                items[i] = observe(items[i]).model;
-            }
-            return items;
-        };
-
-        return Observer;
-    }();
-
-    function protoAugment(target, src, keys) {
-        /* eslint-disable no-proto */
-        target.__proto__ = src;
-        /* eslint-enable no-proto */
-    }
-
-    /* istanbul ignore next */
-    function copyAugment(target, src, keys) {
-        for (var i = 0, l = keys.length; i < l; i++) {
-            var key = keys[i];
-            target[key] = src[key];
-        }
-    }
-
-    function observe(value, asRootData) {
-        if (!_.isObject(value)) {
-            return;
-        }
-        var ob = void 0;
-        if (_.has(value, '__ob__') && value.__ob__ instanceof Observer) {
-            ob = value.__ob__;
-        } else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value)) && !value._isVue) {
-            ob = new Observer(value);
-        }
-        if (asRootData && ob) {
-            ob.vmCount++;
-        }
-        return ob;
-    }
-
-    function defineReactive(obj, shallow) {
-
-        var props = {};
-        _.each(obj, function (val, key) {
-            if (key in $$skipArray) {
-                return;
-            }
-            var dep = new Dep();
-            var childOb = !shallow && observe(val);
-            props[key] = {
-                enumerable: true,
-                configurable: true,
-                get: function reactiveGetter() {
-                    var value = val;
-                    if (Dep.target) {
-                        dep.depend();
-                        if (childOb) {
-                            childOb.dep.depend();
-                            if (_.isArray(value)) {
-                                dependArray(value);
-                            }
-                        }
-                    }
-                    return value;
-                },
-                set: function reactiveSetter(newVal) {
-                    var value = val;
-                    if (newVal === value || newVal !== newVal && value !== value) {
-                        return;
-                    }
-                    val = newVal;
-                    childOb = !shallow && observe(newVal);
-                    obj[key] = childOb ? childOb.model : newVal;
-                    dep.notify();
-                }
-            };
-        });
-        return createViewModel$1(obj, props);
-    }
-
-    /**
-     * Set a property on an object. Adds the new property and
-     * triggers change notification if the property doesn't
-     * already exist.
-     */
-    function set(target, key, val) {
-        if (_.isArray(target)) {
-            target.length = Math.max(target.length, key);
-            target.splice(key, 1, val);
-            return val;
-        }
-        if (_.has(target, key)) {
-            target[key] = val;
-            return val;
-        }
-        var ob = target.__ob__;
-        if (target._isVue || ob && ob.vmCount) {
-            return val;
-        }
-        if (!ob) {
-            target[key] = val;
-            return val;
-        }
-        defineReactive(ob.value, key, val);
-        ob.dep.notify();
-        return val;
-    }
-
-    /**
-     * Delete a property and trigger change if necessary.
-     */
-    function del(target, key) {
-        if (_.isArray(target)) {
-            target.splice(key, 1);
-            return;
-        }
-        var ob = target.__ob__;
-        if (target._isVue || ob && ob.vmCount) {
-            return;
-        }
-        if (!_.has(target, key)) {
-            return;
-        }
-        delete target[key];
-        if (!ob) {
-            return;
-        }
-        ob.dep.notify();
-    }
-
-    /**
-     * Collect dependencies on array elements when the array is touched, since
-     * we cannot intercept array element access like property getters.
-     */
-    function dependArray(value) {
-        for (var e, i = 0, l = value.length; i < l; i++) {
-            e = value[i];
-            e && e.__ob__ && e.__ob__.dep.depend();
-            if (_.isArray(e)) {
-                dependArray(e);
-            }
-        }
-    }
-
     var computedWatcherOptions = { lazy: true };
 
     function initComputed(vm, computed) {
@@ -804,8 +804,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         defineComputed(vm, computed);
 
         for (var key in computed) {
-            var userDef = computed[key];
+            var userDef = computed[key],
-            var getter = typeof userDef === 'function' ? _.bind(userDef, vm) : _.bind(userDef.get, vm);
+                context = vm.$$model ? vm.model : vm;
+            var getter = typeof userDef === 'function' ? _.bind(userDef, context) : _.bind(userDef.get, context);
 
             watchers[key] = new Watcher(vm.$$computed, getter || noop, noop, computedWatcherOptions);
         }
@@ -854,7 +855,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
     function initMethods(vm, methods) {
         for (var key in methods) {
-            vm[key] = methods[key] == null ? noop : _.bind(methods[key], vm);
+            vm[key] = methods[key] == null ? noop : _.bind(methods[key], vm.$$model ? vm.model : vm);
         }
     }
 
@@ -882,8 +883,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             } else {
                 this.options = model || {};
             }
-            initComputed(this, this.computed);
-            initMethods(this, this.methods);
             var keys = _.keys(this.$$model).concat(_.keys(this.computed));
             var props = {};
 
@@ -911,6 +910,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             }
             this.model = createViewModel$1({}, props);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
+            initComputed(this, this.computed);
+            initMethods(this, this.actions);
             this._init();
         }
 
@@ -941,8 +942,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         return VM;
     }();
 
+    function define(model) {
+        return new Observer(model).model;
+    }
     var version = '2.0';
 
+    exports.define = define;
     exports.version = version;
     exports.$$skipArray = $$skipArray;
     exports.VM = VM;

dist/widget.js

@@ -1088,7 +1088,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
                 region.el.element.css({
                     width: region.width
                 });
-                region.el._width = region.left;
+                region.el._width = region.width;
             }
             if (region.el._height !== region.height) {
                 region.el.element.css({
@@ -12036,6 +12036,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
                 return v;
             },
             value: 0,
+            allowBlank: false,
             errorText: "",
             step: 1
         })
@@ -12047,6 +12048,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
+            allowBlank: o.allowBlank,
             value: o.valueFormatter(o.value),
             validationChecker: o.validationChecker,
             errorText: o.errorText

src/widget/arrangement/arrangement.js

@@ -288,7 +288,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
                 region.el.element.css({
                     width: region.width
                 });
-                region.el._width = region.left;
+                region.el._width = region.width;
             }
             if (region.el._height !== region.height) {
                 region.el.element.css({

src/widget/numbereditor/number.editor.js

@@ -13,6 +13,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
                 return v;
             },
             value: 0,
+            allowBlank: false,
             errorText: "",
             step: 1
         })
@@ -24,6 +25,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
+            allowBlank: o.allowBlank,
             value: o.valueFormatter(o.value),
             validationChecker: o.validationChecker,
             errorText: o.errorText