Browse Source

Pull request #2199: BI-94444 & BI-93998

Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master

* commit 'dc2c0abb862448dec6766c5dbcd05c9b8c734fe7':
  BI-93998 fix:文本下拉和文本列表绑定字段值有空时,单选模式下,不能选中空值
  BI-94444 fix:IE9下页码位置显示不正确
es6
Claire.Tang 3 years ago
parent
commit
5c93c8b4f6
  1. 1
      src/case/pager/pager.all.count.js
  2. 2
      src/widget/singleselect/search/singleselect.search.loader.js
  3. 4
      src/widget/singleselect/singleselect.loader.js

1
src/case/pager/pager.all.count.js

@ -90,6 +90,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
title: o.pages,
height: o.height,
text: "/" + o.pages,
lgap: 5,
invisible: o.pages <= 1

2
src/widget/singleselect/search/singleselect.search.loader.js

@ -60,7 +60,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
var keyword = ob.keyword = opts.keywordGetter();
hasNext = ob.hasNext;
var firstItems = [];
if (op.times === 1 && BI.isNotNull(self.storeValue)) {
if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
var json = self._filterValues(self.storeValue);
firstItems = self._createItems(json);
}

4
src/widget/singleselect/singleselect.loader.js

@ -60,13 +60,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
}, opts.el),
itemsCreator: function (op, callback) {
var startValue = self._startValue;
BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
!BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
selectedValues: [self.storeValue]
}));
opts.itemsCreator(op, function (ob) {
hasNext = ob.hasNext;
var firstItems = [];
if (op.times === 1 && BI.isNotNull(self.storeValue)) {
if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
var json = BI.map([self.storeValue], function (i, v) {
var txt = opts.valueFormatter(v) || v;
return {

Loading…
Cancel
Save