Browse Source

Merge pull request #410 in FUI/fineui from ~YOUNG/fineui:master to master

* commit '7cd3dc244fb39ced3b015fe4bb48f5720629e946':
  update
  表格序号
es6
guy 7 years ago
parent
commit
9fc5ee9670
  1. 20
      demo/js/category/largeTable/largeTable.js
  2. 1
      demo/js/category/largeTable/sequenceheadercell.normal.js
  3. 9
      dist/bundle.js
  4. 21
      dist/demo.js
  5. 9
      dist/fineui.js
  6. 9
      dist/widget.js
  7. 4
      src/widget/sequencetable/listnumber.sequencetable.js
  8. 5
      src/widget/sequencetable/treenumber.sequencetable.js

20
demo/js/category/largeTable/largeTable.js

@ -48,15 +48,17 @@ Demo.Face = BI.inherit(BI.Widget, {
sequence: { sequence: {
type: "bi.sequence_table_list_number", type: "bi.sequence_table_list_number",
pageSize: 100, pageSize: 100,
sequenceHeaderCreator: { sequenceHeaderCreator: function () {
type: "bi.normal_sequence_header_cell", return {
styleGetter: function () { type: "bi.normal_sequence_header_cell",
return { styleGetter: function () {
background: "rgb(4, 177, 194)", return {
color: "#ffffff", background: "rgb(4, 177, 194)",
fontWeight: "bold" color: "#ffffff",
}; fontWeight: "bold"
} };
}
};
} }
}, },
itemsCreator: function (op, populate) { itemsCreator: function (op, populate) {

1
demo/js/category/largeTable/sequenceheadercell.normal.js

@ -16,6 +16,7 @@ BI.NormalSequenceHeaderCell = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
element: this, element: this,
textAlign: "left", textAlign: "left",
height: o.height,
forceCenter: true, forceCenter: true,
hgap: 5, hgap: 5,
text: BI.i18nText("BI-Number_Index") text: BI.i18nText("BI-Number_Index")

9
dist/bundle.js vendored

@ -87579,7 +87579,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -87797,9 +87797,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
height: this._getHeaderHeight() - 2,
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,
text: BI.i18nText("BI-Number_Index") text: BI.i18nText("BI-Number_Index")
}, },
@ -103298,7 +103299,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -103381,7 +103382,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,

21
dist/demo.js vendored

@ -4667,15 +4667,17 @@ BI.shortcut("bi.detail_table_header", BI.DetailTableHeader);Demo.Face = BI.inher
sequence: { sequence: {
type: "bi.sequence_table_list_number", type: "bi.sequence_table_list_number",
pageSize: 100, pageSize: 100,
sequenceHeaderCreator: { sequenceHeaderCreator: function () {
type: "bi.normal_sequence_header_cell", return {
styleGetter: function () { type: "bi.normal_sequence_header_cell",
return { styleGetter: function () {
background: "rgb(4, 177, 194)", return {
color: "#ffffff", background: "rgb(4, 177, 194)",
fontWeight: "bold" color: "#ffffff",
}; fontWeight: "bold"
} };
}
};
} }
}, },
itemsCreator: function (op, populate) { itemsCreator: function (op, populate) {
@ -4769,6 +4771,7 @@ BI.NormalSequenceHeaderCell = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
element: this, element: this,
textAlign: "left", textAlign: "left",
height: o.height,
forceCenter: true, forceCenter: true,
hgap: 5, hgap: 5,
text: BI.i18nText("BI-Number_Index") text: BI.i18nText("BI-Number_Index")

9
dist/fineui.js vendored

@ -87822,7 +87822,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -88040,9 +88040,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
height: this._getHeaderHeight() - 2,
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,
text: BI.i18nText("BI-Number_Index") text: BI.i18nText("BI-Number_Index")
}, },
@ -103541,7 +103542,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -103624,7 +103625,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,

9
dist/widget.js vendored

@ -15,7 +15,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -233,9 +233,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
height: this._getHeaderHeight() - 2,
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,
text: BI.i18nText("BI-Number_Index") text: BI.i18nText("BI-Number_Index")
}, },
@ -15734,7 +15735,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -15817,7 +15818,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,

4
src/widget/sequencetable/listnumber.sequencetable.js

@ -15,7 +15,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -98,7 +98,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,

5
src/widget/sequencetable/treenumber.sequencetable.js

@ -15,7 +15,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -233,9 +233,10 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
element: this.headerContainer, element: this.headerContainer,
items: [{ items: [{
el: o.sequenceHeaderCreator || { el: o.sequenceHeaderCreator() || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
cls: "sequence-table-title-cell", cls: "sequence-table-title-cell",
height: this._getHeaderHeight() - 2,
styleGetter: o.headerCellStyleGetter, styleGetter: o.headerCellStyleGetter,
text: BI.i18nText("BI-Number_Index") text: BI.i18nText("BI-Number_Index")
}, },

Loading…
Cancel
Save