Merge pull request #767 in VISUAL/fineui from ~IMP/fineui_fui:master to master

* commit 'ba339f86f2e73ec01e37b9db5ef1d1ffeb18afbc':
  添加函数

dist/bundle.ie.js

@@ -19550,6 +19550,22 @@ BI.prepares.push(function () {
             return width;
         },
 
+        getTextSizeHeight: function (text, fontSize) {
+            var span = BI.Widget._renderEngine.createElement("<span></span>").addClass("text-width-span").appendTo("body");
+
+            if (fontSize == null) {
+                fontSize = 12;
+            }
+            fontSize = fontSize + "px";
+
+            span.css("font-size", fontSize).text(text);
+
+            var height = span.height();
+            span.remove();
+
+            return height;
+        },
+
         // 获取滚动条的宽度
         getScrollWidth: function () {
             if (this._scrollWidth == null) {

dist/bundle.js

@@ -19550,6 +19550,22 @@ BI.prepares.push(function () {
             return width;
         },
 
+        getTextSizeHeight: function (text, fontSize) {
+            var span = BI.Widget._renderEngine.createElement("<span></span>").addClass("text-width-span").appendTo("body");
+
+            if (fontSize == null) {
+                fontSize = 12;
+            }
+            fontSize = fontSize + "px";
+
+            span.css("font-size", fontSize).text(text);
+
+            var height = span.height();
+            span.remove();
+
+            return height;
+        },
+
         // 获取滚动条的宽度
         getScrollWidth: function () {
             if (this._scrollWidth == null) {

dist/core.js

@@ -19550,6 +19550,22 @@ BI.prepares.push(function () {
             return width;
         },
 
+        getTextSizeHeight: function (text, fontSize) {
+            var span = BI.Widget._renderEngine.createElement("<span></span>").addClass("text-width-span").appendTo("body");
+
+            if (fontSize == null) {
+                fontSize = 12;
+            }
+            fontSize = fontSize + "px";
+
+            span.css("font-size", fontSize).text(text);
+
+            var height = span.height();
+            span.remove();
+
+            return height;
+        },
+
         // 获取滚动条的宽度
         getScrollWidth: function () {
             if (this._scrollWidth == null) {

dist/demo.js

@@ -6126,30 +6126,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
         };
     }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-absolute"
-    },
-    render: function () {
-        return {
-            type: "bi.inline_vertical_adapt",
-            items: [{
-                type: "bi.label",
-                text: "绝对布局",
-                cls: "layout-bg1",
-                width: 300,
-                height: 200
-            }, {
-                type: "bi.label",
-                text: "绝对布局",
-                cls: "layout-bg1",
-                width: 300,
-                height: 100
-            }]
-        };
-    }
-});
-BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
+BI.shortcut("demo.htape", Demo.HtapeLayout);/**
  * Created by User on 2017/3/22.
  */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

dist/fineui.ie.js

@@ -19792,6 +19792,22 @@ BI.prepares.push(function () {
             return width;
         },
 
+        getTextSizeHeight: function (text, fontSize) {
+            var span = BI.Widget._renderEngine.createElement("<span></span>").addClass("text-width-span").appendTo("body");
+
+            if (fontSize == null) {
+                fontSize = 12;
+            }
+            fontSize = fontSize + "px";
+
+            span.css("font-size", fontSize).text(text);
+
+            var height = span.height();
+            span.remove();
+
+            return height;
+        },
+
         // 获取滚动条的宽度
         getScrollWidth: function () {
             if (this._scrollWidth == null) {

dist/fineui.js

@@ -19792,6 +19792,22 @@ BI.prepares.push(function () {
             return width;
         },
 
+        getTextSizeHeight: function (text, fontSize) {
+            var span = BI.Widget._renderEngine.createElement("<span></span>").addClass("text-width-span").appendTo("body");
+
+            if (fontSize == null) {
+                fontSize = 12;
+            }
+            fontSize = fontSize + "px";
+
+            span.css("font-size", fontSize).text(text);
+
+            var height = span.height();
+            span.remove();
+
+            return height;
+        },
+
         // 获取滚动条的宽度
         getScrollWidth: function () {
             if (this._scrollWidth == null) {

src/core/platform/web/dom.js

@@ -233,6 +233,22 @@
             return width;
         },
 
+        getTextSizeHeight: function (text, fontSize) {
+            var span = BI.Widget._renderEngine.createElement("<span></span>").addClass("text-width-span").appendTo("body");
+
+            if (fontSize == null) {
+                fontSize = 12;
+            }
+            fontSize = fontSize + "px";
+
+            span.css("font-size", fontSize).text(text);
+
+            var height = span.height();
+            span.remove();
+
+            return height;
+        },
+
         // 获取滚动条的宽度
         getScrollWidth: function () {
             if (this._scrollWidth == null) {