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

Pull request #2228: JSY-10501 fix: 高度适配 

Merge in VISUAL/fineui from ~KIRA/fineui:master to master

* commit '0ca6ed032c64e9ed66b8258e863113f466e85714':
  JSY-10501 fix: 高度适配
  JSY-10501 fix: 高度适配
es6
Kira 3 years ago
parent
224e6279f0 0ca6ed032c
commit
b89159bce3
8 changed files with 44 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/widget/multiselect/multiselect.combo.js
  2. 8
      src/widget/multiselect/multiselect.combo.nobar.js
  3. 4
      src/widget/multiselect/multiselect.insert.combo.js
  4. 4
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  5. 24
      src/widget/multitree/multi.tree.combo.js
  6. 23
      src/widget/multitree/multi.tree.insert.combo.js
  7. 21
      src/widget/multitree/multi.tree.list.combo.js
  8. 4
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

4
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -52,7 +52,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25, bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
}, },
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -219,7 +219,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25, bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
}, },
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,

8
src/widget/multiselect/multiselect.combo.nobar.js
Unescape View File

@ -49,8 +49,8 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
} },
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
itemsCreator: BI.bind(this._itemsCreator4Trigger, this), itemsCreator: BI.bind(this._itemsCreator4Trigger, this),
@ -222,8 +222,8 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
} },
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
itemsCreator: BI.bind(this._itemsCreator4Trigger, this), itemsCreator: BI.bind(this._itemsCreator4Trigger, this),

4
src/widget/multiselect/multiselect.insert.combo.js
Unescape View File

@ -49,7 +49,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -221,7 +221,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,

4
src/widget/multiselect/multiselect.insert.combo.nobar.js
Unescape View File

@ -49,7 +49,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -215,7 +215,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,

24
src/widget/multitree/multi.tree.combo.js
Unescape View File

@ -5,16 +5,6 @@
*/ */
BI.MultiTreeCombo = BI.inherit(BI.Single, { BI.MultiTreeCombo = BI.inherit(BI.Single, {
constants: {
offset: {
top: 0,
left: 0,
right: 0,
bottom: 25
}
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-combo", baseCls: "bi-multi-tree-combo",
@ -43,7 +33,12 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
watermark: o.watermark, watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: {
left: 0,
top: 0,
right: 0,
bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
},
}, },
searcher: { searcher: {
type: "bi.multi_tree_searcher", type: "bi.multi_tree_searcher",
@ -241,7 +236,12 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_tree_check_pane" type: "bi.multi_tree_check_pane"
}, },
masker: { masker: {
offset: this.constants.offset offset: {
left: 0,
top: 0,
right: 0,
bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
},
}, },
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,

23
src/widget/multitree/multi.tree.insert.combo.js
Unescape View File

@ -6,15 +6,6 @@
BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
constants: {
offset: {
top: 0,
left: 0,
right: 0,
bottom: 25
}
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiTreeInsertCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiTreeInsertCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-insert-combo", baseCls: "bi-multi-tree-insert-combo",
@ -41,7 +32,12 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: {
left: 0,
top: 0,
right: 0,
bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
},
}, },
searcher: { searcher: {
type: "bi.multi_tree_searcher", type: "bi.multi_tree_searcher",
@ -252,7 +248,12 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
}, },
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
masker: { masker: {
offset: this.constants.offset offset: {
left: 0,
top: 0,
right: 0,
bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
},
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
value: o.value value: o.value

21
src/widget/multitree/multi.tree.list.combo.js
Unescape View File

@ -5,16 +5,6 @@
*/ */
BI.MultiTreeListCombo = BI.inherit(BI.Single, { BI.MultiTreeListCombo = BI.inherit(BI.Single, {
constants: {
offset: {
top: 0,
left: 0,
right: 0,
bottom: 25
}
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiTreeListCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiTreeListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-list-combo", baseCls: "bi-multi-tree-list-combo",
@ -44,7 +34,12 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: this.constants.offset offset: {
left: 0,
top: 0,
right: 0,
bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
},
}, },
searcher: { searcher: {
type: "bi.multi_list_tree_searcher", type: "bi.multi_list_tree_searcher",
@ -275,8 +270,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
} },
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
value: o.value value: o.value

4
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
Unescape View File

@ -42,8 +42,8 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
left: 0, left: 0,
top: 0, top: 0,
right: 0, right: 0,
bottom: 25 bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
} },
}, },
allValueGetter: function () { allValueGetter: function () {
return self.allValue; return self.allValue;

Write Preview
Loading…
Cancel
Save