From 95ec11b82453f9e8a6d73858cce85012a140fce1 Mon Sep 17 00:00:00 2001 From: zsmj Date: Sat, 22 Oct 2022 21:11:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=5FinitElementHeight?= =?UTF-8?q?=E5=92=8C=5FinitElementWidth=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/4.widget.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/4.widget.js b/src/core/4.widget.js index 1873e0b44..8be3a9058 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -289,14 +289,14 @@ _initElementWidth: function () { var o = this.options; if (BI.isWidthOrHeight(o.width)) { - this.element.css("width", BI.toPix(o.width)); + this.element.css("width", BI.isNumber(o.width) ? BI.pixFormat(o.width) : o.width); } }, _initElementHeight: function () { var o = this.options; if (BI.isWidthOrHeight(o.height)) { - this.element.css("height", BI.toPix(o.height)); + this.element.css("height", BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height); } }, From 5a9c3b489a5fc5fa48072d637a0a8a5d614bc1eb Mon Sep 17 00:00:00 2001 From: zsmj Date: Sun, 23 Oct 2022 11:26:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 2 +- .../multiselect/search/multiselect.search.insert.pane.js | 4 ++-- src/widget/multiselectlist/multiselectlist.insert.js | 7 ++----- .../search/singleselect.search.pane.insert.js | 7 ++++--- .../singleselect/search/singleselect.search.pane.js | 6 +++--- src/widget/singleselect/singleselectlist.insert.js | 8 +++----- src/widget/year/popup.year.js | 4 ++-- 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 5077d7866..1006a0f85 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -8,7 +8,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { }, props: { - baseCls: "bi-dynamic-date-combo", + baseCls: "bi-dynamic-date--time-combo", height: 24, minDate: "1900-01-01", maxDate: "2099-12-31", diff --git a/src/widget/multiselect/search/multiselect.search.insert.pane.js b/src/widget/multiselect/search/multiselect.search.insert.pane.js index e72b64661..d459dc73a 100644 --- a/src/widget/multiselect/search/multiselect.search.insert.pane.js +++ b/src/widget/multiselect/search/multiselect.search.insert.pane.js @@ -54,11 +54,11 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, { }); this.resizer = BI.createWidget({ - type: "bi.vtape", + type: "bi.vertical_fill", + rowSize: ["", "fill"], element: this, items: [{ el: this.addNotMatchTip, - height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, }, { el: this.loader, }], diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js index cc905c88f..8b6e8785f 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.js +++ b/src/widget/multiselectlist/multiselectlist.insert.js @@ -74,7 +74,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, { ref: function (ref) { self.editor = ref; }, - height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT, }, isAutoSearch: false, isAutoSync: false, @@ -83,7 +82,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, { }, adapter: this.adapter, popup: this.searcherPane, - height: 200, masker: false, listeners: [{ eventName: BI.Searcher.EVENT_START, @@ -168,14 +166,13 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, { }); BI.createWidget({ - type: "bi.vtape", + type: "bi.vertical_fill", + rowSize: ["", "fill"], element: this, items: [{ el: this.trigger, - height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT, }, { el: this.adapter, - height: "fill" }] }); BI.createWidget({ diff --git a/src/widget/singleselect/search/singleselect.search.pane.insert.js b/src/widget/singleselect/search/singleselect.search.pane.insert.js index 95fd13cc3..6c1e49af2 100644 --- a/src/widget/singleselect/search/singleselect.search.pane.insert.js +++ b/src/widget/singleselect/search/singleselect.search.pane.insert.js @@ -15,7 +15,7 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectSearchInsertPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-single-select-search-pane bi-card", + baseCls: "bi-single-select-search-pane-insert bi-card", allowNoSelect: false, itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, @@ -53,7 +53,8 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, { }); this.resizer = BI.createWidget({ - type: "bi.vtape", + type: "bi.vertical_fill", + rowSize: ["", "fill"], element: this, items: [{ type: "bi.vertical", @@ -92,4 +93,4 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, { BI.SingleSelectSearchInsertPane.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.single_select_search_insert_pane", BI.SingleSelectSearchInsertPane); \ No newline at end of file +BI.shortcut("bi.single_select_search_insert_pane", BI.SingleSelectSearchInsertPane); diff --git a/src/widget/singleselect/search/singleselect.search.pane.js b/src/widget/singleselect/search/singleselect.search.pane.js index e5364e261..ea923c5f6 100644 --- a/src/widget/singleselect/search/singleselect.search.pane.js +++ b/src/widget/singleselect/search/singleselect.search.pane.js @@ -53,11 +53,11 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, { }); this.resizer = BI.createWidget({ - type: "bi.vtape", + type: "bi.vertical_fill", + rowSize: ["", "fill"], element: this, items: [{ el: this.tooltipClick, - height: 0 }, { el: this.loader }] @@ -98,4 +98,4 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, { BI.SingleSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.single_select_search_pane", BI.SingleSelectSearchPane); \ No newline at end of file +BI.shortcut("bi.single_select_search_pane", BI.SingleSelectSearchPane); diff --git a/src/widget/singleselect/singleselectlist.insert.js b/src/widget/singleselect/singleselectlist.insert.js index f9bce32e6..9e953468c 100644 --- a/src/widget/singleselect/singleselectlist.insert.js +++ b/src/widget/singleselect/singleselectlist.insert.js @@ -6,7 +6,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, { _defaultConfig: function () { return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-insert-list", + baseCls: "bi-single-select-insert-list", allowNoSelect: false, itemsCreator: BI.emptyFn, itemWrapper: BI.emptyFn, @@ -81,7 +81,6 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, { }, adapter: this.adapter, popup: this.searcherPane, - height: 200, masker: false, value: o.value, listeners: [{ @@ -124,14 +123,13 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, { }); BI.createWidget({ - type: "bi.vtape", + type: "bi.vertical_fill", + rowSize: ["", "fill"], element: this, items: [{ el: this.trigger, - height: 24 }, { el: this.adapter, - height: "fill" }] }); BI.createWidget({ diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js index 6a7c883c6..67d0cfa90 100644 --- a/src/widget/year/popup.year.js +++ b/src/widget/year/popup.year.js @@ -11,7 +11,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { }, props: { - baseCls: "bi-year-popup", + baseCls: "bi-dynamic-year-popup", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, @@ -243,4 +243,4 @@ BI.DynamicYearPopup.BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE"; BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE = "BUTTON_lABEL_EVENT_CHANGE"; BI.DynamicYearPopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE"; BI.DynamicYearPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup); \ No newline at end of file +BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup); From cbf5ee229588092e2116306ba5cfb2340b8310b0 Mon Sep 17 00:00:00 2001 From: zsmj Date: Sun, 23 Oct 2022 11:26:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=E6=97=A0JIRA=20fix:=20=5FinitEle?= =?UTF-8?q?mentHeight=E5=92=8C=5FinitElementWidth=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 95ec11b82453f9e8a6d73858cce85012a140fce1. --- src/core/4.widget.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/4.widget.js b/src/core/4.widget.js index 8be3a9058..1873e0b44 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -289,14 +289,14 @@ _initElementWidth: function () { var o = this.options; if (BI.isWidthOrHeight(o.width)) { - this.element.css("width", BI.isNumber(o.width) ? BI.pixFormat(o.width) : o.width); + this.element.css("width", BI.toPix(o.width)); } }, _initElementHeight: function () { var o = this.options; if (BI.isWidthOrHeight(o.height)) { - this.element.css("height", BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height); + this.element.css("height", BI.toPix(o.height)); } },