Pull request #1976: 无JIRA任务 bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'dfd0c38a133c02f6b7b82a54f19a1abb10fe91ed':
  bugfix
  bugfix
  bugfix
  bugfix
  bugfix
  bugfix

src/base/single/1.text.js

@@ -64,8 +64,8 @@
                     type: "bi.layout",
                     tagName: "span"
                 });
-                this.text.element.click(function () {
+                this.text.element.click(function (e) {
-                    o.handler(self.getValue());
+                    o.handler.call(self, self.getValue(), self, e);
                 });
                 BI.createWidget({
                     type: "bi.default",

src/core/wrapper/layout/adapt/adapt.table.js

@@ -35,7 +35,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var td;
-        var width = o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap + o.columnSize[i]);
+        var width = o.columnSize[i] === "" ? "" : (o.columnSize[i] < 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap + o.columnSize[i]);
         if (!this.hasWidget(this._getChildName(i))) {
             var w = BI._lazyCreateWidget(item);
             w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
@@ -53,7 +53,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
         // 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
         // 2、不能给多个td设置最大宽度，这样只会平分宽度
         // 3、多百分比宽度就算了
-        td.element.css({"max-width": BI.isNumber(o.columnSize[i]) ? (o.columnSize[i] <= 1 ? width : width / BI.pixRatio + BI.pixUnit) : width});
+        td.element.css({"max-width": BI.isNumber(o.columnSize[i]) ? (o.columnSize[i] < 1 ? width : width / BI.pixRatio + BI.pixUnit) : width});
         if (i === 0) {
             td.element.addClass("first-element");
         }

src/core/wrapper/layout/flex/flex.horizontal.js

@@ -37,11 +37,12 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
+        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
         w.element.css({
             position: "relative"
         });
-        if (o.columnSize[i] !== "auto") {
+        if (columnSize !== "auto") {
-            if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (columnSize === "fill" || columnSize === "") {
                 if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
                     if (o.scrollable === true || o.scrollx === true) {
                         w.element.addClass("f-s-n");
@@ -51,10 +52,10 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
                 w.element.addClass("f-s-n");
             }
         }
-        if (o.columnSize[i] > 0) {
+        if (columnSize > 0) {
-            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
+            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : (columnSize / BI.pixRatio + BI.pixUnit));
         }
-        if (o.columnSize[i] === "fill") {
+        if (columnSize === "fill") {
             w.element.addClass("f-f");
         }
         w.element.addClass("c-e");

src/core/wrapper/layout/flex/flex.vertical.js

@@ -34,13 +34,14 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
     },
 
     _addElement: function (i, item) {
-        var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
         var o = this.options;
+        var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
+        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height;
         w.element.css({
             position: "relative"
         });
-        if (o.rowSize[i] !== "auto") {
+        if (rowSize !== "auto") {
-            if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (rowSize === "fill" || rowSize === "") {
                 if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
                     if (o.scrollable === true || o.scrolly === true) {
                         w.element.addClass("f-s-n");
@@ -50,10 +51,10 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
                 w.element.addClass("f-s-n");
             }
         }
-        if (o.rowSize[i] > 0) {
+        if (rowSize > 0) {
-            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
+            w.element.height(rowSize < 1 ? ((rowSize * 100).toFixed(1) + "%") : (rowSize / BI.pixRatio + BI.pixUnit));
         }
-        if (o.rowSize[i] === "fill") {
+        if (rowSize === "fill") {
             w.element.addClass("f-f");
         }
         w.element.addClass("c-e");

src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js

@@ -33,11 +33,12 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
+        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
         w.element.css({
             position: "relative"
         });
-        if (o.columnSize[i] !== "auto") {
+        if (columnSize !== "auto") {
-            if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (columnSize === "fill" || columnSize === "") {
                 if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
                     if (o.scrollable === true || o.scrollx === true) {
                         w.element.addClass("f-s-n");
@@ -47,10 +48,10 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
                 w.element.addClass("f-s-n");
             }
         }
-        if (o.columnSize[i] > 0) {
+        if (columnSize > 0) {
-            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
+            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : (columnSize / BI.pixRatio + BI.pixUnit));
         }
-        if (o.columnSize[i] === "fill") {
+        if (columnSize === "fill") {
             w.element.addClass("f-f");
             this.element.addClass("f-f");
         }

src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

@@ -33,11 +33,12 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
+        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height;
         w.element.css({
             position: "relative"
         });
-        if (o.rowSize[i] !== "auto") {
+        if (rowSize !== "auto") {
-            if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (rowSize === "fill" || rowSize === "") {
                 if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
                     if (o.scrollable === true || o.scrolly === true) {
                         w.element.addClass("f-s-n");
@@ -47,10 +48,10 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
                 w.element.addClass("f-s-n");
             }
         }
-        if (o.rowSize[i] > 0) {
+        if (rowSize > 0) {
-            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
+            w.element.height(rowSize < 1 ? ((rowSize * 100).toFixed(1) + "%") : (rowSize / BI.pixRatio + BI.pixUnit));
         }
-        if (o.rowSize[i] === "fill") {
+        if (rowSize === "fill") {
             w.element.addClass("f-f");
             this.element.addClass("f-f");
         }

src/core/wrapper/layout/layout.inline.js

@@ -37,7 +37,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
         var o = this.options;
         var w = BI.InlineLayout.superclass._addElement.apply(this, arguments);
         w.element.css({
-            width: o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)),
+            width: o.columnSize[i] === "" ? "" : (o.columnSize[i] < 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)),
             position: "relative",
             "vertical-align": o.verticalAlign
         });

src/core/wrapper/layout/layout.table.js

@@ -69,8 +69,8 @@ BI.TableLayout = BI.inherit(BI.Layout, {
                 abs.push(BI.extend({
                     top: 0,
                     bottom: 0,
-                    left: o.columnSize[i] <= 1 ? (left * 100).toFixed(1) + "%" : left,
+                    left: o.columnSize[i] < 1 ? (left * 100).toFixed(1) + "%" : left,
-                    width: o.columnSize[i] <= 1 ? (o.columnSize[i] * 100).toFixed(1) + "%" : o.columnSize[i]
+                    width: o.columnSize[i] < 1 ? (o.columnSize[i] * 100).toFixed(1) + "%" : o.columnSize[i]
                 }, arr[i]));
                 left += o.columnSize[i] + (o.columnSize[i] < 1 ? 0 : o.hgap);
             } else {
@@ -83,8 +83,8 @@ BI.TableLayout = BI.inherit(BI.Layout, {
                 abs.push(BI.extend({
                     top: 0,
                     bottom: 0,
-                    right: o.columnSize[j] <= 1 ? (right * 100).toFixed(1) + "%" : right,
+                    right: o.columnSize[j] < 1 ? (right * 100).toFixed(1) + "%" : right,
-                    width: o.columnSize[j] <= 1 ? (o.columnSize[j] * 100).toFixed(1) + "%" : o.columnSize[j]
+                    width: o.columnSize[j] < 1 ? (o.columnSize[j] * 100).toFixed(1) + "%" : o.columnSize[j]
                 }, arr[j]));
                 right += o.columnSize[j] + (o.columnSize[j] < 1 ? 0 : o.hgap);
             } else {
@@ -96,8 +96,8 @@ BI.TableLayout = BI.inherit(BI.Layout, {
             abs.push(BI.extend({
                 top: 0,
                 bottom: 0,
-                left: left <= 1 ? (left * 100).toFixed(1) + "%" : left,
+                left: left < 1 ? (left * 100).toFixed(1) + "%" : left,
-                right: right <= 1 ? (right * 100).toFixed(1) + "%" : right
+                right: right < 1 ? (right * 100).toFixed(1) + "%" : right
             }, arr[i]));
         }
         var w = BI._lazyCreateWidget({

src/core/wrapper/layout/layout.tape.js

@@ -64,59 +64,45 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
 
         BI.any(items, function (i, item) {
             var w = self.getWidgetByName(self._getChildName(i));
+            var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
             if (BI.isNull(left[i])) {
-                left[i] = left[i - 1] + (o.columnSize[i - 1] || items[i - 1].width) + (items[i - 1].lgap || 0) + 2 * (items[i - 1].hgap || 0) + o.hgap + o.lgap + o.rgap;
+                var preColumnSize = o.columnSize.length > 0 ? o.columnSize[i - 1] : items[i - 1].width;
+                left[i] = left[i - 1] + preColumnSize + (items[i - 1].lgap || 0) + 2 * (items[i - 1].hgap || 0) + o.hgap + o.lgap + o.rgap;
             }
-            if (o.columnSize[i] < 1 && o.columnSize[i] > 0) {
+            if (columnSize < 1 && columnSize > 0) {
                 w.element.css({
                     left: (left[i] * 100).toFixed(1) + "%",
-                    width: (o.columnSize[i] * 100).toFixed(1) + "%"
+                    width: (columnSize * 100).toFixed(1) + "%"
-                });
-            } else if (item.width < 1 && item.width >= 0) {
-                w.element.css({
-                    left: (left[i] * 100).toFixed(1) + "%",
-                    width: (item.width * 100).toFixed(1) + "%"
                 });
             } else {
                 w.element.css({
                     left: (left[i] + (item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
-                    width: o.columnSize[i] > 0 ? o.columnSize[i] / BI.pixRatio + BI.pixUnit :
+                    width: BI.isNumber(columnSize) ? columnSize / BI.pixRatio + BI.pixUnit : ""
-                        BI.isNumber(item.width) ? item.width / BI.pixRatio + BI.pixUnit : ""
                 });
             }
-            if (o.columnSize[i] === "" || o.columnSize[i] === "fill") {
+            if (columnSize === "" || columnSize === "fill") {
-                return true;
-            }
-            if (o.columnSize.length <= 0 && !BI.isNumber(item.width)) {
                 return true;
             }
         });
         BI.backAny(items, function (i, item) {
             var w = self.getWidgetByName(self._getChildName(i));
+            var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
             if (BI.isNull(right[i])) {
-                right[i] = right[i + 1] + (o.columnSize[i + 1] || items[i + 1].width) + (items[i + 1].rgap || 0) + 2 * (items[i + 1].hgap || 0) + o.hgap + o.lgap + o.rgap;
+                var nextColumnSize = o.columnSize.length > 0 ? o.columnSize[i + 1] : items[i + 1].width;
+                right[i] = right[i + 1] + nextColumnSize + (items[i + 1].rgap || 0) + 2 * (items[i + 1].hgap || 0) + o.hgap + o.lgap + o.rgap;
             }
-            if (o.columnSize[i] < 1 && o.columnSize[i] > 0) {
+            if (columnSize < 1 && columnSize > 0) {
                 w.element.css({
                     right: (right[i] * 100).toFixed(1) + "%",
-                    width: (o.columnSize[i] * 100).toFixed(1) + "%"
+                    width: (columnSize * 100).toFixed(1) + "%"
-                });
-            } else if (item.width < 1 && item.width >= 0) {
-                w.element.css({
-                    right: (right[i] * 100).toFixed(1) + "%",
-                    width: (item.width * 100).toFixed(1) + "%"
                 });
             } else {
                 w.element.css({
                     right: (right[i] + (item.rgap || 0) + (item.hgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit,
-                    width: o.columnSize[i] > 0 ? o.columnSize[i] / BI.pixRatio + BI.pixUnit :
+                    width: BI.isNumber(columnSize) ? columnSize / BI.pixRatio + BI.pixUnit : ""
-                        BI.isNumber(item.width) ? item.width / BI.pixRatio + BI.pixUnit : ""
                 });
             }
-            if (o.columnSize[i] === "" || o.columnSize[i] === "fill") {
+            if (columnSize === "" || columnSize === "fill") {
-                return true;
-            }
-            if (o.columnSize.length <= 0 && !BI.isNumber(item.width)) {
                 return true;
             }
         });
@@ -204,59 +190,45 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
 
         BI.any(items, function (i, item) {
             var w = self.getWidgetByName(self._getChildName(i));
+            var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height;
             if (BI.isNull(top[i])) {
-                top[i] = top[i - 1] + (o.rowSize[i - 1] || items[i - 1].height) + (items[i - 1].tgap || 0) + 2 * (items[i - 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
+                var preRowSize = o.rowSize.length > 0 ? o.rowSize[i - 1] : items[i - 1].height;
+                top[i] = top[i - 1] + preRowSize + (items[i - 1].tgap || 0) + 2 * (items[i - 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
             }
-            if (o.rowSize[i] < 1 && o.rowSize[i] > 0) {
+            if (rowSize < 1 && rowSize > 0) {
                 w.element.css({
                     top: (top[i] * 100).toFixed(1) + "%",
-                    height: (o.rowSize[i] * 100).toFixed(1) + "%"
+                    height: (rowSize * 100).toFixed(1) + "%"
-                });
-            } else if (item.height < 1 && item.height >= 0) {
-                w.element.css({
-                    top: (top[i] * 100).toFixed(1) + "%",
-                    height: (item.height * 100).toFixed(1) + "%"
                 });
             } else {
                 w.element.css({
                     top: (top[i] + (item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
-                    height: o.rowSize[i] > 0 ? o.rowSize[i] / BI.pixRatio + BI.pixUnit :
+                    height: BI.isNumber(rowSize) ? rowSize / BI.pixRatio + BI.pixUnit : ""
-                        BI.isNumber(item.height) ? item.height / BI.pixRatio + BI.pixUnit : ""
                 });
             }
-            if (o.rowSize[i] === "" || o.rowSize[i] === "fill") {
+            if (rowSize === "" || rowSize === "fill") {
-                return true;
-            }
-            if (o.rowSize.length <= 0 && !BI.isNumber(item.height)) {
                 return true;
             }
         });
         BI.backAny(items, function (i, item) {
             var w = self.getWidgetByName(self._getChildName(i));
+            var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height;
             if (BI.isNull(bottom[i])) {
-                bottom[i] = bottom[i + 1] + (o.rowSize[i + 1] || items[i + 1].height) + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
+                var nextRowSize = o.rowSize.length > 0 ? o.rowSize[i + 1] : items[i + 1].height;
+                bottom[i] = bottom[i + 1] + nextRowSize + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
             }
-            if (o.rowSize[i] < 1 && o.rowSize[i] > 0) {
+            if (rowSize < 1 && rowSize > 0) {
                 w.element.css({
                     bottom: (bottom[i] * 100).toFixed(1) + "%",
-                    height: (o.rowSize[i] * 100).toFixed(1) + "%"
+                    height: (rowSize * 100).toFixed(1) + "%"
-                });
-            } else if (item.height < 1 && item.height >= 0) {
-                w.element.css({
-                    bottom: (bottom[i] * 100).toFixed(1) + "%",
-                    height: (item.height * 100).toFixed(1) + "%"
                 });
             } else {
                 w.element.css({
                     bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
-                    height: o.rowSize[i] > 0 ? o.rowSize[i] / BI.pixRatio + BI.pixUnit :
+                    height: BI.isNumber(rowSize) ? rowSize / BI.pixRatio + BI.pixUnit : ""
-                        BI.isNumber(item.height) ? item.height / BI.pixRatio + BI.pixUnit : ""
                 });
             }
-            if (o.rowSize[i] === "" || o.rowSize[i] === "fill") {
+            if (rowSize === "" || rowSize === "fill") {
-                return true;
-            }
-            if (o.rowSize.length <= 0 && !BI.isNumber(item.height)) {
                 return true;
             }
         });

src/core/wrapper/layout/layout.td.js

@@ -102,7 +102,7 @@ BI.TdLayout = BI.inherit(BI.Layout, {
                 });
             }
             first(w, this.rows++, i);
-            var width = o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap + o.columnSize[i]);
+            var width = o.columnSize[i] === "" ? "" : (o.columnSize[i] < 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap + o.columnSize[i]);
             var td = BI._lazyCreateWidget({
                 type: "bi.default",
                 width: width,