Browse Source

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

* commit 'f2c74b468a6fe3ecdf1f06af0970e4505448cd39':
  update
  无JIRA任务 searcher标红问题
es6
windy 6 years ago
parent
commit
d27ba42056
  1. 3
      dist/base.js
  2. 3
      dist/bundle.ie.js
  3. 4
      dist/bundle.ie.min.js
  4. 3
      dist/bundle.js
  5. 6
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 3
      dist/fineui.ie.js
  8. 4
      dist/fineui.ie.min.js
  9. 3
      dist/fineui.js
  10. 6
      dist/fineui.min.js
  11. 3
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 3
      src/base/single/text.js

3
dist/base.js vendored

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

3
dist/bundle.ie.js vendored

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

4
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/bundle.js vendored

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

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored

@ -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. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

3
dist/fineui.ie.js vendored

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

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/fineui.js vendored

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

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/fineui_without_jquery_polyfill.js vendored

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

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

3
src/base/single/text.js

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

Loading…
Cancel
Save