Browse Source

Merge pull request #760 in VISUAL/fineui from ~IMP/fineui_fui:master to master

* commit 'af000b90f660ea0a52ef4710503663a0cd6433d3':
  BI-34250 大小调整
master
guy 6 years ago
parent
commit
75bd7305df
  1. 14
      dist/bundle.ie.js
  2. 14
      dist/bundle.js
  3. 14
      dist/case.js
  4. 25
      dist/demo.js
  5. 14
      dist/fineui.ie.js
  6. 14
      dist/fineui.js
  7. 14
      dist/fineui_without_jquery_polyfill.js
  8. 4
      src/case/pager/pager.all.count.js
  9. 10
      src/case/pager/pager.direction.js

14
dist/bundle.ie.js vendored

@ -56417,7 +56417,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-all-count-pager", extraCls: "bi-all-count-pager",
height: 30, height: 20,
pages: 1, // 必选项 pages: 1, // 必选项
curr: 1, // 初始化当前页, pages为数字时可用, curr: 1, // 初始化当前页, pages为数字时可用,
count: 1 // 总行数 count: 1 // 总行数
@ -56437,7 +56437,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: o.curr, value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35, width: 35,
height: 20 height: 16
}); });
this.pager = BI.createWidget({ this.pager = BI.createWidget({
@ -56587,7 +56587,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-direction-pager", baseCls: "bi-direction-pager",
height: 30, height: 20,
horizontal: { horizontal: {
pages: false, // 总页数 pages: false, // 总页数
curr: 1, // 初始化当前页, pages为数字时可用 curr: 1, // 初始化当前页, pages为数字时可用
@ -56620,19 +56620,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.vpager, el: this.vpager,
top: 5, top: 0,
right: 74 right: 74
}, { }, {
el: this.vlabel, el: this.vlabel,
top: 5, top: 0,
right: 111 right: 111
}, { }, {
el: this.hpager, el: this.hpager,
top: 5, top: 0,
right: -9 right: -9
}, { }, {
el: this.hlabel, el: this.hlabel,
top: 5, top: 0,
right: 28 right: 28
}] }]
}); });

14
dist/bundle.js vendored

@ -56821,7 +56821,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-all-count-pager", extraCls: "bi-all-count-pager",
height: 30, height: 20,
pages: 1, // 必选项 pages: 1, // 必选项
curr: 1, // 初始化当前页, pages为数字时可用, curr: 1, // 初始化当前页, pages为数字时可用,
count: 1 // 总行数 count: 1 // 总行数
@ -56841,7 +56841,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: o.curr, value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35, width: 35,
height: 20 height: 16
}); });
this.pager = BI.createWidget({ this.pager = BI.createWidget({
@ -56991,7 +56991,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-direction-pager", baseCls: "bi-direction-pager",
height: 30, height: 20,
horizontal: { horizontal: {
pages: false, // 总页数 pages: false, // 总页数
curr: 1, // 初始化当前页, pages为数字时可用 curr: 1, // 初始化当前页, pages为数字时可用
@ -57024,19 +57024,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.vpager, el: this.vpager,
top: 5, top: 0,
right: 74 right: 74
}, { }, {
el: this.vlabel, el: this.vlabel,
top: 5, top: 0,
right: 111 right: 111
}, { }, {
el: this.hpager, el: this.hpager,
top: 5, top: 0,
right: -9 right: -9
}, { }, {
el: this.hlabel, el: this.hlabel,
top: 5, top: 0,
right: 28 right: 28
}] }]
}); });

14
dist/case.js vendored

@ -7973,7 +7973,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-all-count-pager", extraCls: "bi-all-count-pager",
height: 30, height: 20,
pages: 1, // 必选项 pages: 1, // 必选项
curr: 1, // 初始化当前页, pages为数字时可用, curr: 1, // 初始化当前页, pages为数字时可用,
count: 1 // 总行数 count: 1 // 总行数
@ -7993,7 +7993,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: o.curr, value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35, width: 35,
height: 20 height: 16
}); });
this.pager = BI.createWidget({ this.pager = BI.createWidget({
@ -8143,7 +8143,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-direction-pager", baseCls: "bi-direction-pager",
height: 30, height: 20,
horizontal: { horizontal: {
pages: false, // 总页数 pages: false, // 总页数
curr: 1, // 初始化当前页, pages为数字时可用 curr: 1, // 初始化当前页, pages为数字时可用
@ -8176,19 +8176,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.vpager, el: this.vpager,
top: 5, top: 0,
right: 74 right: 74
}, { }, {
el: this.vlabel, el: this.vlabel,
top: 5, top: 0,
right: 111 right: 111
}, { }, {
el: this.hpager, el: this.hpager,
top: 5, top: 0,
right: -9 right: -9
}, { }, {
el: this.hlabel, el: this.hlabel,
top: 5, top: 0,
right: 28 right: 28
}] }]
}); });

25
dist/demo.js vendored

@ -6126,30 +6126,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, {

14
dist/fineui.ie.js vendored

@ -56659,7 +56659,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-all-count-pager", extraCls: "bi-all-count-pager",
height: 30, height: 20,
pages: 1, // 必选项 pages: 1, // 必选项
curr: 1, // 初始化当前页, pages为数字时可用, curr: 1, // 初始化当前页, pages为数字时可用,
count: 1 // 总行数 count: 1 // 总行数
@ -56679,7 +56679,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: o.curr, value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35, width: 35,
height: 20 height: 16
}); });
this.pager = BI.createWidget({ this.pager = BI.createWidget({
@ -56829,7 +56829,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-direction-pager", baseCls: "bi-direction-pager",
height: 30, height: 20,
horizontal: { horizontal: {
pages: false, // 总页数 pages: false, // 总页数
curr: 1, // 初始化当前页, pages为数字时可用 curr: 1, // 初始化当前页, pages为数字时可用
@ -56862,19 +56862,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.vpager, el: this.vpager,
top: 5, top: 0,
right: 74 right: 74
}, { }, {
el: this.vlabel, el: this.vlabel,
top: 5, top: 0,
right: 111 right: 111
}, { }, {
el: this.hpager, el: this.hpager,
top: 5, top: 0,
right: -9 right: -9
}, { }, {
el: this.hlabel, el: this.hlabel,
top: 5, top: 0,
right: 28 right: 28
}] }]
}); });

14
dist/fineui.js vendored

@ -57063,7 +57063,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-all-count-pager", extraCls: "bi-all-count-pager",
height: 30, height: 20,
pages: 1, // 必选项 pages: 1, // 必选项
curr: 1, // 初始化当前页, pages为数字时可用, curr: 1, // 初始化当前页, pages为数字时可用,
count: 1 // 总行数 count: 1 // 总行数
@ -57083,7 +57083,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: o.curr, value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35, width: 35,
height: 20 height: 16
}); });
this.pager = BI.createWidget({ this.pager = BI.createWidget({
@ -57233,7 +57233,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-direction-pager", baseCls: "bi-direction-pager",
height: 30, height: 20,
horizontal: { horizontal: {
pages: false, // 总页数 pages: false, // 总页数
curr: 1, // 初始化当前页, pages为数字时可用 curr: 1, // 初始化当前页, pages为数字时可用
@ -57266,19 +57266,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.vpager, el: this.vpager,
top: 5, top: 0,
right: 74 right: 74
}, { }, {
el: this.vlabel, el: this.vlabel,
top: 5, top: 0,
right: 111 right: 111
}, { }, {
el: this.hpager, el: this.hpager,
top: 5, top: 0,
right: -9 right: -9
}, { }, {
el: this.hlabel, el: this.hlabel,
top: 5, top: 0,
right: 28 right: 28
}] }]
}); });

14
dist/fineui_without_jquery_polyfill.js vendored

@ -40099,7 +40099,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-all-count-pager", extraCls: "bi-all-count-pager",
height: 30, height: 20,
pages: 1, // 必选项 pages: 1, // 必选项
curr: 1, // 初始化当前页, pages为数字时可用, curr: 1, // 初始化当前页, pages为数字时可用,
count: 1 // 总行数 count: 1 // 总行数
@ -40119,7 +40119,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: o.curr, value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35, width: 35,
height: 20 height: 16
}); });
this.pager = BI.createWidget({ this.pager = BI.createWidget({
@ -40269,7 +40269,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-direction-pager", baseCls: "bi-direction-pager",
height: 30, height: 20,
horizontal: { horizontal: {
pages: false, // 总页数 pages: false, // 总页数
curr: 1, // 初始化当前页, pages为数字时可用 curr: 1, // 初始化当前页, pages为数字时可用
@ -40302,19 +40302,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.vpager, el: this.vpager,
top: 5, top: 0,
right: 74 right: 74
}, { }, {
el: this.vlabel, el: this.vlabel,
top: 5, top: 0,
right: 111 right: 111
}, { }, {
el: this.hpager, el: this.hpager,
top: 5, top: 0,
right: -9 right: -9
}, { }, {
el: this.hlabel, el: this.hlabel,
top: 5, top: 0,
right: 28 right: 28
}] }]
}); });

4
src/case/pager/pager.all.count.js

@ -7,7 +7,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-all-count-pager", extraCls: "bi-all-count-pager",
height: 30, height: 20,
pages: 1, // 必选项 pages: 1, // 必选项
curr: 1, // 初始化当前页, pages为数字时可用, curr: 1, // 初始化当前页, pages为数字时可用,
count: 1 // 总行数 count: 1 // 总行数
@ -27,7 +27,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
value: o.curr, value: o.curr,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
width: 35, width: 35,
height: 20 height: 16
}); });
this.pager = BI.createWidget({ this.pager = BI.createWidget({

10
src/case/pager/pager.direction.js

@ -10,7 +10,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-direction-pager", baseCls: "bi-direction-pager",
height: 30, height: 20,
horizontal: { horizontal: {
pages: false, // 总页数 pages: false, // 总页数
curr: 1, // 初始化当前页, pages为数字时可用 curr: 1, // 初始化当前页, pages为数字时可用
@ -43,19 +43,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.vpager, el: this.vpager,
top: 5, top: 0,
right: 74 right: 74
}, { }, {
el: this.vlabel, el: this.vlabel,
top: 5, top: 0,
right: 111 right: 111
}, { }, {
el: this.hpager, el: this.hpager,
top: 5, top: 0,
right: -9 right: -9
}, { }, {
el: this.hlabel, el: this.hlabel,
top: 5, top: 0,
right: 28 right: 28
}] }]
}); });

Loading…
Cancel
Save