diff --git a/demo/js/category/largeTable/largeTable.js b/demo/js/category/largeTable/largeTable.js index e664d84867..6bcae8490d 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 0e37428ae1..03233f4a39 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/dist/bundle.js b/dist/bundle.js index fe5dbaf3b6..07296baa7c 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -87579,7 +87579,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -87797,9 +87797,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") }, @@ -103298,7 +103299,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -103381,7 +103382,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 d8323e0a6c..d885e983d8 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 cdfb94fc57..9685f918d4 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -87822,7 +87822,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -88040,9 +88040,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") }, @@ -103541,7 +103542,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -103624,7 +103625,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 47881e3dbc..0278e2762e 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") }, @@ -15734,7 +15735,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { headerRowSize: 25, rowSize: 25, - sequenceHeaderCreator: null, + sequenceHeaderCreator: BI.emptyFn, header: [], items: [], // 二维数组 @@ -15817,7 +15818,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/listnumber.sequencetable.js b/src/widget/sequencetable/listnumber.sequencetable.js index 942e4daf6a..b16d083ec2 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 efe15c5fd5..863328dcf5 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") },