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

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

* commit '816d02b9d3d0906089534520ecb7e206eb612e9c':
  BI-37480 分页的视觉优化
es6
Zhenfei.Li 6 years ago
parent
7541245fec 816d02b9d3
commit
15d3ec79b1
20 changed files with 125 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      dist/base.css
  2. 3
      dist/bundle.css
  3. 26
      dist/bundle.ie.js
  4. 4
      dist/bundle.ie.min.js
  5. 26
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 4
      dist/bundle.min.js
  8. 26
      dist/case.js
  9. 25
      dist/demo.js
  10. 3
      dist/fineui.css
  11. 26
      dist/fineui.ie.js
  12. 4
      dist/fineui.ie.min.js
  13. 26
      dist/fineui.js
  14. 2
      dist/fineui.min.css
  15. 4
      dist/fineui.min.js
  16. 26
      dist/fineui_without_jquery_polyfill.js
  17. 2
      dist/utils.min.js
  18. 26
      src/case/pager/pager.all.count.js
  19. 3
      src/css/base/pager/pager.css
  20. 3
      src/less/base/pager/pager.all.count.less

3
dist/base.css vendored
Unescape View File

@ -649,6 +649,9 @@
.bi-all-count-pager .all-pager-next {
font-size: 16px;
}
.bi-all-count-pager .row-count {
color: #3685f2;
}
.bi-direction-pager .direction-pager-prev {
font-size: 16px;

3
dist/bundle.css vendored
Unescape View File

@ -2621,6 +2621,9 @@ textarea {
.bi-all-count-pager .all-pager-next {
font-size: 16px;
}
.bi-all-count-pager .row-count {
color: #3685f2;
}
.bi-direction-pager .direction-pager-prev {
font-size: 16px;

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

@ -57234,17 +57234,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
vgap: 0,
value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35,
height: 16
width: 40,
height: 24
});
this.pager = BI.createWidget({
type: "bi.pager",
width: 36,
width: 58,
layouts: [{
type: "bi.horizontal",
hgap: 1,
vgap: 1
lgap: 5
}],
dynamicShow: false,
@ -57259,16 +57258,18 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: "prev",
title: BI.i18nText("BI-Previous_Page"),
warningTitle: BI.i18nText("BI-Current_Is_First_Page"),
height: 20,
cls: "all-pager-prev column-pre-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-prev pull-up-font"
},
next: {
type: "bi.icon_button",
value: "next",
title: BI.i18nText("BI-Next_Page"),
warningTitle: BI.i18nText("BI-Current_Is_Last_Page"),
height: 20,
cls: "all-pager-next column-next-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-next pull-down-font"
},
hasPrev: o.hasPrev,
@ -57290,13 +57291,14 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
width: 30,
title: o.pages,
text: "/" + o.pages
text: "/" + o.pages,
lgap: 5
});
this.rowCount = BI.createWidget({
type: "bi.label",
cls: "row-count",
height: o.height,
hgap: 5,
text: o.count,
@ -57323,7 +57325,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.center_adapt",
element: this,
columnSize: ["", 35, 40, 36],
columnSize: ["", 40, 20, 58],
items: [count, this.editor, this.allPages, this.pager]
});
},

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

File diff suppressed because one or more lines are too long

26
dist/bundle.js vendored
Unescape View File

@ -57638,17 +57638,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
vgap: 0,
value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35,
height: 16
width: 40,
height: 24
});
this.pager = BI.createWidget({
type: "bi.pager",
width: 36,
width: 58,
layouts: [{
type: "bi.horizontal",
hgap: 1,
vgap: 1
lgap: 5
}],
dynamicShow: false,
@ -57663,16 +57662,18 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: "prev",
title: BI.i18nText("BI-Previous_Page"),
warningTitle: BI.i18nText("BI-Current_Is_First_Page"),
height: 20,
cls: "all-pager-prev column-pre-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-prev pull-up-font"
},
next: {
type: "bi.icon_button",
value: "next",
title: BI.i18nText("BI-Next_Page"),
warningTitle: BI.i18nText("BI-Current_Is_Last_Page"),
height: 20,
cls: "all-pager-next column-next-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-next pull-down-font"
},
hasPrev: o.hasPrev,
@ -57694,13 +57695,14 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
width: 30,
title: o.pages,
text: "/" + o.pages
text: "/" + o.pages,
lgap: 5
});
this.rowCount = BI.createWidget({
type: "bi.label",
cls: "row-count",
height: o.height,
hgap: 5,
text: o.count,
@ -57727,7 +57729,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.center_adapt",
element: this,
columnSize: ["", 35, 40, 36],
columnSize: ["", 40, 20, 58],
items: [count, this.editor, this.allPages, this.pager]
});
},

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

26
dist/case.js vendored
Unescape View File

@ -8030,17 +8030,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
vgap: 0,
value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35,
height: 16
width: 40,
height: 24
});
this.pager = BI.createWidget({
type: "bi.pager",
width: 36,
width: 58,
layouts: [{
type: "bi.horizontal",
hgap: 1,
vgap: 1
lgap: 5
}],
dynamicShow: false,
@ -8055,16 +8054,18 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: "prev",
title: BI.i18nText("BI-Previous_Page"),
warningTitle: BI.i18nText("BI-Current_Is_First_Page"),
height: 20,
cls: "all-pager-prev column-pre-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-prev pull-up-font"
},
next: {
type: "bi.icon_button",
value: "next",
title: BI.i18nText("BI-Next_Page"),
warningTitle: BI.i18nText("BI-Current_Is_Last_Page"),
height: 20,
cls: "all-pager-next column-next-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-next pull-down-font"
},
hasPrev: o.hasPrev,
@ -8086,13 +8087,14 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
width: 30,
title: o.pages,
text: "/" + o.pages
text: "/" + o.pages,
lgap: 5
});
this.rowCount = BI.createWidget({
type: "bi.label",
cls: "row-count",
height: o.height,
hgap: 5,
text: o.count,
@ -8119,7 +8121,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.center_adapt",
element: this,
columnSize: ["", 35, 40, 36],
columnSize: ["", 40, 20, 58],
items: [count, this.editor, this.allPages, this.pager]
});
},

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, {
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);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

3
dist/fineui.css vendored
Unescape View File

@ -2621,6 +2621,9 @@ textarea {
.bi-all-count-pager .all-pager-next {
font-size: 16px;
}
.bi-all-count-pager .row-count {
color: #3685f2;
}
.bi-direction-pager .direction-pager-prev {
font-size: 16px;

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

@ -57479,17 +57479,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
vgap: 0,
value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35,
height: 16
width: 40,
height: 24
});
this.pager = BI.createWidget({
type: "bi.pager",
width: 36,
width: 58,
layouts: [{
type: "bi.horizontal",
hgap: 1,
vgap: 1
lgap: 5
}],
dynamicShow: false,
@ -57504,16 +57503,18 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: "prev",
title: BI.i18nText("BI-Previous_Page"),
warningTitle: BI.i18nText("BI-Current_Is_First_Page"),
height: 20,
cls: "all-pager-prev column-pre-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-prev pull-up-font"
},
next: {
type: "bi.icon_button",
value: "next",
title: BI.i18nText("BI-Next_Page"),
warningTitle: BI.i18nText("BI-Current_Is_Last_Page"),
height: 20,
cls: "all-pager-next column-next-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-next pull-down-font"
},
hasPrev: o.hasPrev,
@ -57535,13 +57536,14 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
width: 30,
title: o.pages,
text: "/" + o.pages
text: "/" + o.pages,
lgap: 5
});
this.rowCount = BI.createWidget({
type: "bi.label",
cls: "row-count",
height: o.height,
hgap: 5,
text: o.count,
@ -57568,7 +57570,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.center_adapt",
element: this,
columnSize: ["", 35, 40, 36],
columnSize: ["", 40, 20, 58],
items: [count, this.editor, this.allPages, this.pager]
});
},

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

File diff suppressed because one or more lines are too long

26
dist/fineui.js vendored
Unescape View File

@ -57883,17 +57883,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
vgap: 0,
value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35,
height: 16
width: 40,
height: 24
});
this.pager = BI.createWidget({
type: "bi.pager",
width: 36,
width: 58,
layouts: [{
type: "bi.horizontal",
hgap: 1,
vgap: 1
lgap: 5
}],
dynamicShow: false,
@ -57908,16 +57907,18 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: "prev",
title: BI.i18nText("BI-Previous_Page"),
warningTitle: BI.i18nText("BI-Current_Is_First_Page"),
height: 20,
cls: "all-pager-prev column-pre-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-prev pull-up-font"
},
next: {
type: "bi.icon_button",
value: "next",
title: BI.i18nText("BI-Next_Page"),
warningTitle: BI.i18nText("BI-Current_Is_Last_Page"),
height: 20,
cls: "all-pager-next column-next-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-next pull-down-font"
},
hasPrev: o.hasPrev,
@ -57939,13 +57940,14 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
width: 30,
title: o.pages,
text: "/" + o.pages
text: "/" + o.pages,
lgap: 5
});
this.rowCount = BI.createWidget({
type: "bi.label",
cls: "row-count",
height: o.height,
hgap: 5,
text: o.count,
@ -57972,7 +57974,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.center_adapt",
element: this,
columnSize: ["", 35, 40, 36],
columnSize: ["", 40, 20, 58],
items: [count, this.editor, this.allPages, this.pager]
});
},

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

26
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -40896,17 +40896,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
vgap: 0,
value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35,
height: 16
width: 40,
height: 24
});
this.pager = BI.createWidget({
type: "bi.pager",
width: 36,
width: 58,
layouts: [{
type: "bi.horizontal",
hgap: 1,
vgap: 1
lgap: 5
}],
dynamicShow: false,
@ -40921,16 +40920,18 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: "prev",
title: BI.i18nText("BI-Previous_Page"),
warningTitle: BI.i18nText("BI-Current_Is_First_Page"),
height: 20,
cls: "all-pager-prev column-pre-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-prev pull-up-font"
},
next: {
type: "bi.icon_button",
value: "next",
title: BI.i18nText("BI-Next_Page"),
warningTitle: BI.i18nText("BI-Current_Is_Last_Page"),
height: 20,
cls: "all-pager-next column-next-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-next pull-down-font"
},
hasPrev: o.hasPrev,
@ -40952,13 +40953,14 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
width: 30,
title: o.pages,
text: "/" + o.pages
text: "/" + o.pages,
lgap: 5
});
this.rowCount = BI.createWidget({
type: "bi.label",
cls: "row-count",
height: o.height,
hgap: 5,
text: o.count,
@ -40985,7 +40987,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.center_adapt",
element: this,
columnSize: ["", 35, 40, 36],
columnSize: ["", 40, 20, 58],
items: [count, this.editor, this.allPages, this.pager]
});
},

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

26
src/case/pager/pager.all.count.js
Unescape View File

@ -26,17 +26,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
vgap: 0,
value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35,
height: 16
width: 40,
height: 24
});
this.pager = BI.createWidget({
type: "bi.pager",
width: 36,
width: 58,
layouts: [{
type: "bi.horizontal",
hgap: 1,
vgap: 1
lgap: 5
}],
dynamicShow: false,
@ -51,16 +50,18 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: "prev",
title: BI.i18nText("BI-Previous_Page"),
warningTitle: BI.i18nText("BI-Current_Is_First_Page"),
height: 20,
cls: "all-pager-prev column-pre-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-prev pull-up-font"
},
next: {
type: "bi.icon_button",
value: "next",
title: BI.i18nText("BI-Next_Page"),
warningTitle: BI.i18nText("BI-Current_Is_Last_Page"),
height: 20,
cls: "all-pager-next column-next-page-h-font"
height: 22,
width: 22,
cls: "bi-border all-pager-next pull-down-font"
},
hasPrev: o.hasPrev,
@ -82,13 +83,14 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
this.allPages = BI.createWidget({
type: "bi.label",
width: 30,
title: o.pages,
text: "/" + o.pages
text: "/" + o.pages,
lgap: 5
});
this.rowCount = BI.createWidget({
type: "bi.label",
cls: "row-count",
height: o.height,
hgap: 5,
text: o.count,
@ -115,7 +117,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.center_adapt",
element: this,
columnSize: ["", 35, 40, 36],
columnSize: ["", 40, 20, 58],
items: [count, this.editor, this.allPages, this.pager]
});
},

3
src/css/base/pager/pager.css
Unescape View File

@ -4,6 +4,9 @@
.bi-all-count-pager .all-pager-next {
font-size: 16px;
}
.bi-all-count-pager .row-count {
color: #3685f2;
}
.bi-direction-pager .direction-pager-prev {
font-size: 16px;

3
src/less/base/pager/pager.all.count.less
Unescape View File

@ -9,4 +9,7 @@
& .all-pager-next {
font-size: @font-size-16;
}
& .row-count {
color: @color-bi-text-highlight;
}
}
Write Preview
Loading…
Cancel
Save