fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #940 in VISUAL/fineui from ~LEI.WANG/fineui:master to master 

* commit '98767eb94812bf2a53019de492f7b9d4a4f73156':
  BI-45749 fix: 如果在仅传入value情况下标红会导致显示异常
es6
lei.wang 6 years ago
parent
0179e08c58 98767eb948
commit
fd43229be9
9 changed files with 39 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      dist/2.0/fineui.ie.js
  2. 8
      dist/2.0/fineui.js
  3. 8
      dist/bundle.ie.js
  4. 8
      dist/bundle.js
  5. 8
      dist/fineui.ie.js
  6. 8
      dist/fineui.js
  7. 8
      dist/fineui_without_jquery_polyfill.js
  8. 3
      dist/widget.js
  9. 4
      src/base/single/text.js

8
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -36084,7 +36084,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -36146,7 +36146,8 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);/**
BI.shortcut("bi.text", BI.Text);
/**
* guy
* @class BI.BasicButton
* @extends BI.Single
@ -60260,7 +60261,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

8
dist/2.0/fineui.js vendored
Unescape View File

@ -36488,7 +36488,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -36550,7 +36550,8 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);/**
BI.shortcut("bi.text", BI.Text);
/**
* guy
* @class BI.BasicButton
* @extends BI.Single
@ -60664,7 +60665,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

8
dist/bundle.ie.js vendored
Unescape View File

@ -36084,7 +36084,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -36146,7 +36146,8 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);/**
BI.shortcut("bi.text", BI.Text);
/**
* guy
* @class BI.BasicButton
* @extends BI.Single
@ -60260,7 +60261,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

8
dist/bundle.js vendored
Unescape View File

@ -36488,7 +36488,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -36550,7 +36550,8 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);/**
BI.shortcut("bi.text", BI.Text);
/**
* guy
* @class BI.BasicButton
* @extends BI.Single
@ -60664,7 +60665,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

8
dist/fineui.ie.js vendored
Unescape View File

@ -36329,7 +36329,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -36391,7 +36391,8 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);/**
BI.shortcut("bi.text", BI.Text);
/**
* guy
* @class BI.BasicButton
* @extends BI.Single
@ -60505,7 +60506,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

8
dist/fineui.js vendored
Unescape View File

@ -36733,7 +36733,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -36795,7 +36795,8 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);/**
BI.shortcut("bi.text", BI.Text);
/**
* guy
* @class BI.BasicButton
* @extends BI.Single
@ -60909,7 +60910,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

8
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -25181,7 +25181,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -25243,7 +25243,8 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);/**
BI.shortcut("bi.text", BI.Text);
/**
* guy
* @class BI.BasicButton
* @extends BI.Single
@ -43318,7 +43319,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

3
dist/widget.js vendored
Unescape View File

@ -449,7 +449,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
max: this.options.max,
year: date.year,
month: date.month,
day: this.selectedTime.day
// BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可
day: 1
});
return calendar;
},

4
src/base/single/text.js
Unescape View File

@ -85,7 +85,7 @@ BI.Text = BI.inherit(BI.Single, {
this.setText(o.value);
}
if (BI.isKey(o.keyword)) {
this.text.element.__textKeywordMarked__(text, o.keyword, o.py);
this.doRedMark(o.keyword);
}
if (o.highLight) {
this.doHighLight();
@ -147,4 +147,4 @@ BI.Text = BI.inherit(BI.Single, {
}
});
BI.shortcut("bi.text", BI.Text);
BI.shortcut("bi.text", BI.Text);

Write Preview
Loading…
Cancel
Save