From 3c491a6791a1c71edb4a90751d92d77b6214f83b Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 31 Mar 2021 18:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=95=B4=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/web/jquery}/jquery.mousewheel.js | 0 .../wrapper/layout/adapt/adapt.horizontal.js | 3 +- src/core/wrapper/layout/adapt/adapt.table.js | 4 +- .../wrapper/layout/adapt/adapt.vertical.js | 3 +- .../layout/flex/flex.horizontal.center.js | 3 +- .../layout/flex/flex.vertical.center.js | 3 +- .../wrapper/flex.wrapper.horizontal.center.js | 3 +- .../wrapper/flex.wrapper.vertical.center.js | 3 +- src/core/wrapper/layout/layout.horizontal.js | 173 +----------------- src/core/wrapper/layout/layout.tape.js | 30 +-- src/core/wrapper/layout/layout.window.js | 16 +- 11 files changed, 19 insertions(+), 222 deletions(-) rename src/{third => core/platform/web/jquery}/jquery.mousewheel.js (100%) diff --git a/src/third/jquery.mousewheel.js b/src/core/platform/web/jquery/jquery.mousewheel.js similarity index 100% rename from src/third/jquery.mousewheel.js rename to src/core/platform/web/jquery/jquery.mousewheel.js diff --git a/src/core/wrapper/layout/adapt/adapt.horizontal.js b/src/core/wrapper/layout/adapt/adapt.horizontal.js index fb98bc930..8795a3cd4 100644 --- a/src/core/wrapper/layout/adapt/adapt.horizontal.js +++ b/src/core/wrapper/layout/adapt/adapt.horizontal.js @@ -8,6 +8,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, { return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), { baseCls: "bi-h-a", verticalAlign: BI.VerticalAlign.Top, + horizontalAlign: BI.HorizontalAlign.Center, columnSize: [], scrollx: false, hgap: 0, @@ -24,7 +25,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, { return { type: "bi.horizontal", verticalAlign: o.verticalAlign, - horizontalAlign: BI.HorizontalAlign.Center, + horizontalAlign: o.horizontalAlign, columnSize: o.columnSize, items: o.items, scrollx: o.scrollx, diff --git a/src/core/wrapper/layout/adapt/adapt.table.js b/src/core/wrapper/layout/adapt/adapt.table.js index baa065655..999eef248 100644 --- a/src/core/wrapper/layout/adapt/adapt.table.js +++ b/src/core/wrapper/layout/adapt/adapt.table.js @@ -26,7 +26,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, { position: "relative", display: "table", width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto", - height: (o.verticalAlign === BI.VerticalAlign.Middle || o.verticalAlign === BI.VerticalAlign.Stretch) ? "100%" : "auto", + height: (o.verticalAlign !== BI.VerticalAlign.Top) ? "100%" : "auto", "white-space": "nowrap" }); this.populate(this.options.items); @@ -61,8 +61,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, { position: "relative", display: "table-cell", "vertical-align": o.verticalAlign, - margin: "0", - padding: "0", height: "100%" }); if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { diff --git a/src/core/wrapper/layout/adapt/adapt.vertical.js b/src/core/wrapper/layout/adapt/adapt.vertical.js index 82fa8b297..15fc8e7c0 100644 --- a/src/core/wrapper/layout/adapt/adapt.vertical.js +++ b/src/core/wrapper/layout/adapt/adapt.vertical.js @@ -7,6 +7,7 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, { props: { baseCls: "bi-v-a", horizontalAlign: BI.HorizontalAlign.Left, + verticalAlign: BI.VerticalAlign.Middle, columnSize: [], scrollx: false, hgap: 0, @@ -22,8 +23,8 @@ BI.VerticalAdaptLayout = BI.inherit(BI.Layout, { BI.VerticalAdaptLayout.superclass.render.apply(this, arguments); return { type: "bi.horizontal", - verticalAlign: BI.VerticalAlign.Middle, horizontalAlign: o.horizontalAlign, + verticalAlign: o.verticalAlign, columnSize: o.columnSize, items: o.items, scrollx: o.scrollx, diff --git a/src/core/wrapper/layout/flex/flex.horizontal.center.js b/src/core/wrapper/layout/flex/flex.horizontal.center.js index ef5baa4d4..0c4207484 100644 --- a/src/core/wrapper/layout/flex/flex.horizontal.center.js +++ b/src/core/wrapper/layout/flex/flex.horizontal.center.js @@ -8,6 +8,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, { props: function () { return BI.extend(BI.FlexHorizontalCenter.superclass.props.apply(this, arguments), { baseCls: "bi-f-h-c", + horizontalAlign: BI.HorizontalAlign.Center, verticalAlign: BI.VerticalAlign.Top, rowSize: [], scrolly: false, @@ -26,7 +27,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, { ref: function (_ref) { self.wrapper = _ref; }, - horizontalAlign: BI.HorizontalAlign.Center, + horizontalAlign: o.horizontalAlign, verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize, diff --git a/src/core/wrapper/layout/flex/flex.vertical.center.js b/src/core/wrapper/layout/flex/flex.vertical.center.js index d67ca1ce8..24559546d 100644 --- a/src/core/wrapper/layout/flex/flex.vertical.center.js +++ b/src/core/wrapper/layout/flex/flex.vertical.center.js @@ -10,6 +10,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, { return BI.extend(BI.FlexVerticalCenter.superclass.props.apply(this, arguments), { baseCls: "bi-f-v-c", horizontalAlign: BI.HorizontalAlign.Left, + verticalAlign: BI.VerticalAlign.Middle, columnSize: [], scrollx: false, hgap: 0, @@ -27,7 +28,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, { ref: function (_ref) { self.wrapper = _ref; }, - verticalAlign: BI.VerticalAlign.Middle, + verticalAlign: o.verticalAlign, horizontalAlign: o.horizontalAlign, columnSize: o.columnSize, rowSize: o.rowSize, diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js index 4e110f222..7af0c413d 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js @@ -9,6 +9,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { props: function () { return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), { baseCls: "bi-f-s-v-c clearfix", + horizontalAlign: BI.HorizontalAlign.Center, verticalAlign: BI.VerticalAlign.Top, rowSize: [], scrollable: true, @@ -28,7 +29,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { ref: function (_ref) { self.wrapper = _ref; }, - horizontalAlign: BI.HorizontalAlign.Center, + horizontalAlign: o.horizontalAlign, verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize, diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js index f9d9421ad..dc6ff2a1c 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js @@ -10,6 +10,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), { baseCls: "bi-f-s-v-c clearfix", horizontalAlign: BI.HorizontalAlign.Left, + verticalAlign: BI.VerticalAlign.Middle, columnSize: [], scrollx: false, scrollable: true, @@ -28,7 +29,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { ref: function (_ref) { self.wrapper = _ref; }, - verticalAlign: BI.VerticalAlign.Middle, + verticalAlign: o.verticalAlign, horizontalAlign: o.horizontalAlign, columnSize: o.columnSize, rowSize: o.rowSize, diff --git a/src/core/wrapper/layout/layout.horizontal.js b/src/core/wrapper/layout/layout.horizontal.js index 79bb92a20..e7997c682 100644 --- a/src/core/wrapper/layout/layout.horizontal.js +++ b/src/core/wrapper/layout/layout.horizontal.js @@ -3,176 +3,5 @@ * @class BI.HorizontalLayout * @extends BI.Layout */ -BI.HorizontalLayout = BI.inherit(BI.Layout, { - props: function () { - return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-h", - verticalAlign: BI.VerticalAlign.Top, - horizontalAlign: BI.HorizontalAlign.Left, - columnSize: [], - scrollx: true, - hgap: 0, - vgap: 0, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0 - }); - }, - render: function () { - var o = this.options; - BI.HorizontalLayout.superclass.render.apply(this, arguments); - this.$table = BI.Widget._renderEngine.createElement("").attr({cellspacing: 0, cellpadding: 0}).css({ - position: "relative", - "white-space": "nowrap", - width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto", - height: (o.verticalAlign === BI.VerticalAlign.Middle || o.verticalAlign === BI.VerticalAlign.Stretch) ? "100%" : "auto", - "border-spacing": "0px", - border: "none", - "border-collapse": "separate" - }); - this.$tr = BI.Widget._renderEngine.createElement(""); - this.$tr.appendTo(this.$table); - this.populate(this.options.items); - }, - - _addElement: function (i, item) { - var o = this.options; - var td; - var width = o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap + o.columnSize[i]); - if (!this.hasWidget(this._getChildName(i))) { - var w = BI._lazyCreateWidget(item); - w.element.css({position: "relative", margin: "0px auto"}); - td = BI._lazyCreateWidget({ - type: "bi.default", - tagName: "td", - attributes: { - width: width - }, - items: [w] - }); - this.addWidget(this._getChildName(i), td); - } else { - td = this.getWidgetByName(this._getChildName(i)); - td.element.attr("width", width); - } - // 对于表现为td的元素设置最大宽度，有几点需要注意 - // 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现 - // 2、不能给多个td设置最大宽度，这样只会平分宽度 - // 3、多百分比宽度就算了 - td.element.css({"max-width": BI.isNumber(o.columnSize[i]) ? (o.columnSize[i] <= 1 ? width : width / BI.pixRatio + BI.pixUnit) : width}); - if (i === 0) { - td.element.addClass("first-element"); - } - td.element.css({ - position: "relative", - "vertical-align": o.verticalAlign, - margin: "0", - padding: "0", - border: "none" - }); - - if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { - w.element.css({ - "margin-top": (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit - }); - } - if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) { - w.element.css({ - "margin-left": ((i === 0 ? o.hgap : 0) + o.lgap + (item.lgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit - }); - } - if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) { - w.element.css({ - "margin-right": (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit - }); - } - if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) { - w.element.css({ - "margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit - }); - } - return td; - }, - - appendFragment: function (frag) { - this.$tr.append(frag); - this.element.append(this.$table); - }, - - resize: function () { - // console.log("horizontal layout do not need to resize"); - }, - - _getWrapper: function () { - return this.$tr; - }, - - populate: function (items) { - BI.HorizontalLayout.superclass.populate.apply(this, arguments); - this._mount(); - } -}); +BI.HorizontalLayout = BI.Layout; BI.shortcut("bi.horizontal", BI.HorizontalLayout); - -/** - * 水平布局 - * @class BI.HorizontalCellLayout - * @extends BI.Layout - */ -BI.HorizontalCellLayout = BI.inherit(BI.Layout, { - props: function () { - return BI.extend(BI.HorizontalCellLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-horizontal-cell-layout", - scrollable: true, - hgap: 0, - vgap: 0, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0 - }); - }, - render: function () { - BI.HorizontalCellLayout.superclass.render.apply(this, arguments); - this.element.css({display: "table", "vertical-align": "top"}); - this.populate(this.options.items); - }, - - _addElement: function (i, item) { - var o = this.options; - var w = BI.HorizontalCellLayout.superclass._addElement.apply(this, arguments); - w.element.css({position: "relative", display: "table-cell", "vertical-align": "middle"}); - if (o.hgap + o.lgap > 0) { - w.element.css({ - "margin-left": (o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit - }); - } - if (o.hgap + o.rgap > 0) { - w.element.css({ - "margin-right": (o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit - }); - } - if (o.vgap + o.tgap > 0) { - w.element.css({ - "margin-top": (o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit - }); - } - if (o.vgap + o.bgap > 0) { - w.element.css({ - "margin-bottom": (o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit - }); - } - return w; - }, - - resize: function () { - // console.log("horizontal do not need to resize"); - }, - - populate: function (items) { - BI.HorizontalCellLayout.superclass.populate.apply(this, arguments); - this._mount(); - } -}); -BI.shortcut("bi.horizontal_cell", BI.HorizontalCellLayout); diff --git a/src/core/wrapper/layout/layout.tape.js b/src/core/wrapper/layout/layout.tape.js index 485dcf83e..ffc76f1f1 100644 --- a/src/core/wrapper/layout/layout.tape.js +++ b/src/core/wrapper/layout/layout.tape.js @@ -13,20 +13,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, { rgap: 0, tgap: 0, bgap: 0, - items: [ - { - width: 100, - el: {type: "bi.button", text: "button1"} - }, - { - width: "fill", - el: {type: "bi.button", text: "button2"} - }, - { - width: 200, - el: {type: "bi.button", text: "button3"} - } - ] + items: [] }); }, render: function () { @@ -129,20 +116,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, { rgap: 0, tgap: 0, bgap: 0, - items: [ - { - height: 100, - el: {type: "bi.button", text: "button1"} - }, - { - height: "fill", - el: {type: "bi.button", text: "button2"} - }, - { - height: 200, - el: {type: "bi.button", text: "button3"} - } - ] + items: [] }); }, render: function () { diff --git a/src/core/wrapper/layout/layout.window.js b/src/core/wrapper/layout/layout.window.js index 10dd2e2b4..98b5386ce 100644 --- a/src/core/wrapper/layout/layout.window.js +++ b/src/core/wrapper/layout/layout.window.js @@ -15,19 +15,9 @@ BI.WindowLayout = BI.inherit(BI.Layout, { rgap: 0, tgap: 0, bgap: 0, - columnSize: [100, "fill", 200], - rowSize: [100, "fill"], - items: [[ - { - el: {type: "bi.button", text: "button1"} - }, - { - el: {type: "bi.button", text: "button2"} - }, - { - el: {type: "bi.button", text: "button3"} - } - ]] + columnSize: [], + rowSize: [], + items: [] }); }, render: function () {