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

Jump to bottom

Fix multi lvl categories in embedded .xlsx #1330

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

Fix multi lvl categories in embedded .xlsx #1330

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03ac4e3
Fix multi lvl categories in embedded .xlsx
MariusOpeepl Apr 9, 2024
ec485ad
Fixed duplicated shared strings
MariusOpeepl May 7, 2024
40804ae
Minor refactoring and fixed some oversights
MariusOpeepl May 13, 2024
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
42 changes: 32 additions & 10 deletions src/gen-charts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ export async function createExcelWorksheet (chartObject: ISlideRelChart, zip: JS
)
}

// dictionary of shared strings mapped to their indexes indexes
const sharedStringsObject: Record<string, number> = {}

// sharedStrings.xml
{
// A: Start XML
Expand All @@ -148,6 +151,7 @@ export async function createExcelWorksheet (chartObject: ISlideRelChart, zip: JS
data[0].labels.forEach(arrLabel => (totCount += arrLabel.filter(label => label && label !== '').length))
strSharedStrings += `<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${totCount}" uniqueCount="${totCount}">`
strSharedStrings += '<si><t/></si>'
sharedStringsObject[''] = 0
} else {
// series names + all labels of one series + number of label groups (data.labels.length) of one series (i.e. how many times the blank string is used)
const totCount = data.length + data[0].labels.length * data[0].labels[0].length + data[0].labels.length
Expand All @@ -157,20 +161,37 @@ export async function createExcelWorksheet (chartObject: ISlideRelChart, zip: JS
strSharedStrings += `<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${totCount}" uniqueCount="${unqCount}">`
// B: Add 'blank' for A1, B1, ..., of every label group inside data[n].labels
strSharedStrings += '<si><t xml:space="preserve"></t></si>'
sharedStringsObject[''] = 0
}

// C: Add `name`/Series
if (chartObject.opts._type === CHART_TYPE.BUBBLE || chartObject.opts._type === CHART_TYPE.BUBBLE3D) {
data.forEach((objData, idx) => {
if (idx === 0) strSharedStrings += '<si><t>X-Axis</t></si>'
else {
strSharedStrings += `<si><t>${encodeXmlEntities(objData.name || `Y-Axis${idx}`)}</t></si>`
strSharedStrings += `<si><t>${encodeXmlEntities(`Size${idx}`)}</t></si>`
if (idx === 0) {
const sharedString = 'X-Axis'
if (!sharedStringsObject[sharedString]) {
strSharedStrings += `<si><t>${sharedString}</t></si>`
sharedStringsObject[sharedString] = Object.keys(sharedStringsObject).length
}
} else {
const sharedString = encodeXmlEntities(objData.name || `Y-Axis${idx}`)
if (!sharedStringsObject[sharedString]) {
strSharedStrings += `<si><t>${sharedString}</t></si>`
sharedStringsObject[sharedString] = Object.keys(sharedStringsObject).length
}

const sizeSharedString = encodeXmlEntities(`Size${idx}`)
strSharedStrings += `<si><t>${sizeSharedString}</t></si>`
sharedStringsObject[sizeSharedString] = Object.keys(sharedStringsObject).length
}
})
} else {
data.forEach(objData => {
strSharedStrings += `<si><t>${encodeXmlEntities((objData.name || ' ').replace('X-Axis', 'X-Values'))}</t></si>`
const sharedString = encodeXmlEntities((objData.name || ' ').replace('X-Axis', 'X-Values'))
if (!sharedStringsObject[sharedString]) {
strSharedStrings += `<si><t>${sharedString}</t></si>`
sharedStringsObject[sharedString] = Object.keys(sharedStringsObject).length
}
})
}

Expand All @@ -184,7 +205,11 @@ export async function createExcelWorksheet (chartObject: ISlideRelChart, zip: JS
labelsGroup
.filter(label => label && label !== '')
.forEach(label => {
strSharedStrings += `<si><t>${encodeXmlEntities(label)}</t></si>`
const sharedString = encodeXmlEntities(label)
if (!sharedStringsObject[sharedString]) {
strSharedStrings += `<si><t>${sharedString}</t></si>`
sharedStringsObject[sharedString] = Object.keys(sharedStringsObject).length
}
})
})
}
Expand Down Expand Up @@ -460,7 +485,6 @@ export async function createExcelWorksheet (chartObject: ISlideRelChart, zip: JS

// WIP: FIXME:
// B: add a col for each label/cat
let totLabels = TOT_SER
const revLabelGroups = data[0].labels.slice().reverse()
revLabelGroups.forEach((labelsGroup, idy) => {
/**
Expand All @@ -471,9 +495,7 @@ export async function createExcelWorksheet (chartObject: ISlideRelChart, zip: JS
*/
const colLabel = labelsGroup[idx]
if (colLabel) {
const totGrpLbls = idy === 0 ? 1 : revLabelGroups[idy - 1].filter(label => label && label !== '').length // get unique label so we can add to get proper shared-string #
totLabels += totGrpLbls
strSheetXml += `<c r="${getExcelColName(idx + 1 + idy)}${idx + 2}" t="s"><v>${totLabels}</v></c>`
strSheetXml += `<c r="${getExcelColName(idy + 1)}${idx + 2}" t="s"><v>${sharedStringsObject[colLabel]}</v></c>`
}
})

Expand Down