Merge pull request #822 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '6a8fd0f51e05e4364875e5b9d67ebea31d222bd0':
  无JIRA任务 warningTitle

dist/bundle.ie.js

@@ -29918,6 +29918,7 @@ $.extend($.Event.prototype, {
                 }
 
                 if (tidx >= 0) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@@ -29927,6 +29928,7 @@ $.extend($.Event.prototype, {
                         py = py.substr(tidx + keyword.length);
                     }
                 } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
@@ -29935,6 +29937,7 @@ $.extend($.Event.prototype, {
                     }
                     textLeft = textLeft.substr(pidx + keyword.length);
                 } else {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft));
                     break;
                 }
@@ -49502,6 +49505,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             keyword: o.keyword,
             value: o.value,
             title: o.title || o.text,
+            warningTitle: o.warningTitle,
             py: o.py
         });
     },

dist/bundle.js

@@ -29918,6 +29918,7 @@ $.extend($.Event.prototype, {
                 }
 
                 if (tidx >= 0) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@@ -29927,6 +29928,7 @@ $.extend($.Event.prototype, {
                         py = py.substr(tidx + keyword.length);
                     }
                 } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
@@ -29935,6 +29937,7 @@ $.extend($.Event.prototype, {
                     }
                     textLeft = textLeft.substr(pidx + keyword.length);
                 } else {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft));
                     break;
                 }
@@ -49906,6 +49909,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             keyword: o.keyword,
             value: o.value,
             title: o.title || o.text,
+            warningTitle: o.warningTitle,
             py: o.py
         });
     },

dist/case.js

@@ -302,6 +302,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             keyword: o.keyword,
             value: o.value,
             title: o.title || o.text,
+            warningTitle: o.warningTitle,
             py: o.py
         });
     },

dist/core.js

@@ -29918,6 +29918,7 @@ $.extend($.Event.prototype, {
                 }
 
                 if (tidx >= 0) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@@ -29927,6 +29928,7 @@ $.extend($.Event.prototype, {
                         py = py.substr(tidx + keyword.length);
                     }
                 } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
@@ -29935,6 +29937,7 @@ $.extend($.Event.prototype, {
                     }
                     textLeft = textLeft.substr(pidx + keyword.length);
                 } else {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft));
                     break;
                 }

dist/demo.js

@@ -6158,7 +6158,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
         };
     }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);/**
+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);/**
  * Created by User on 2017/3/22.
  */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

dist/fineui.ie.js

@@ -30163,6 +30163,7 @@ $.extend($.Event.prototype, {
                 }
 
                 if (tidx >= 0) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@@ -30172,6 +30173,7 @@ $.extend($.Event.prototype, {
                         py = py.substr(tidx + keyword.length);
                     }
                 } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
@@ -30180,6 +30182,7 @@ $.extend($.Event.prototype, {
                     }
                     textLeft = textLeft.substr(pidx + keyword.length);
                 } else {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft));
                     break;
                 }
@@ -49747,6 +49750,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             keyword: o.keyword,
             value: o.value,
             title: o.title || o.text,
+            warningTitle: o.warningTitle,
             py: o.py
         });
     },

dist/fineui.js

@@ -30163,6 +30163,7 @@ $.extend($.Event.prototype, {
                 }
 
                 if (tidx >= 0) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@@ -30172,6 +30173,7 @@ $.extend($.Event.prototype, {
                         py = py.substr(tidx + keyword.length);
                     }
                 } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
                     this.append($("<span>").addClass("bi-keyword-red-mark")
                         .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
@@ -30180,6 +30182,7 @@ $.extend($.Event.prototype, {
                     }
                     textLeft = textLeft.substr(pidx + keyword.length);
                 } else {
+                    // 标红的text未encode
                     this.append(BI.htmlEncode(textLeft));
                     break;
                 }
@@ -50151,6 +50154,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             keyword: o.keyword,
             value: o.value,
             title: o.title || o.text,
+            warningTitle: o.warningTitle,
             py: o.py
         });
     },

dist/fineui_without_jquery_polyfill.js

@@ -34795,6 +34795,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             keyword: o.keyword,
             value: o.value,
             title: o.title || o.text,
+            warningTitle: o.warningTitle,
             py: o.py
         });
     },

src/case/button/item.singleselect.js

@@ -27,6 +27,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             keyword: o.keyword,
             value: o.value,
             title: o.title || o.text,
+            warningTitle: o.warningTitle,
             py: o.py
         });
     },