Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #393 in FUI/fineui from ~FAY/fineui:master to master 

* commit '8e831fa08ad7165b821913b981ef43eb05baeed2':
  dist
  update
es6
guy 7 years ago
parent
6f341421a9 8e831fa08a
commit
79466b7306
4 changed files with 12 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      dist/bundle.js
  2. 5
      dist/case.js
  3. 5
      dist/fineui.js
  4. 5
      src/case/table/table.dynamicsummarylayertree.js

5
dist/bundle.js vendored
Unescape View File

@ -84515,17 +84515,18 @@ BI.DynamicSummaryLayerTreeTable = BI.inherit(BI.Widget, {
var c = [crossHeader[row]]; var c = [crossHeader[row]];
result.push(c.concat(node || [])); result.push(c.concat(node || []));
}); });
var rowHeaderCreator = BI.isFunction(o.rowHeaderCreator) ? o.rowHeaderCreator() : o.rowHeaderCreator;
if (header && header.length > 0) { if (header && header.length > 0) {
var newHeader = this._formatColumns(header); var newHeader = this._formatColumns(header);
var deep = this._getHDeep(); var deep = this._getHDeep();
if (deep <= 0) { if (deep <= 0) {
newHeader.unshift(o.rowHeaderCreator || { newHeader.unshift(rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter
}); });
} else { } else {
newHeader[0] = o.rowHeaderCreator || { newHeader[0] = rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter

5
dist/case.js vendored
Unescape View File

@ -12042,17 +12042,18 @@ BI.DynamicSummaryLayerTreeTable = BI.inherit(BI.Widget, {
var c = [crossHeader[row]]; var c = [crossHeader[row]];
result.push(c.concat(node || [])); result.push(c.concat(node || []));
}); });
var rowHeaderCreator = BI.isFunction(o.rowHeaderCreator) ? o.rowHeaderCreator() : o.rowHeaderCreator;
if (header && header.length > 0) { if (header && header.length > 0) {
var newHeader = this._formatColumns(header); var newHeader = this._formatColumns(header);
var deep = this._getHDeep(); var deep = this._getHDeep();
if (deep <= 0) { if (deep <= 0) {
newHeader.unshift(o.rowHeaderCreator || { newHeader.unshift(rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter
}); });
} else { } else {
newHeader[0] = o.rowHeaderCreator || { newHeader[0] = rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter

5
dist/fineui.js vendored
Unescape View File

@ -84758,17 +84758,18 @@ BI.DynamicSummaryLayerTreeTable = BI.inherit(BI.Widget, {
var c = [crossHeader[row]]; var c = [crossHeader[row]];
result.push(c.concat(node || [])); result.push(c.concat(node || []));
}); });
var rowHeaderCreator = BI.isFunction(o.rowHeaderCreator) ? o.rowHeaderCreator() : o.rowHeaderCreator;
if (header && header.length > 0) { if (header && header.length > 0) {
var newHeader = this._formatColumns(header); var newHeader = this._formatColumns(header);
var deep = this._getHDeep(); var deep = this._getHDeep();
if (deep <= 0) { if (deep <= 0) {
newHeader.unshift(o.rowHeaderCreator || { newHeader.unshift(rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter
}); });
} else { } else {
newHeader[0] = o.rowHeaderCreator || { newHeader[0] = rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter

5
src/case/table/table.dynamicsummarylayertree.js
Unescape View File

@ -68,17 +68,18 @@ BI.DynamicSummaryLayerTreeTable = BI.inherit(BI.Widget, {
var c = [crossHeader[row]]; var c = [crossHeader[row]];
result.push(c.concat(node || [])); result.push(c.concat(node || []));
}); });
var rowHeaderCreator = BI.isFunction(o.rowHeaderCreator) ? o.rowHeaderCreator() : o.rowHeaderCreator;
if (header && header.length > 0) { if (header && header.length > 0) {
var newHeader = this._formatColumns(header); var newHeader = this._formatColumns(header);
var deep = this._getHDeep(); var deep = this._getHDeep();
if (deep <= 0) { if (deep <= 0) {
newHeader.unshift(o.rowHeaderCreator || { newHeader.unshift(rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter
}); });
} else { } else {
newHeader[0] = o.rowHeaderCreator || { newHeader[0] = rowHeaderCreator || {
type: "bi.table_style_cell", type: "bi.table_style_cell",
text: BI.i18nText("BI-Row_Header"), text: BI.i18nText("BI-Row_Header"),
styleGetter: o.headerCellStyleGetter styleGetter: o.headerCellStyleGetter

Write Preview
Loading…
Cancel
Save