Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

es6
zsmj 2 years ago
parent
commit
cb3e8f6408
  1. 2
      package.json
  2. 3
      src/base/list/listview.js
  3. 4
      src/base/list/virtualgrouplist.js
  4. 4
      src/base/list/virtuallist.js
  5. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  6. 6
      src/component/treevaluechooser/combo.treevaluechooser.js
  7. 4
      src/widget/multitree/multi.tree.combo.js

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20221031101438",
"version": "2.0.20221101100519",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",

3
src/base/list/listview.js

@ -55,6 +55,9 @@ BI.ListView = BI.inherit(BI.Widget, {
var lastWidth = this.element.width(),
lastHeight = this.element.height();
BI.ResizeDetector.addResizeListener(this, function () {
if (!self.element.is(":visible")) {
return;
}
var width = self.element.width(),
height = self.element.height();
if (width !== lastWidth || height !== lastHeight) {

4
src/base/list/virtualgrouplist.js

@ -74,7 +74,9 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
}
});
BI.ResizeDetector.addResizeListener(this, function () {
self._calculateBlocksToRender();
if (self.element.is(":visible")) {
self._calculateBlocksToRender();
}
});
},

4
src/base/list/virtuallist.js

@ -61,7 +61,9 @@ BI.VirtualList = BI.inherit(BI.Widget, {
self._calculateBlocksToRender();
});
BI.ResizeDetector.addResizeListener(this, function () {
self._calculateBlocksToRender();
if (self.element.is(":visible")) {
self._calculateBlocksToRender();
}
});
},

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -91,6 +91,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
self.fireEvent(BI.SearchTextValueCombo.EVENT_AFTER_HIDEVIEW);
}
}, {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
@ -148,4 +149,5 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.SearchTextValueCombo.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"
BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);

6
src/component/treevaluechooser/combo.treevaluechooser.js

@ -73,6 +73,11 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
action: function () {
self.fireEvent(BI.TreeValueChooserCombo.EVENT_BEFORE_POPUPVIEW);
}
}, {
eventName: BI.MultiTreeCombo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.fireEvent(BI.TreeValueChooserCombo.EVENT_AFTER_HIDEVIEW);
}
}]
});
},
@ -128,4 +133,5 @@ BI.TreeValueChooserCombo.EVENT_BLUR = "EVENT_BLUR";
BI.TreeValueChooserCombo.EVENT_STOP = "EVENT_STOP";
BI.TreeValueChooserCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
BI.TreeValueChooserCombo.EVENT_SEARCHING = "EVENT_SEARCHING";
BI.TreeValueChooserCombo.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
BI.shortcut("bi.tree_value_chooser_combo", BI.TreeValueChooserCombo);

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

@ -218,6 +218,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
clear = false;
change = false;
});
this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
self.fireEvent(BI.MultiTreeCombo.EVENT_AFTER_HIDEVIEW);
});
var triggerBtn = BI.createWidget({
type: "bi.trigger_icon_button",
@ -373,5 +376,6 @@ BI.MultiTreeCombo.EVENT_SEARCHING = "EVENT_SEARCHING";
BI.MultiTreeCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
BI.MultiTreeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.MultiTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.MultiTreeCombo.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
BI.shortcut("bi.multi_tree_combo", BI.MultiTreeCombo);

Loading…
Cancel
Save