Browse Source

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

* commit '44cca97c3c264430f5e79c0da5df90327f010f12':
  update
  无JIRA任务 确定取消调整高度后,masker偏移要调一下
master
Young 6 years ago
parent
commit
72431551e0
  1. 16
      dist/bundle.ie.js
  2. 10
      dist/bundle.ie.min.js
  3. 16
      dist/bundle.js
  4. 10
      dist/bundle.min.js
  5. 16
      dist/fineui.ie.js
  6. 10
      dist/fineui.ie.min.js
  7. 16
      dist/fineui.js
  8. 10
      dist/fineui.min.js
  9. 16
      dist/fineui_without_jquery_polyfill.js
  10. 2
      dist/utils.min.js
  11. 16
      dist/widget.js
  12. 6
      src/widget/multiselect/multiselect.combo.js
  13. 2
      src/widget/multiselect/multiselect.insert.combo.js
  14. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  15. 4
      src/widget/multitree/multi.tree.combo.js
  16. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

16
dist/bundle.ie.js vendored

@ -66721,9 +66721,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getCounter().setButtonChecked(self.storeValue);
};
this.storeValue = o.value || {};
this._assertValue(this.storeValue);
// 标记正在请求数据
this.requesting = false;
@ -66737,7 +66737,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -67125,7 +67125,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -67508,7 +67508,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -71076,7 +71076,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
top: 0,
left: 0,
right: 0,
bottom: 31
bottom: 25
}
},
@ -71182,7 +71182,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return triggerBtn.element.find(e.target).length === 0;
}
});
var change = false;
var clear = false; // 标识当前是否点击了清空
@ -72723,7 +72723,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
allValueGetter: function () {

10
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/bundle.js vendored

@ -67125,9 +67125,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getCounter().setButtonChecked(self.storeValue);
};
this.storeValue = o.value || {};
this._assertValue(this.storeValue);
// 标记正在请求数据
this.requesting = false;
@ -67141,7 +67141,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -67529,7 +67529,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -67912,7 +67912,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -71480,7 +71480,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
top: 0,
left: 0,
right: 0,
bottom: 31
bottom: 25
}
},
@ -71586,7 +71586,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return triggerBtn.element.find(e.target).length === 0;
}
});
var change = false;
var clear = false; // 标识当前是否点击了清空
@ -73127,7 +73127,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
allValueGetter: function () {

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/fineui.ie.js vendored

@ -66963,9 +66963,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getCounter().setButtonChecked(self.storeValue);
};
this.storeValue = o.value || {};
this._assertValue(this.storeValue);
// 标记正在请求数据
this.requesting = false;
@ -66979,7 +66979,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -67367,7 +67367,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -67750,7 +67750,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -71318,7 +71318,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
top: 0,
left: 0,
right: 0,
bottom: 31
bottom: 25
}
},
@ -71424,7 +71424,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return triggerBtn.element.find(e.target).length === 0;
}
});
var change = false;
var clear = false; // 标识当前是否点击了清空
@ -72965,7 +72965,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
allValueGetter: function () {

10
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/fineui.js vendored

@ -67367,9 +67367,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getCounter().setButtonChecked(self.storeValue);
};
this.storeValue = o.value || {};
this._assertValue(this.storeValue);
// 标记正在请求数据
this.requesting = false;
@ -67383,7 +67383,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -67771,7 +67771,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -68154,7 +68154,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -71722,7 +71722,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
top: 0,
left: 0,
right: 0,
bottom: 31
bottom: 25
}
},
@ -71828,7 +71828,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return triggerBtn.element.find(e.target).length === 0;
}
});
var change = false;
var clear = false; // 标识当前是否点击了清空
@ -73369,7 +73369,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
allValueGetter: function () {

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/fineui_without_jquery_polyfill.js vendored

@ -50204,9 +50204,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getCounter().setButtonChecked(self.storeValue);
};
this.storeValue = o.value || {};
this._assertValue(this.storeValue);
// 标记正在请求数据
this.requesting = false;
@ -50220,7 +50220,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -50608,7 +50608,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -50991,7 +50991,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -54559,7 +54559,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
top: 0,
left: 0,
right: 0,
bottom: 31
bottom: 25
}
},
@ -54665,7 +54665,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return triggerBtn.element.find(e.target).length === 0;
}
});
var change = false;
var clear = false; // 标识当前是否点击了清空
@ -56206,7 +56206,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
allValueGetter: function () {

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/widget.js vendored

@ -8476,9 +8476,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getCounter().setButtonChecked(self.storeValue);
};
this.storeValue = o.value || {};
this._assertValue(this.storeValue);
// 标记正在请求数据
this.requesting = false;
@ -8492,7 +8492,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -8880,7 +8880,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -9263,7 +9263,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,
@ -12831,7 +12831,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
top: 0,
left: 0,
right: 0,
bottom: 31
bottom: 25
}
},
@ -12937,7 +12937,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return triggerBtn.element.find(e.target).length === 0;
}
});
var change = false;
var clear = false; // 标识当前是否点击了清空
@ -14478,7 +14478,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
allValueGetter: function () {

6
src/widget/multiselect/multiselect.combo.js

@ -27,9 +27,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getCounter().setButtonChecked(self.storeValue);
};
this.storeValue = o.value || {};
this._assertValue(this.storeValue);
// 标记正在请求数据
this.requesting = false;
@ -43,7 +43,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,

2
src/widget/multiselect/multiselect.insert.combo.js

@ -40,7 +40,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -43,7 +43,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
valueFormatter: o.valueFormatter,

4
src/widget/multitree/multi.tree.combo.js

@ -11,7 +11,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
top: 0,
left: 0,
right: 0,
bottom: 31
bottom: 25
}
},
@ -117,7 +117,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return triggerBtn.element.find(e.target).length === 0;
}
});
var change = false;
var clear = false; // 标识当前是否点击了清空

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -42,7 +42,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0,
top: 0,
right: 0,
bottom: 26
bottom: 25
}
},
allValueGetter: function () {

Loading…
Cancel
Save