From 6f833a38fcd4152a769a3a7facfba2f33c2efb85 Mon Sep 17 00:00:00 2001 From: Young Date: Fri, 18 May 2018 11:13:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/category/largeTable/largeTable.js | 20 ++++++++++--------- .../largeTable/sequenceheadercell.normal.js | 1 + .../sequencetable/listnumber.sequencetable.js | 4 ++-- .../sequencetable/treenumber.sequencetable.js | 5 +++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/demo/js/category/largeTable/largeTable.js b/demo/js/category/largeTable/largeTable.js index e664d8486..6bcae8490 100644 --- a/demo/js/category/largeTable/largeTable.js +++ b/demo/js/category/largeTable/largeTable.js @@ -48,15 +48,17 @@ Demo.Face = BI.inherit(BI.Widget, { sequence: { type: "bi.sequence_table_list_number", pageSize: 100, - sequenceHeaderCreator: { - type: "bi.normal_sequence_header_cell", - styleGetter: function () { - return { - background: "rgb(4, 177, 194)", - color: "#ffffff", - fontWeight: "bold" - }; - } + sequenceHeaderCreator: function () { + return { + type: "bi.normal_sequence_header_cell", + styleGetter: function () { + return { + background: "rgb(4, 177, 194)", + color: "#ffffff", + fontWeight: "bold" + }; + } + }; } }, itemsCreator: function (op, populate) { diff --git a/demo/js/category/largeTable/sequenceheadercell.normal.js b/demo/js/category/largeTable/sequenceheadercell.normal.js index 0e37428ae..03233f4a3 100644 --- a/demo/js/category/largeTable/sequenceheadercell.normal.js +++ b/demo/js/category/largeTable/sequenceheadercell.normal.js @@ -16,6 +16,7 @@ BI.NormalSequenceHeaderCell = BI.inherit(BI.Widget, { type: "bi.label", element: this, textAlign: "left", + height: o.height, forceCenter: true, hgap: 5, text: BI.i18nText("BI-Number_Index") diff --git a/src/widget/sequencetable/listnumber.sequencetable.js b/src/widget/sequencetable/listnumber.sequencetable.js index 942e4daf6..b16d083ec 100644 --- a/src/widget/sequencetable/listnumber.sequencetable.js +++ b/src/widget/sequencetable/listnumber.sequencetable.js @@ -15,7 +15,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -98,7 +98,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", styleGetter: o.headerCellStyleGetter, diff --git a/src/widget/sequencetable/treenumber.sequencetable.js b/src/widget/sequencetable/treenumber.sequencetable.js index efe15c5fd..863328dcf 100644 --- a/src/widget/sequencetable/treenumber.sequencetable.js +++ b/src/widget/sequencetable/treenumber.sequencetable.js @@ -15,7 +15,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -233,9 +233,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", + height: this._getHeaderHeight() - 2, styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }, From 1dd03282cebe9097523c7d4d020d445143dc459d Mon Sep 17 00:00:00 2001 From: Young Date: Fri, 18 May 2018 11:14:08 +0800 Subject: [PATCH 2/2] update --- dist/bundle.js | 9 +++++---- dist/demo.js | 21 ++++++++++++--------- dist/fineui.js | 9 +++++---- dist/widget.js | 9 +++++---- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 7db0a7744..fc0be55bf 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -87578,7 +87578,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -87796,9 +87796,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", + height: this._getHeaderHeight() - 2, styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }, @@ -103296,7 +103297,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -103379,7 +103380,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", styleGetter: o.headerCellStyleGetter, diff --git a/dist/demo.js b/dist/demo.js index c250a33de..2cf231e66 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -4667,15 +4667,17 @@ BI.shortcut("bi.detail_table_header", BI.DetailTableHeader);Demo.Face = BI.inher sequence: { type: "bi.sequence_table_list_number", pageSize: 100, - sequenceHeaderCreator: { - type: "bi.normal_sequence_header_cell", - styleGetter: function () { - return { - background: "rgb(4, 177, 194)", - color: "#ffffff", - fontWeight: "bold" - }; - } + sequenceHeaderCreator: function () { + return { + type: "bi.normal_sequence_header_cell", + styleGetter: function () { + return { + background: "rgb(4, 177, 194)", + color: "#ffffff", + fontWeight: "bold" + }; + } + }; } }, itemsCreator: function (op, populate) { @@ -4769,6 +4771,7 @@ BI.NormalSequenceHeaderCell = BI.inherit(BI.Widget, { type: "bi.label", element: this, textAlign: "left", + height: o.height, forceCenter: true, hgap: 5, text: BI.i18nText("BI-Number_Index") diff --git a/dist/fineui.js b/dist/fineui.js index 34d8de14e..7562b3293 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -87821,7 +87821,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -88039,9 +88039,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", + height: this._getHeaderHeight() - 2, styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }, @@ -103539,7 +103540,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -103622,7 +103623,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", styleGetter: o.headerCellStyleGetter, diff --git a/dist/widget.js b/dist/widget.js index e9cf95da5..3da69f6d0 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -15,7 +15,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -233,9 +233,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", + height: this._getHeaderHeight() - 2, styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }, @@ -15733,7 +15734,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -15816,7 +15817,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { type: "bi.absolute", element: this.headerContainer, items: [{ - el: o.sequenceHeaderCreator || { + el: o.sequenceHeaderCreator() || { type: "bi.table_style_cell", cls: "sequence-table-title-cell", styleGetter: o.headerCellStyleGetter,