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

* commit 'f2c74b468a6fe3ecdf1f06af0970e4505448cd39':
  update
  无JIRA任务 searcher标红问题

dist/base.js

@@ -620,11 +620,14 @@ BI.Text = BI.inherit(BI.Single, {
 
     doRedMark: function (keyword) {
         var o = this.options;
+        // render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
+        o.keyword = keyword;
         this.text.element.__textKeywordMarked__(o.text || o.value, keyword, o.py);
     },
 
     unRedMark: function () {
         var o = this.options;
+        o.keyword = "";
         this.text.element.__textKeywordMarked__(o.text || o.value, "", o.py);
     },
 

dist/bundle.ie.js

@@ -35703,11 +35703,14 @@ BI.Text = BI.inherit(BI.Single, {
 
     doRedMark: function (keyword) {
         var o = this.options;
+        // render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
+        o.keyword = keyword;
         this.text.element.__textKeywordMarked__(o.text || o.value, keyword, o.py);
     },
 
     unRedMark: function () {
         var o = this.options;
+        o.keyword = "";
         this.text.element.__textKeywordMarked__(o.text || o.value, "", o.py);
     },
 

dist/bundle.js

@@ -36107,11 +36107,14 @@ BI.Text = BI.inherit(BI.Single, {
 
     doRedMark: function (keyword) {
         var o = this.options;
+        // render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
+        o.keyword = keyword;
         this.text.element.__textKeywordMarked__(o.text || o.value, keyword, o.py);
     },
 
     unRedMark: function () {
         var o = this.options;
+        o.keyword = "";
         this.text.element.__textKeywordMarked__(o.text || o.value, "", o.py);
     },
 

dist/demo.js

@@ -6126,7 +6126,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

@@ -35945,11 +35945,14 @@ BI.Text = BI.inherit(BI.Single, {
 
     doRedMark: function (keyword) {
         var o = this.options;
+        // render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
+        o.keyword = keyword;
         this.text.element.__textKeywordMarked__(o.text || o.value, keyword, o.py);
     },
 
     unRedMark: function () {
         var o = this.options;
+        o.keyword = "";
         this.text.element.__textKeywordMarked__(o.text || o.value, "", o.py);
     },
 

dist/fineui.js

@@ -36349,11 +36349,14 @@ BI.Text = BI.inherit(BI.Single, {
 
     doRedMark: function (keyword) {
         var o = this.options;
+        // render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
+        o.keyword = keyword;
         this.text.element.__textKeywordMarked__(o.text || o.value, keyword, o.py);
     },
 
     unRedMark: function () {
         var o = this.options;
+        o.keyword = "";
         this.text.element.__textKeywordMarked__(o.text || o.value, "", o.py);
     },
 

dist/fineui_without_jquery_polyfill.js

@@ -24859,11 +24859,14 @@ BI.Text = BI.inherit(BI.Single, {
 
     doRedMark: function (keyword) {
         var o = this.options;
+        // render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
+        o.keyword = keyword;
         this.text.element.__textKeywordMarked__(o.text || o.value, keyword, o.py);
     },
 
     unRedMark: function () {
         var o = this.options;
+        o.keyword = "";
         this.text.element.__textKeywordMarked__(o.text || o.value, "", o.py);
     },
 

src/base/single/text.js

@@ -88,11 +88,14 @@ BI.Text = BI.inherit(BI.Single, {
 
     doRedMark: function (keyword) {
         var o = this.options;
+        // render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
+        o.keyword = keyword;
         this.text.element.__textKeywordMarked__(o.text || o.value, keyword, o.py);
     },
 
     unRedMark: function () {
         var o = this.options;
+        o.keyword = "";
         this.text.element.__textKeywordMarked__(o.text || o.value, "", o.py);
     },