Merge pull request #408 in FUI/fineui from ~WINDY/fui:master to master

* commit 'f5cc1955c239a4c2d03811f34622f5fee1fd9fe4':
  update
  BI-21758 && BI-21739
  BI-21510

dist/bundle.js

@@ -83279,6 +83279,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         disable: function () {
             this.elm.element.attr("contentEditable", false);
+            this.elm.element.css("word-break", "break-all");
         },
 
         getSel: function () {
@@ -100998,7 +100999,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         return BI.extend(conf, {
             extraCls: "bi-number-interval",
             height: 25,
-            validation: "valid"
+            validation: "valid",
+            closeMin: true
         });
     },
     _init: function () {
@@ -106593,7 +106595,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;
@@ -106923,7 +106925,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;
@@ -107211,7 +107213,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;

dist/case.js

@@ -10801,6 +10801,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         disable: function () {
             this.elm.element.attr("contentEditable", false);
+            this.elm.element.css("word-break", "break-all");
         },
 
         getSel: function () {

dist/demo.js

@@ -11014,6 +11014,111 @@ BI.shortcut("demo.tmp", Demo.Func);
     });
 
     BI.shortcut("demo.fix_global_watcher", Demo.Fix);
+}());(function () {
+    var State = BI.inherit(Fix.Model, {
+        state: function () {
+            return {
+                name: "原始属性",
+                info: {
+                    age: 12,
+                    sex: "male",
+                    birth: {
+                        year: 2018,
+                        month: 9,
+                        day: 11
+                    }
+                },
+                career: [{
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }]
+            };
+        },
+        computed: {
+            b: function () {
+                return this.model.name + "-计算属性";
+            },
+            birth: function () {
+                return this.model.info.birth;
+            }
+        }
+    });
+
+    Demo.Fix = BI.inherit(BI.Widget, {
+        _store: function () {
+            return new State();
+        },
+        watch: {
+            b: function () {
+                this.button.setText(this.model.b);
+            },
+            "birth.**": function () {
+                console.log(123);
+            }
+        },
+        render: function () {
+            var self = this;
+            return {
+                type: "bi.vertical",
+                items: [{
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.name = "这是改变后的属性";
+                        },
+                        text: this.model.b
+                    }
+                }, {
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.birth.year = 2019;
+                        },
+                        text: "birthYearButton"
+                    }
+                }, {
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.career.push({
+                                year: 2017,
+                                month: 3,
+                                day: 24
+                            });
+                        },
+                        text: "careerAddButton"
+                    }
+                }, {
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.career[0].a = 24;
+                        },
+                        text: "careerChangeButton"
+                    }
+                }]
+            };
+        },
+        mounted: function () {
+
+
+        }
+    });
+
+    BI.shortcut("demo.fix_immutable", Demo.Fix);
 }());/**
  * @Author: Young
  * @CreationDate 2017-11-06 10:32

dist/fineui.js

@@ -83522,6 +83522,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         disable: function () {
             this.elm.element.attr("contentEditable", false);
+            this.elm.element.css("word-break", "break-all");
         },
 
         getSel: function () {
@@ -101241,7 +101242,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         return BI.extend(conf, {
             extraCls: "bi-number-interval",
             height: 25,
-            validation: "valid"
+            validation: "valid",
+            closeMin: true
         });
     },
     _init: function () {
@@ -106836,7 +106838,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;
@@ -107166,7 +107168,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;
@@ -107454,7 +107456,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;

dist/widget.js

@@ -13435,7 +13435,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         return BI.extend(conf, {
             extraCls: "bi-number-interval",
             height: 25,
-            validation: "valid"
+            validation: "valid",
+            closeMin: true
         });
     },
     _init: function () {
@@ -19030,7 +19031,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;
@@ -19360,7 +19361,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;
@@ -19648,7 +19649,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;

src/case/richeditor/niceditor/niceditor.js

@@ -151,6 +151,7 @@
 
         disable: function () {
             this.elm.element.attr("contentEditable", false);
+            this.elm.element.css("word-break", "break-all");
         },
 
         getSel: function () {

src/widget/numberinterval/numberinterval.js

@@ -24,7 +24,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         return BI.extend(conf, {
             extraCls: "bi-number-interval",
             height: 25,
-            validation: "valid"
+            validation: "valid",
+            closeMin: true
         });
     },
     _init: function () {

src/widget/singleslider/singleslider.js

@@ -51,7 +51,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;

src/widget/singleslider/singleslider.label.js

@@ -52,7 +52,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;

src/widget/singleslider/singleslider.normal.js

@@ -40,7 +40,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
             height: c.SLIDER_HEIGHT
         });
         sliderVertical.element.click(function (e) {
-            if (self.enable) {
+            if (self.enable && self.isEnabled()) {
                 var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
                 var trackLength = self.track.element[0].scrollWidth;
                 var percent = 0;