Browse Source

Merge pull request #226 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit 'c1d5d4ac28662ac443f8dc0ec2153b1efa9f7d51':
  update
  editor高度改成24之后部分地方不适配
es6
windy 7 years ago
parent
commit
701be9b4c7
  1. 4
      bi/widget.js
  2. 2
      demo/js/core/layout/demo.htape.js
  3. 4
      dist/bundle.js
  4. 4
      dist/bundle.min.js
  5. 2
      dist/demo.js
  6. 4
      dist/widget.js
  7. 2
      src/widget/multiselectlist/multiselectlist.insert.js
  8. 2
      src/widget/multiselectlist/multiselectlist.js

4
bi/widget.js

@ -11659,7 +11659,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"
@ -11973,7 +11973,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"

2
demo/js/core/layout/demo.htape.js

@ -19,7 +19,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}, {
width: 200,
el : {
type : 'bi.label',
type : 'bi.multi_select_insert_list',
text : '2',
cls: "layout-bg2"
}

4
dist/bundle.js vendored

@ -86705,7 +86705,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"
@ -87019,7 +87019,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js vendored

@ -7734,7 +7734,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}, {
width: 200,
el : {
type : 'bi.label',
type : 'bi.multi_select_insert_list',
text : '2',
cls: "layout-bg2"
}

4
dist/widget.js vendored

@ -11659,7 +11659,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"
@ -11973,7 +11973,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"

2
src/widget/multiselectlist/multiselectlist.insert.js

@ -154,7 +154,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"

2
src/widget/multiselectlist/multiselectlist.js

@ -143,7 +143,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.trigger,
height: 30
height: 24
}, {
el: this.adapter,
height: "fill"

Loading…
Cancel
Save