Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fui

es6
windy 6 years ago
parent
commit
803ddff542
  1. 4
      demo/js/category/largeTable/largeTable.js
  2. 1
      demo/js/category/largeTable/sequenceheadercell.normal.js
  3. 9
      dist/bundle.js
  4. 5
      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

4
demo/js/category/largeTable/largeTable.js

@ -48,7 +48,8 @@ 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 () {
return {
type: "bi.normal_sequence_header_cell", type: "bi.normal_sequence_header_cell",
styleGetter: function () { styleGetter: function () {
return { return {
@ -57,6 +58,7 @@ Demo.Face = BI.inherit(BI.Widget, {
fontWeight: "bold" 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

@ -87577,7 +87577,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -87795,9 +87795,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")
}, },
@ -104263,7 +104264,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -104346,7 +104347,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
dist/demo.js vendored

@ -4667,7 +4667,8 @@ 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 () {
return {
type: "bi.normal_sequence_header_cell", type: "bi.normal_sequence_header_cell",
styleGetter: function () { styleGetter: function () {
return { return {
@ -4676,6 +4677,7 @@ BI.shortcut("bi.detail_table_header", BI.DetailTableHeader);Demo.Face = BI.inher
fontWeight: "bold" 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

@ -87820,7 +87820,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -88038,9 +88038,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")
}, },
@ -104506,7 +104507,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -104589,7 +104590,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")
}, },
@ -16701,7 +16702,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
headerRowSize: 25, headerRowSize: 25,
rowSize: 25, rowSize: 25,
sequenceHeaderCreator: null, sequenceHeaderCreator: BI.emptyFn,
header: [], header: [],
items: [], // 二维数组 items: [], // 二维数组
@ -16784,7 +16785,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