From af000b90f660ea0a52ef4710503663a0cd6433d3 Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 29 Oct 2018 17:30:31 +0800 Subject: [PATCH] =?UTF-8?q?BI-34250=20=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.ie.js | 14 +++++++------- dist/bundle.js | 14 +++++++------- dist/case.js | 14 +++++++------- dist/demo.js | 25 +------------------------ dist/fineui.ie.js | 14 +++++++------- dist/fineui.js | 14 +++++++------- dist/fineui_without_jquery_polyfill.js | 14 +++++++------- src/case/pager/pager.all.count.js | 4 ++-- src/case/pager/pager.direction.js | 10 +++++----- 9 files changed, 50 insertions(+), 73 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 4d263c115..d82c4cbeb 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -56417,7 +56417,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-all-count-pager", - height: 30, + height: 20, pages: 1, // 必选项 curr: 1, // 初始化当前页， pages为数字时可用， count: 1 // 总行数 @@ -56437,7 +56437,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: o.curr, errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), width: 35, - height: 20 + height: 16 }); this.pager = BI.createWidget({ @@ -56587,7 +56587,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-direction-pager", - height: 30, + height: 20, horizontal: { pages: false, // 总页数 curr: 1, // 初始化当前页， pages为数字时可用 @@ -56620,19 +56620,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, { element: this, items: [{ el: this.vpager, - top: 5, + top: 0, right: 74 }, { el: this.vlabel, - top: 5, + top: 0, right: 111 }, { el: this.hpager, - top: 5, + top: 0, right: -9 }, { el: this.hlabel, - top: 5, + top: 0, right: 28 }] }); diff --git a/dist/bundle.js b/dist/bundle.js index 627b97abc..edeea7ac3 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -56821,7 +56821,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-all-count-pager", - height: 30, + height: 20, pages: 1, // 必选项 curr: 1, // 初始化当前页， pages为数字时可用， count: 1 // 总行数 @@ -56841,7 +56841,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: o.curr, errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), width: 35, - height: 20 + height: 16 }); this.pager = BI.createWidget({ @@ -56991,7 +56991,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-direction-pager", - height: 30, + height: 20, horizontal: { pages: false, // 总页数 curr: 1, // 初始化当前页， pages为数字时可用 @@ -57024,19 +57024,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, { element: this, items: [{ el: this.vpager, - top: 5, + top: 0, right: 74 }, { el: this.vlabel, - top: 5, + top: 0, right: 111 }, { el: this.hpager, - top: 5, + top: 0, right: -9 }, { el: this.hlabel, - top: 5, + top: 0, right: 28 }] }); diff --git a/dist/case.js b/dist/case.js index b113e870d..7f29f0a05 100644 --- a/dist/case.js +++ b/dist/case.js @@ -7973,7 +7973,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-all-count-pager", - height: 30, + height: 20, pages: 1, // 必选项 curr: 1, // 初始化当前页， pages为数字时可用， count: 1 // 总行数 @@ -7993,7 +7993,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: o.curr, errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), width: 35, - height: 20 + height: 16 }); this.pager = BI.createWidget({ @@ -8143,7 +8143,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-direction-pager", - height: 30, + height: 20, horizontal: { pages: false, // 总页数 curr: 1, // 初始化当前页， pages为数字时可用 @@ -8176,19 +8176,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, { element: this, items: [{ el: this.vpager, - top: 5, + top: 0, right: 74 }, { el: this.vlabel, - top: 5, + top: 0, right: 111 }, { el: this.hpager, - top: 5, + top: 0, right: -9 }, { el: this.hlabel, - top: 5, + top: 0, right: 28 }] }); diff --git a/dist/demo.js b/dist/demo.js index 9b782c270..446f581e0 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -6126,30 +6126,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, { diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 502a69676..ed127fdd7 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -56659,7 +56659,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-all-count-pager", - height: 30, + height: 20, pages: 1, // 必选项 curr: 1, // 初始化当前页， pages为数字时可用， count: 1 // 总行数 @@ -56679,7 +56679,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: o.curr, errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), width: 35, - height: 20 + height: 16 }); this.pager = BI.createWidget({ @@ -56829,7 +56829,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-direction-pager", - height: 30, + height: 20, horizontal: { pages: false, // 总页数 curr: 1, // 初始化当前页， pages为数字时可用 @@ -56862,19 +56862,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, { element: this, items: [{ el: this.vpager, - top: 5, + top: 0, right: 74 }, { el: this.vlabel, - top: 5, + top: 0, right: 111 }, { el: this.hpager, - top: 5, + top: 0, right: -9 }, { el: this.hlabel, - top: 5, + top: 0, right: 28 }] }); diff --git a/dist/fineui.js b/dist/fineui.js index 6fc09046a..84e867b12 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -57063,7 +57063,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-all-count-pager", - height: 30, + height: 20, pages: 1, // 必选项 curr: 1, // 初始化当前页， pages为数字时可用， count: 1 // 总行数 @@ -57083,7 +57083,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: o.curr, errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), width: 35, - height: 20 + height: 16 }); this.pager = BI.createWidget({ @@ -57233,7 +57233,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-direction-pager", - height: 30, + height: 20, horizontal: { pages: false, // 总页数 curr: 1, // 初始化当前页， pages为数字时可用 @@ -57266,19 +57266,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, { element: this, items: [{ el: this.vpager, - top: 5, + top: 0, right: 74 }, { el: this.vlabel, - top: 5, + top: 0, right: 111 }, { el: this.hpager, - top: 5, + top: 0, right: -9 }, { el: this.hlabel, - top: 5, + top: 0, right: 28 }] }); diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 6738e6d37..a7d5b829c 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -40099,7 +40099,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-all-count-pager", - height: 30, + height: 20, pages: 1, // 必选项 curr: 1, // 初始化当前页， pages为数字时可用， count: 1 // 总行数 @@ -40119,7 +40119,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: o.curr, errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), width: 35, - height: 20 + height: 16 }); this.pager = BI.createWidget({ @@ -40269,7 +40269,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-direction-pager", - height: 30, + height: 20, horizontal: { pages: false, // 总页数 curr: 1, // 初始化当前页， pages为数字时可用 @@ -40302,19 +40302,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, { element: this, items: [{ el: this.vpager, - top: 5, + top: 0, right: 74 }, { el: this.vlabel, - top: 5, + top: 0, right: 111 }, { el: this.hpager, - top: 5, + top: 0, right: -9 }, { el: this.hlabel, - top: 5, + top: 0, right: 28 }] }); diff --git a/src/case/pager/pager.all.count.js b/src/case/pager/pager.all.count.js index 31e9063fe..085bebf9f 100644 --- a/src/case/pager/pager.all.count.js +++ b/src/case/pager/pager.all.count.js @@ -7,7 +7,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.AllCountPager.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-all-count-pager", - height: 30, + height: 20, pages: 1, // 必选项 curr: 1, // 初始化当前页， pages为数字时可用， count: 1 // 总行数 @@ -27,7 +27,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: o.curr, errorText: BI.i18nText("BI-Please_Input_Positive_Integer"), width: 35, - height: 20 + height: 16 }); this.pager = BI.createWidget({ diff --git a/src/case/pager/pager.direction.js b/src/case/pager/pager.direction.js index 6dd6359b3..fbea51112 100644 --- a/src/case/pager/pager.direction.js +++ b/src/case/pager/pager.direction.js @@ -10,7 +10,7 @@ BI.DirectionPager = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DirectionPager.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-direction-pager", - height: 30, + height: 20, horizontal: { pages: false, // 总页数 curr: 1, // 初始化当前页， pages为数字时可用 @@ -43,19 +43,19 @@ BI.DirectionPager = BI.inherit(BI.Widget, { element: this, items: [{ el: this.vpager, - top: 5, + top: 0, right: 74 }, { el: this.vlabel, - top: 5, + top: 0, right: 111 }, { el: this.hpager, - top: 5, + top: 0, right: -9 }, { el: this.hlabel, - top: 5, + top: 0, right: 28 }] });