caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #830 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master 

* commit 'b810bfc67bf61b631e230d7fa71de64246fc6feb':
  使用常量
  搜索框高度是不可配的
  文本列表存在相同问题；不限死editor的高度
  树面板弹窗距搜索栏多了6px，会导致面板有段小空白
es6
windy 6 years ago
parent
4119e8f596 b810bfc67b
commit
e31beacb7d
14 changed files with 107 additions and 81 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. 15
      dist/bundle.ie.js
  2. 10
      dist/bundle.ie.min.js
  3. 15
      dist/bundle.js
  4. 18
      dist/bundle.min.js
  5. 25
      dist/demo.js
  6. 15
      dist/fineui.ie.js
  7. 10
      dist/fineui.ie.min.js
  8. 15
      dist/fineui.js
  9. 18
      dist/fineui.min.js
  10. 15
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 15
      dist/widget.js
  13. 7
      src/widget/multiselectlist/multiselectlist.js
  14. 8
      src/widget/multiselecttree/multiselecttree.js

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

@ -71242,6 +71242,9 @@ BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList)
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectList = BI.inherit(BI.Widget, { BI.MultiSelectList = BI.inherit(BI.Widget, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-list", baseCls: "bi-multi-select-list",
@ -71383,7 +71386,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -71394,7 +71397,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0
@ -71586,6 +71589,10 @@ BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Single, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -71679,7 +71686,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcher, el: this.searcher,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -71690,7 +71697,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

10
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
dist/bundle.js vendored
Unescape View File

@ -71646,6 +71646,9 @@ BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList)
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectList = BI.inherit(BI.Widget, { BI.MultiSelectList = BI.inherit(BI.Widget, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-list", baseCls: "bi-multi-select-list",
@ -71787,7 +71790,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -71798,7 +71801,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0
@ -71990,6 +71993,10 @@ BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Single, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -72083,7 +72090,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcher, el: this.searcher,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -72094,7 +72101,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

18
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored
Unescape View File

@ -6158,30 +6158,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, { BI.shortcut("demo.htape", Demo.HtapeLayout);/**
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

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

@ -71487,6 +71487,9 @@ BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList)
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectList = BI.inherit(BI.Widget, { BI.MultiSelectList = BI.inherit(BI.Widget, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-list", baseCls: "bi-multi-select-list",
@ -71628,7 +71631,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -71639,7 +71642,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0
@ -71831,6 +71834,10 @@ BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Single, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -71924,7 +71931,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcher, el: this.searcher,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -71935,7 +71942,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

10
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
dist/fineui.js vendored
Unescape View File

@ -71891,6 +71891,9 @@ BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList)
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectList = BI.inherit(BI.Widget, { BI.MultiSelectList = BI.inherit(BI.Widget, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-list", baseCls: "bi-multi-select-list",
@ -72032,7 +72035,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -72043,7 +72046,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0
@ -72235,6 +72238,10 @@ BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Single, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -72328,7 +72335,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcher, el: this.searcher,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -72339,7 +72346,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

18
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -54702,6 +54702,9 @@ BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList)
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectList = BI.inherit(BI.Widget, { BI.MultiSelectList = BI.inherit(BI.Widget, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-list", baseCls: "bi-multi-select-list",
@ -54843,7 +54846,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -54854,7 +54857,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0
@ -55046,6 +55049,10 @@ BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Single, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -55139,7 +55146,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcher, el: this.searcher,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -55150,7 +55157,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
dist/widget.js vendored
Unescape View File

@ -12183,6 +12183,9 @@ BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList)
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectList = BI.inherit(BI.Widget, { BI.MultiSelectList = BI.inherit(BI.Widget, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-list", baseCls: "bi-multi-select-list",
@ -12324,7 +12327,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -12335,7 +12338,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0
@ -12527,6 +12530,10 @@ BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Single, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -12620,7 +12627,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcher, el: this.searcher,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -12631,7 +12638,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

7
src/widget/multiselectlist/multiselectlist.js
Unescape View File

@ -2,6 +2,9 @@
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectList = BI.inherit(BI.Widget, { BI.MultiSelectList = BI.inherit(BI.Widget, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-list", baseCls: "bi-multi-select-list",
@ -143,7 +146,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -154,7 +157,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

8
src/widget/multiselecttree/multiselecttree.js
Unescape View File

@ -2,6 +2,10 @@
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Single, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_constant: {
EDITOR_HEIGHT: 24
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -95,7 +99,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcher, el: this.searcher,
height: 24 height: this._constant.EDITOR_HEIGHT
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill" height: "fill"
@ -106,7 +110,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.searcherPane, el: this.searcherPane,
top: 30, top: this._constant.EDITOR_HEIGHT,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0 right: 0

Write Preview
Loading…
Cancel
Save