Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/custom header #591

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/custom header #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82cc418
feat(cell-header): add custom header option
tomieric Apr 26, 2022
e555553
fix(action-button): revert github action button
tomieric Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,17 @@
2: { width: 200 },
},
rows,
}, { name: 'sheet-test', rows: rows10 }]).change((cdata) => {
}, {
name: 'sheet-test',
rows: rows10,
},{
name: 'sheet-custom-header',
rows: rows10,
headerCellRender: function(text, ii) {
return '第' + text + '列';
},
headerCellBackground: 'red'
}]).change((cdata) => {
// console.log(cdata);
console.log('>>>', xs.getData());
});
Expand Down
17 changes: 10 additions & 7 deletions src/component/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { getFontSizePxByPt } from '../core/font';
import _cell from '../core/cell';
import { formulam } from '../core/formula';
import { formatm } from '../core/format';
import { isFunction } from '../core/helper';

import {
Draw, DrawBox, thinLineWidth, npx,
Expand Down Expand Up @@ -184,7 +185,7 @@ function renderSelectedHeaderCell(x, y, w, h) {
// h: the fixed height of header
// tx: moving distance on x-axis
// ty: moving distance on y-axis
function renderFixedHeaders(type, viewRange, w, h, tx, ty) {
function renderFixedHeaders(type, viewRange, w, h, tx, ty, headerCellRender) {
const { draw, data } = this;
const sumHeight = viewRange.h; // rows.sumHeight(viewRange.sri, viewRange.eri + 1);
const sumWidth = viewRange.w; // cols.sumWidth(viewRange.sci, viewRange.eci + 1);
Expand Down Expand Up @@ -233,7 +234,8 @@ function renderFixedHeaders(type, viewRange, w, h, tx, ty) {
if (sci <= ii && ii < eci + 1) {
renderSelectedHeaderCell.call(this, x, 0, colWidth, h);
}
draw.fillText(stringAt(ii), x + (colWidth / 2), h / 2);
const text = isFunction(headerCellRender) ? headerCellRender(stringAt(ii), ii) : stringAt(ii);
draw.fillText(text, x + (colWidth / 2), h / 2);
if (i > 0 && data.cols.isHide(i - 1)) {
draw.save();
draw.attr({ strokeStyle: '#c6c6c6' });
Expand Down Expand Up @@ -314,7 +316,7 @@ class Table {
render() {
// resize canvas
const { data } = this;
const { rows, cols } = data;
const { rows, cols, headerCellRender } = data;
// fixed width of header
const fw = cols.indexWidth;
// fixed height of header
Expand All @@ -331,7 +333,8 @@ class Table {
// 1
renderContentGrid.call(this, viewRange, fw, fh, tx, ty);
renderContent.call(this, viewRange, fw, fh, -x, -y);
renderFixedHeaders.call(this, 'all', viewRange, fw, fh, tx, ty);

renderFixedHeaders.call(this, 'all', viewRange, fw, fh, tx, ty, headerCellRender);
renderFixedLeftTopCell.call(this, fw, fh);
const [fri, fci] = data.freeze;
if (fri > 0 || fci > 0) {
Expand All @@ -343,7 +346,7 @@ class Table {
vr.h = ty;
renderContentGrid.call(this, vr, fw, fh, tx, 0);
renderContent.call(this, vr, fw, fh, -x, 0);
renderFixedHeaders.call(this, 'top', vr, fw, fh, tx, 0);
renderFixedHeaders.call(this, 'top', vr, fw, fh, tx, 0, headerCellRender);
}
// 3
if (fci > 0) {
Expand All @@ -352,13 +355,13 @@ class Table {
vr.eci = fci - 1;
vr.w = tx;
renderContentGrid.call(this, vr, fw, fh, 0, ty);
renderFixedHeaders.call(this, 'left', vr, fw, fh, 0, ty);
renderFixedHeaders.call(this, 'left', vr, fw, fh, 0, ty, headerCellRender);
renderContent.call(this, vr, fw, fh, 0, -y);
}
// 4
const freezeViewRange = data.freezeViewRange();
renderContentGrid.call(this, freezeViewRange, fw, fh, 0, 0);
renderFixedHeaders.call(this, 'all', freezeViewRange, fw, fh, 0, 0);
renderFixedHeaders.call(this, 'all', freezeViewRange, fw, fh, 0, 0, headerCellRender);
renderContent.call(this, freezeViewRange, fw, fh, 0, 0);
// 5
renderFreezeHighlightLine.call(this, fw, fh, tx, ty);
Expand Down
9 changes: 9 additions & 0 deletions src/core/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ export function numberCalc(type, a1, a2) {
return ret.toFixed(Math.max(al1, al2));
}

function getObjType(o) {
return Object.prototype.toString.call(o);
}

export function isFunction(fn) {
return getObjType(fn) === '[object Function]';
}

export default {
cloneDeep,
merge: (...sources) => mergeDeep({}, ...sources),
Expand All @@ -144,4 +152,5 @@ export default {
rangeReduceIf,
deleteProperty,
numberCalc,
isFunction,
};