npm - @visactor/vtable - Versions diffs - 1.5.7-alpha.1 → 1.5.7 - Mend

@visactor/vtable 1.5.7-alpha.1 → 1.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (239) hide show

package/cjs/ListTable-all.js +5 -5
package/cjs/ListTable-all.js.map +1 -1
package/cjs/ListTable.d.ts +3 -0
package/cjs/ListTable.js +41 -284
package/cjs/ListTable.js.map +1 -1
package/cjs/body-helper/style/Style.d.ts +2 -2
package/cjs/body-helper/style/Style.js.map +1 -1
package/cjs/components/title/title.js +3 -1
package/cjs/components/title/title.js.map +1 -1
package/cjs/core/BaseTable.d.ts +5 -3
package/cjs/core/BaseTable.js +13 -83
package/cjs/core/BaseTable.js.map +1 -1
package/cjs/core/group-helper.d.ts +6 -0
package/cjs/core/group-helper.js +22 -0
package/cjs/core/group-helper.js.map +1 -0
package/cjs/core/record-helper.d.ts +8 -0
package/cjs/core/record-helper.js +337 -0
package/cjs/core/record-helper.js.map +1 -0
package/cjs/core/style-helper.d.ts +3 -0
package/cjs/core/style-helper.js +110 -0
package/cjs/core/style-helper.js.map +1 -0
package/cjs/core/tableHelper.d.ts +0 -2
package/cjs/core/tableHelper.js +15 -19
package/cjs/core/tableHelper.js.map +1 -1
package/cjs/data/CachedDataSource.d.ts +10 -1
package/cjs/data/CachedDataSource.js +102 -3
package/cjs/data/CachedDataSource.js.map +1 -1
package/cjs/dataset/dataset.js +0 -1
package/cjs/edit/edit-manager.js +2 -1
package/cjs/event/event.js +3 -1
package/cjs/event/event.js.map +1 -1
package/cjs/header-helper/style/Style.d.ts +2 -2
package/cjs/header-helper/style/Style.js.map +1 -1
package/cjs/index.d.ts +3 -1
package/cjs/index.js +25 -2
package/cjs/index.js.map +1 -1
package/cjs/layout/cell-range/simple-cell-range.d.ts +4 -0
package/cjs/layout/cell-range/simple-cell-range.js +106 -0
package/cjs/layout/cell-range/simple-cell-range.js.map +1 -0
package/cjs/layout/layout-helper.js +2 -2
package/cjs/layout/layout-helper.js.map +1 -1
package/cjs/layout/pivot-header-layout.js +4 -2
package/cjs/layout/pivot-header-layout.js.map +1 -1
package/cjs/layout/row-height-map.js +1 -0
package/cjs/layout/simple-header-layout.d.ts +1 -2
package/cjs/layout/simple-header-layout.js +6 -90
package/cjs/layout/simple-header-layout.js.map +1 -1
package/cjs/plugins/icons.js +1 -1
package/cjs/plugins/list-tree-stick-cell.d.ts +16 -0
package/cjs/plugins/list-tree-stick-cell.js +178 -0
package/cjs/plugins/list-tree-stick-cell.js.map +1 -0
package/cjs/plugins/themes.js +1 -1
package/cjs/scenegraph/component/custom.js +1 -1
package/cjs/scenegraph/component/custom.js.map +1 -1
package/cjs/scenegraph/graphic/contributions/group-contribution-render.js +6 -3
package/cjs/scenegraph/graphic/contributions/group-contribution-render.js.map +1 -1
package/cjs/scenegraph/graphic/contributions/rect-contribution-render.d.ts +1 -0
package/cjs/scenegraph/graphic/contributions/rect-contribution-render.js +48 -7
package/cjs/scenegraph/graphic/contributions/rect-contribution-render.js.map +1 -1
package/cjs/scenegraph/graphic/group.js +1 -1
package/cjs/scenegraph/graphic/group.js.map +1 -1
package/cjs/scenegraph/group-creater/cell-helper.d.ts +2 -1
package/cjs/scenegraph/group-creater/cell-helper.js +29 -10
package/cjs/scenegraph/group-creater/cell-helper.js.map +1 -1
package/cjs/scenegraph/group-creater/cell-type/progress-bar-cell.js +9 -1
package/cjs/scenegraph/group-creater/cell-type/progress-bar-cell.js.map +1 -1
package/cjs/scenegraph/group-creater/column-helper.js +9 -2
package/cjs/scenegraph/group-creater/column-helper.js.map +1 -1
package/cjs/scenegraph/group-creater/init-scenegraph.js +2 -2
package/cjs/scenegraph/group-creater/init-scenegraph.js.map +1 -1
package/cjs/scenegraph/layout/compute-col-width.js +2 -2
package/cjs/scenegraph/layout/compute-col-width.js.map +1 -1
package/cjs/scenegraph/layout/compute-row-height.js +2 -2
package/cjs/scenegraph/layout/compute-row-height.js.map +1 -1
package/cjs/scenegraph/layout/update-height.js +3 -1
package/cjs/scenegraph/layout/update-height.js.map +1 -1
package/cjs/scenegraph/layout/update-width.js +5 -3
package/cjs/scenegraph/layout/update-width.js.map +1 -1
package/cjs/scenegraph/scenegraph.js +54 -39
package/cjs/scenegraph/scenegraph.js.map +1 -1
package/cjs/scenegraph/stick-text/index.js +5 -6
package/cjs/scenegraph/stick-text/index.js.map +1 -1
package/cjs/scenegraph/style/frame-border.d.ts +1 -1
package/cjs/scenegraph/style/frame-border.js +27 -12
package/cjs/scenegraph/style/frame-border.js.map +1 -1
package/cjs/scenegraph/utils/get-cell-merge.js +1 -1
package/cjs/scenegraph/utils/get-cell-merge.js.map +1 -1
package/cjs/scenegraph/utils/get-hierarchy-offset.js +6 -8
package/cjs/scenegraph/utils/get-hierarchy-offset.js.map +1 -1
package/cjs/scenegraph/utils/text-icon-layout.js +6 -4
package/cjs/scenegraph/utils/text-icon-layout.js.map +1 -1
package/cjs/themes/theme.d.ts +2 -0
package/cjs/themes/theme.js +13 -4
package/cjs/themes/theme.js.map +1 -1
package/cjs/tools/helper.d.ts +1 -1
package/cjs/tools/helper.js +3 -3
package/cjs/tools/helper.js.map +1 -1
package/cjs/ts-types/base-table.d.ts +9 -0
package/cjs/ts-types/base-table.js.map +1 -1
package/cjs/ts-types/column/style.d.ts +2 -2
package/cjs/ts-types/column/style.js.map +1 -1
package/cjs/ts-types/component/index.d.ts +1 -0
package/cjs/ts-types/component/index.js +21 -0
package/cjs/ts-types/component/index.js.map +1 -0
package/cjs/ts-types/index.d.ts +1 -0
package/cjs/ts-types/index.js +1 -1
package/cjs/ts-types/index.js.map +1 -1
package/cjs/ts-types/list-table/layout-map/api.d.ts +1 -0
package/cjs/ts-types/list-table/layout-map/api.js.map +1 -1
package/cjs/ts-types/new-data-set.d.ts +1 -0
package/cjs/ts-types/new-data-set.js.map +1 -1
package/cjs/ts-types/table-engine.d.ts +10 -0
package/cjs/ts-types/table-engine.js.map +1 -1
package/cjs/ts-types/theme.d.ts +2 -1
package/cjs/ts-types/theme.js.map +1 -1
package/cjs/vrender.d.ts +1 -1
package/cjs/vrender.js +2 -1
package/cjs/vrender.js.map +1 -1
package/dist/vtable.js +8405 -5360
package/dist/vtable.min.js +2 -2
package/es/ListTable-all.js +5 -3
package/es/ListTable-all.js.map +1 -1
package/es/ListTable.d.ts +3 -0
package/es/ListTable.js +44 -286
package/es/ListTable.js.map +1 -1
package/es/body-helper/style/Style.d.ts +2 -2
package/es/body-helper/style/Style.js.map +1 -1
package/es/components/title/title.js +3 -1
package/es/components/title/title.js.map +1 -1
package/es/core/BaseTable.d.ts +5 -3
package/es/core/BaseTable.js +16 -87
package/es/core/BaseTable.js.map +1 -1
package/es/core/group-helper.d.ts +6 -0
package/es/core/group-helper.js +14 -0
package/es/core/group-helper.js.map +1 -0
package/es/core/record-helper.d.ts +8 -0
package/es/core/record-helper.js +332 -0
package/es/core/record-helper.js.map +1 -0
package/es/core/style-helper.d.ts +3 -0
package/es/core/style-helper.js +86 -0
package/es/core/style-helper.js.map +1 -0
package/es/core/tableHelper.d.ts +0 -2
package/es/core/tableHelper.js +12 -17
package/es/core/tableHelper.js.map +1 -1
package/es/data/CachedDataSource.d.ts +10 -1
package/es/data/CachedDataSource.js +103 -0
package/es/data/CachedDataSource.js.map +1 -1
package/es/dataset/dataset.js +1 -2
package/es/edit/edit-manager.js +2 -1
package/es/event/event.js +3 -1
package/es/event/event.js.map +1 -1
package/es/header-helper/style/Style.d.ts +2 -2
package/es/header-helper/style/Style.js.map +1 -1
package/es/index.d.ts +3 -1
package/es/index.js +5 -1
package/es/index.js.map +1 -1
package/es/layout/cell-range/simple-cell-range.d.ts +4 -0
package/es/layout/cell-range/simple-cell-range.js +99 -0
package/es/layout/cell-range/simple-cell-range.js.map +1 -0
package/es/layout/layout-helper.js +2 -2
package/es/layout/layout-helper.js.map +1 -1
package/es/layout/pivot-header-layout.js +4 -2
package/es/layout/pivot-header-layout.js.map +1 -1
package/es/layout/row-height-map.js +2 -1
package/es/layout/simple-header-layout.d.ts +1 -2
package/es/layout/simple-header-layout.js +7 -89
package/es/layout/simple-header-layout.js.map +1 -1
package/es/plugins/icons.js +1 -1
package/es/plugins/list-tree-stick-cell.d.ts +16 -0
package/es/plugins/list-tree-stick-cell.js +176 -0
package/es/plugins/list-tree-stick-cell.js.map +1 -0
package/es/plugins/themes.js +1 -1
package/es/scenegraph/component/custom.js +1 -1
package/es/scenegraph/component/custom.js.map +1 -1
package/es/scenegraph/graphic/contributions/group-contribution-render.js +8 -3
package/es/scenegraph/graphic/contributions/group-contribution-render.js.map +1 -1
package/es/scenegraph/graphic/contributions/rect-contribution-render.d.ts +1 -0
package/es/scenegraph/graphic/contributions/rect-contribution-render.js +49 -5
package/es/scenegraph/graphic/contributions/rect-contribution-render.js.map +1 -1
package/es/scenegraph/graphic/group.js +1 -1
package/es/scenegraph/graphic/group.js.map +1 -1
package/es/scenegraph/group-creater/cell-helper.d.ts +2 -1
package/es/scenegraph/group-creater/cell-helper.js +23 -8
package/es/scenegraph/group-creater/cell-helper.js.map +1 -1
package/es/scenegraph/group-creater/cell-type/progress-bar-cell.js +9 -1
package/es/scenegraph/group-creater/cell-type/progress-bar-cell.js.map +1 -1
package/es/scenegraph/group-creater/column-helper.js +8 -2
package/es/scenegraph/group-creater/column-helper.js.map +1 -1
package/es/scenegraph/group-creater/init-scenegraph.js +2 -2
package/es/scenegraph/group-creater/init-scenegraph.js.map +1 -1
package/es/scenegraph/layout/compute-col-width.js +1 -3
package/es/scenegraph/layout/compute-col-width.js.map +1 -1
package/es/scenegraph/layout/compute-row-height.js +2 -2
package/es/scenegraph/layout/compute-row-height.js.map +1 -1
package/es/scenegraph/layout/update-height.js +3 -1
package/es/scenegraph/layout/update-height.js.map +1 -1
package/es/scenegraph/layout/update-width.js +5 -3
package/es/scenegraph/layout/update-width.js.map +1 -1
package/es/scenegraph/scenegraph.js +54 -39
package/es/scenegraph/scenegraph.js.map +1 -1
package/es/scenegraph/stick-text/index.js +5 -6
package/es/scenegraph/stick-text/index.js.map +1 -1
package/es/scenegraph/style/frame-border.d.ts +1 -1
package/es/scenegraph/style/frame-border.js +27 -10
package/es/scenegraph/style/frame-border.js.map +1 -1
package/es/scenegraph/utils/get-cell-merge.js +1 -1
package/es/scenegraph/utils/get-cell-merge.js.map +1 -1
package/es/scenegraph/utils/get-hierarchy-offset.js +7 -9
package/es/scenegraph/utils/get-hierarchy-offset.js.map +1 -1
package/es/scenegraph/utils/text-icon-layout.js +6 -4
package/es/scenegraph/utils/text-icon-layout.js.map +1 -1
package/es/themes/theme.d.ts +2 -0
package/es/themes/theme.js +13 -4
package/es/themes/theme.js.map +1 -1
package/es/tools/helper.d.ts +1 -1
package/es/tools/helper.js +1 -1
package/es/tools/helper.js.map +1 -1
package/es/ts-types/base-table.d.ts +9 -0
package/es/ts-types/base-table.js.map +1 -1
package/es/ts-types/column/style.d.ts +2 -2
package/es/ts-types/column/style.js.map +1 -1
package/es/ts-types/component/index.d.ts +1 -0
package/es/ts-types/component/index.js +2 -0
package/es/ts-types/component/index.js.map +1 -0
package/es/ts-types/index.d.ts +1 -0
package/es/ts-types/index.js +2 -0
package/es/ts-types/index.js.map +1 -1
package/es/ts-types/list-table/layout-map/api.d.ts +1 -0
package/es/ts-types/list-table/layout-map/api.js.map +1 -1
package/es/ts-types/new-data-set.d.ts +1 -0
package/es/ts-types/new-data-set.js.map +1 -1
package/es/ts-types/table-engine.d.ts +10 -0
package/es/ts-types/table-engine.js.map +1 -1
package/es/ts-types/theme.d.ts +2 -1
package/es/ts-types/theme.js.map +1 -1
package/es/vrender.d.ts +1 -1
package/es/vrender.js +3 -2
package/es/vrender.js.map +1 -1
package/package.json +9 -8

package/es/scenegraph/group-creater/cell-type/progress-bar-cell.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/scenegraph/group-creater/cell-type/progress-bar-cell.ts"],"names":[],"mappings":"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","file":"progress-bar-cell.js","sourcesContent":["import { createRect, createLine } from './../../../vrender';\nimport type { ProgressBarStyle } from '../../../body-helper/style/ProgressBarStyle';\nimport { str, getOrApply } from '../../../tools/helper';\nimport { Group } from '../../graphic/group';\nimport { getProp } from '../../utils/get-prop';\nimport { getQuadProps } from '../../utils/padding';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { isNumber } from '@visactor/vutils';\nimport type { StylePropertyFunctionArg } from '../../../ts-types';\n\nexport function createProgressBarCell(\n progressBarDefine: {\n min?: number \| ((args: StylePropertyFunctionArg) => number);\n max?: number \| ((args: StylePropertyFunctionArg) => number);\n barType?: 'default' \| 'negative' \| 'negative_no_axis'; // 进度图类型\n dependField?: string; // 指定其他列数据（风神使用）,\n },\n style: ProgressBarStyle,\n width: number,\n // height: number,\n value: string,\n dataValue: string,\n col: number,\n row: number,\n padding: [number, number, number, number],\n table: BaseTableAPI\n) {\n if (progressBarDefine.dependField) {\n dataValue = (table.getCellOriginRecord(col, row) as any)?.[progressBarDefine.dependField] ?? dataValue;\n }\n\n progressBarDefine.barType = progressBarDefine.barType ?? 'default';\n progressBarDefine.min =\n getOrApply(progressBarDefine.min, {\n col,\n row,\n table,\n value,\n dataValue,\n cellHeaderPaths: undefined\n }) ?? 0;\n progressBarDefine.max =\n getOrApply(progressBarDefine.max, {\n col,\n row,\n table,\n value,\n dataValue,\n cellHeaderPaths: undefined\n }) ?? progressBarDefine.min + 100;\n const height = table.getRowHeight(row);\n let contentWidth = width;\n let contentHeight = height;\n let _contentOffset = 0;\n if (isNumber(table.theme._contentOffset)) {\n _contentOffset = table.theme._contentOffset;\n }\n const percentCompleteBarGroup = new Group({\n x: -_contentOffset,\n y: -_contentOffset,\n width: contentWidth,\n height: contentHeight\n });\n percentCompleteBarGroup.name = 'progress-bar';\n\n const {\n showBar,\n barColor,\n barBgColor,\n // bgColor,\n barPositiveColor,\n barNegativeColor,\n barAxisColor,\n barRightToLeft,\n showBarMark,\n barMarkPositiveColor,\n barMarkNegativeColor,\n barMarkWidth,\n barMarkPosition\n } = style;\n let { barHeight, barBottom, barPadding } = style;\n // const { col, row, dataValue: originalValue } = context;\n\n // 完善四元组\n if (barPadding.length === 1) {\n barPadding = [barPadding[0], barPadding[0], barPadding[0], barPadding[0]];\n } else if (barPadding.length === 2) {\n barPadding = [barPadding[0], barPadding[1], barPadding[0], barPadding[1]];\n } else if (barPadding.length === 3) {\n barPadding = [barPadding[0], barPadding[1], barPadding[2], barPadding[1]];\n }\n\n // 将百分比值转换为数值\n barPadding = barPadding.map((v, i) => {\n if (typeof v === 'string' && str.endsWith(v, '%')) {\n const num = Number(v.substr(0, v.length - 1));\n if (i === 0 \|\| i === 2) {\n return (height * num) / 100;\n }\n return (width * num) / 100;\n }\n return Number(v);\n });\n\n const borderWidth = getQuadProps(getProp('borderLineWidth', style, col, row, table));\n const barPaddingTop = Math.max((barPadding as number[])[0], Math.ceil(borderWidth[0] / 2));\n const barPaddingRight = Math.max((barPadding as number[])[1], Math.floor(borderWidth[1] / 2));\n const barPaddingBottom = Math.max((barPadding as number[])[2], Math.floor(borderWidth[2] / 2));\n const barPaddingLeft = Math.max((barPadding as number[])[3], Math.ceil(borderWidth[3] / 2));\n\n contentWidth -= barPaddingRight + barPaddingLeft;\n contentHeight -= barPaddingBottom + barPaddingTop;\n if (row === table.rowCount - 1 && [0, '0'].includes(barBottom)) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n contentHeight -= 1;\n }\n\n // if (barPaddingTop & 1) {\n // // barPaddingTop += 0.5;\n // contentWidth += borderWidth[0];\n // }\n // if (barPaddingLeft & 1) {\n // // barPaddingLeft += 0.5;\n // contentHeight += borderWidth[0];\n // }\n\n const top = barPaddingTop;\n const left = barPaddingLeft;\n const right = contentWidth;\n const bottom = contentHeight;\n\n if (typeof barHeight === 'string' && str.endsWith(barHeight, '%')) {\n barHeight = Number(barHeight.substr(0, barHeight.length - 1));\n barHeight = (contentHeight * barHeight) / 100;\n } else {\n barHeight = Number(barHeight);\n }\n if (typeof barBottom === 'string' && str.endsWith(barBottom, '%')) {\n barBottom = Number(barBottom.substr(0, barBottom.length - 1));\n barBottom = (contentHeight * barBottom) / 100;\n } else {\n barBottom = Number(barBottom);\n }\n\n const show = getOrApply(showBar as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue\n });\n\n if (show) {\n let svalue = `${dataValue}`;\n if (str.endsWith(svalue, '%')) {\n svalue = svalue.substr(0, svalue.length - 1);\n }\n const num = Number(svalue);\n if (isNaN(num)) {\n return percentCompleteBarGroup;\n }\n\n if ((progressBarDefine.barType ?? 'default') === 'default') {\n const percentile =\n num < progressBarDefine.min\n ? 0\n : num > progressBarDefine.max\n ? 1\n : (num - progressBarDefine.min) / (progressBarDefine.max - progressBarDefine.min);\n\n const barMaxWidth = contentWidth;\n const barTop = top + contentHeight - (barHeight as number) - (barBottom as number);\n // const barLeft = 0 + barPaddingLeft;\n let barSize = Math.min(barMaxWidth * percentile, barMaxWidth);\n const barLeft = barRightToLeft ? left + right - barSize : left;\n if (col === table.colCount - 1 && percentile === 1 && !barRightToLeft) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n barSize -= 1;\n }\n const bgFillColor = getOrApply(barBgColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n });\n\n if (bgFillColor) {\n const barBack = createRect({\n x: barLeft,\n y: barTop,\n width: barMaxWidth,\n height: barHeight,\n fill: bgFillColor\n });\n percentCompleteBarGroup.addChild(barBack);\n }\n\n const fillColor =\n getOrApply(barColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n const barMain = createRect({\n x: barLeft,\n y: barTop,\n width: barSize,\n height: barHeight,\n fill: fillColor\n });\n percentCompleteBarGroup.addChild(barMain);\n } else if (progressBarDefine.barType === 'negative') {\n // negative模式参考风神现有数据条样式，显示坐标轴和正负数据条\n // 计算坐标轴位置\n const negativeRange = progressBarDefine.min < 0 ? -progressBarDefine.min : 0;\n const positiveRange = progressBarDefine.max > 0 ? progressBarDefine.max : 0;\n\n const negativeFactor = negativeRange / (negativeRange + positiveRange);\n const positiveFactor = 1 - negativeFactor;\n\n // 计算rate\n const positiveRate = num > 0 ? num / positiveRange : 0;\n const negativeRate = num < 0 ? -num / negativeRange : 0;\n\n // 绘制\n // 绘制背景\n const barMaxWidth = contentWidth;\n const barTop = top + contentHeight - (barHeight as number) - (barBottom as number);\n const barLeft = left;\n const bgFillColor = getOrApply(barBgColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: positiveRate\n });\n if (bgFillColor) {\n const barBack = createRect({\n x: barLeft,\n y: barTop,\n width: barMaxWidth,\n height: barHeight,\n fill: bgFillColor\n });\n percentCompleteBarGroup.addChild(barBack);\n }\n\n // 坐标轴距离左侧边界距离\n const positiveLeft = barRightToLeft ? positiveFactor * barMaxWidth : negativeFactor * barMaxWidth;\n\n // 绘制负值区域\n const barSizeNega = Math.min(barMaxWidth * negativeFactor * negativeRate, barMaxWidth);\n const barRectNega = barRightToLeft\n ? {\n left: barLeft + positiveLeft,\n top: barTop,\n width: barSizeNega,\n height: barHeight as number\n }\n : {\n left: barLeft + positiveLeft - barSizeNega,\n top: barTop,\n width: barSizeNega,\n height: barHeight as number\n };\n const barNagiFillColor =\n getOrApply(barNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: negativeRate\n }) \|\| '#20a8d8';\n const barNega = createRect({\n x: barRectNega.left,\n y: barRectNega.top,\n width: barRectNega.width,\n height: barRectNega.height,\n fill: barNagiFillColor\n });\n percentCompleteBarGroup.addChild(barNega);\n\n // 绘制正值区域\n let barSizePosi = Math.min(barMaxWidth * positiveFactor * positiveRate, barMaxWidth);\n if (col === table.colCount - 1 && positiveRate === 1 && !barRightToLeft) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n barSizePosi -= 1;\n }\n const barRectPosi = barRightToLeft\n ? {\n left: barLeft + positiveLeft - barSizePosi,\n top: barTop,\n width: barSizePosi,\n height: barHeight as number\n }\n : {\n left: barLeft + positiveLeft,\n top: barTop,\n width: barSizePosi,\n height: barHeight as number\n };\n const barPosiFillColor =\n getOrApply(barPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: positiveRate\n }) \|\| '#20a8d8';\n const barPosi = createRect({\n x: barRectPosi.left,\n y: barRectPosi.top,\n width: barRectPosi.width,\n height: barRectPosi.height,\n fill: barPosiFillColor\n });\n percentCompleteBarGroup.addChild(barPosi);\n\n // 绘制坐标轴\n const lineLeft = barRightToLeft ? barRectNega.left : barRectPosi.left;\n const lineStrokeColor = getOrApply(barAxisColor as any);\n const line = createLine({\n x: 0,\n y: 0,\n stroke: lineStrokeColor,\n lineWidth: 1,\n lineDash: [2, 2],\n points: [\n { x: lineLeft, y: 0 },\n { x: lineLeft, y: height }\n ]\n });\n percentCompleteBarGroup.addChild(line);\n\n // 绘制mark\n if (showBarMark && (positiveRate \|\| negativeRate)) {\n const lineWidth = barMarkWidth;\n const points = [];\n let barMarkStrokeColor;\n if (positiveRate > 0) {\n barMarkStrokeColor =\n getOrApply(barMarkPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: positiveRate\n }) \|\| '#20a8d8';\n if (barMarkPosition === 'right') {\n const markLeft = barRightToLeft\n ? barRectPosi.left + barMarkWidth / 2\n : barRectPosi.left + barRectPosi.width - barMarkWidth / 2;\n points.push({ x: markLeft, y: barRectPosi.top });\n points.push({ x: markLeft, y: barRectPosi.top + barRectPosi.height });\n } else if (barMarkPosition === 'bottom') {\n points.push({\n x: barRectPosi.left,\n y: barRectPosi.top + barRectPosi.height - barMarkWidth / 2\n });\n points.push({\n x: barRectPosi.left + barRectPosi.width,\n y: barRectPosi.top + barRectPosi.height - barMarkWidth / 2\n });\n }\n } else if (negativeRate > 0) {\n barMarkStrokeColor =\n getOrApply(barMarkNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: negativeRate\n }) \|\| '#20a8d8';\n if (barMarkPosition === 'right') {\n const markLeft = barRightToLeft\n ? barRectNega.left + barRectNega.width - barMarkWidth / 2\n : barRectNega.left + barMarkWidth / 2;\n points.push({ x: markLeft, y: barRectNega.top });\n points.push({ x: markLeft, y: barRectNega.top + barRectNega.height });\n } else if (barMarkPosition === 'bottom') {\n points.push({\n x: barRectNega.left,\n y: barRectNega.top + barRectNega.height - barMarkWidth / 2\n });\n points.push({\n x: barRectNega.left + barRectNega.width,\n y: barRectNega.top + barRectNega.height - barMarkWidth / 2\n });\n }\n }\n const barMark = createLine({\n x: 0,\n y: 0,\n stroke: barMarkStrokeColor,\n lineWidth,\n points\n });\n percentCompleteBarGroup.addChild(barMark);\n }\n } else if (progressBarDefine.barType === 'negative_no_axis') {\n // negative_no_axis模式不显示坐标轴，正负数据条同向，区分颜色\n // 计算range\n const _negativeRange = progressBarDefine.min < 0 ? -progressBarDefine.min : 0;\n const _positiveRange = progressBarDefine.max > 0 ? progressBarDefine.max : 0;\n const range = Math.max(_negativeRange, _positiveRange);\n\n // 计算rate\n const percentile = range === 0 ? 0 : Math.abs(num) / range;\n\n // 绘制\n // 绘制背景\n // const barMaxWidth = width - barPaddingLeft - barPaddingRight - 1; /罫線/\n const barMaxWidth = contentWidth;\n let barSize = Math.min(barMaxWidth * percentile, barMaxWidth);\n if (col === table.colCount - 1 && percentile === 1 && !barRightToLeft) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n barSize -= 1;\n }\n // const barTop = bottom - barPaddingBottom - (barHeight as number) - (barBottom as number) - 1; /罫線/\n const barTop = top + contentHeight - (barHeight as number) - (barBottom as number);\n // const barLeft = barRightToLeft ? right - barPaddingRight - barSize : left + barPaddingLeft;\n const barLeft = barRightToLeft ? left + right - barSize : left;\n\n const bgFillColor = getOrApply(barBgColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n });\n if (bgFillColor) {\n const barBack = createRect({\n x: barLeft,\n y: barTop,\n width: barMaxWidth,\n height: barHeight,\n fill: bgFillColor\n });\n percentCompleteBarGroup.addChild(barBack);\n }\n\n // 绘制bar\n const barRect = {\n left: barLeft,\n top: barTop,\n width: barSize,\n height: barHeight as number\n };\n let barRectFillColor;\n if (num >= 0) {\n barRectFillColor =\n getOrApply(barPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n percentile,\n dataValue\n }) \|\| '#20a8d8';\n } else {\n barRectFillColor =\n getOrApply(barNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n }\n const bar = createRect({\n x: barRect.left,\n y: barRect.top,\n width: barRect.width,\n height: barRect.height,\n fill: barRectFillColor\n });\n percentCompleteBarGroup.addChild(bar);\n\n // 绘制mark\n if (showBarMark && num) {\n const lineWidth = barMarkWidth;\n const points = [];\n let barMarkStrokeColor;\n if (num >= 0) {\n barMarkStrokeColor =\n getOrApply(barMarkPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n } else {\n barMarkStrokeColor =\n getOrApply(barMarkNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n }\n if (barMarkPosition === 'right') {\n const markLeft = barRightToLeft\n ? barRect.left + barMarkWidth / 2\n : barRect.left + barRect.width - barMarkWidth / 2;\n points.push({ x: markLeft, y: barRect.top });\n points.push({ x: markLeft, y: barRect.top + barRect.height });\n } else if (barMarkPosition === 'bottom') {\n points.push({\n x: barRect.left,\n y: barRect.top + barRect.height - barMarkWidth / 2\n });\n points.push({\n x: barRect.left + barRect.width,\n y: barRect.top + barRect.height - barMarkWidth / 2\n });\n }\n const barMark = createLine({\n x: 0,\n y: 0,\n stroke: barMarkStrokeColor,\n lineWidth,\n points\n });\n percentCompleteBarGroup.addChild(barMark);\n }\n }\n }\n return percentCompleteBarGroup;\n}\n\nexport type CreateProgressBarCell = typeof createProgressBarCell;\n"]}
1	+ {"version":3,"sources":["../src/scenegraph/group-creater/cell-type/progress-bar-cell.ts"],"names":[],"mappings":"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","file":"progress-bar-cell.js","sourcesContent":["import { createRect, createLine } from './../../../vrender';\nimport type { ProgressBarStyle } from '../../../body-helper/style/ProgressBarStyle';\nimport { str, getOrApply } from '../../../tools/helper';\nimport { Group } from '../../graphic/group';\nimport { getProp } from '../../utils/get-prop';\nimport { getQuadProps } from '../../utils/padding';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { isNumber } from '@visactor/vutils';\nimport type { StylePropertyFunctionArg } from '../../../ts-types';\n\nexport function createProgressBarCell(\n progressBarDefine: {\n min?: number \| ((args: StylePropertyFunctionArg) => number);\n max?: number \| ((args: StylePropertyFunctionArg) => number);\n barType?: 'default' \| 'negative' \| 'negative_no_axis'; // 进度图类型\n dependField?: string; // 指定其他列数据（风神使用）,\n },\n style: ProgressBarStyle,\n width: number,\n // height: number,\n value: string,\n dataValue: string,\n col: number,\n row: number,\n padding: [number, number, number, number],\n table: BaseTableAPI\n) {\n if (progressBarDefine.dependField) {\n dataValue = (table.getCellOriginRecord(col, row) as any)?.[progressBarDefine.dependField] ?? dataValue;\n }\n\n progressBarDefine.barType = progressBarDefine.barType ?? 'default';\n progressBarDefine.min =\n getOrApply(progressBarDefine.min, {\n col,\n row,\n table,\n value,\n dataValue,\n cellHeaderPaths: undefined\n }) ?? 0;\n progressBarDefine.max =\n getOrApply(progressBarDefine.max, {\n col,\n row,\n table,\n value,\n dataValue,\n cellHeaderPaths: undefined\n }) ?? progressBarDefine.min + 100;\n const height = table.getRowHeight(row);\n let contentWidth = width;\n let contentHeight = height;\n let _contentOffset = 0;\n if (isNumber(table.theme._contentOffset)) {\n _contentOffset = table.theme._contentOffset;\n }\n const percentCompleteBarGroup = new Group({\n x: -_contentOffset,\n y: -_contentOffset,\n width: contentWidth,\n height: contentHeight\n });\n percentCompleteBarGroup.name = 'progress-bar';\n\n const {\n showBar,\n barColor,\n barBgColor,\n // bgColor,\n barPositiveColor,\n barNegativeColor,\n barAxisColor,\n barRightToLeft,\n showBarMark,\n barMarkPositiveColor,\n barMarkNegativeColor,\n barMarkWidth,\n barMarkPosition\n } = style;\n let { barHeight, barBottom, barPadding } = style;\n // const { col, row, dataValue: originalValue } = context;\n\n // 完善四元组\n if (barPadding.length === 1) {\n barPadding = [barPadding[0], barPadding[0], barPadding[0], barPadding[0]];\n } else if (barPadding.length === 2) {\n barPadding = [barPadding[0], barPadding[1], barPadding[0], barPadding[1]];\n } else if (barPadding.length === 3) {\n barPadding = [barPadding[0], barPadding[1], barPadding[2], barPadding[1]];\n }\n\n // 将百分比值转换为数值\n barPadding = barPadding.map((v, i) => {\n if (typeof v === 'string' && str.endsWith(v, '%')) {\n const num = Number(v.substr(0, v.length - 1));\n if (i === 0 \|\| i === 2) {\n return (height * num) / 100;\n }\n return (width * num) / 100;\n }\n return Number(v);\n });\n\n const borderWidth = getQuadProps(getProp('borderLineWidth', style, col, row, table));\n const barPaddingTop = Math.max((barPadding as number[])[0], Math.ceil(borderWidth[0] / 2));\n const barPaddingRight = Math.max((barPadding as number[])[1], Math.floor(borderWidth[1] / 2));\n const barPaddingBottom = Math.max((barPadding as number[])[2], Math.floor(borderWidth[2] / 2));\n const barPaddingLeft = Math.max((barPadding as number[])[3], Math.ceil(borderWidth[3] / 2));\n\n contentWidth -= barPaddingRight + barPaddingLeft;\n contentHeight -= barPaddingBottom + barPaddingTop;\n if (row === table.rowCount - 1 && [0, '0'].includes(barBottom)) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n contentHeight -= 1;\n }\n\n // if (barPaddingTop & 1) {\n // // barPaddingTop += 0.5;\n // contentWidth += borderWidth[0];\n // }\n // if (barPaddingLeft & 1) {\n // // barPaddingLeft += 0.5;\n // contentHeight += borderWidth[0];\n // }\n\n const top = barPaddingTop;\n const left = barPaddingLeft;\n const right = contentWidth;\n const bottom = contentHeight;\n\n if (typeof barHeight === 'string' && str.endsWith(barHeight, '%')) {\n barHeight = Number(barHeight.substr(0, barHeight.length - 1));\n barHeight = (contentHeight * barHeight) / 100;\n } else {\n barHeight = Number(barHeight);\n }\n if (typeof barBottom === 'string' && str.endsWith(barBottom, '%')) {\n barBottom = Number(barBottom.substr(0, barBottom.length - 1));\n barBottom = (contentHeight * barBottom) / 100;\n } else {\n barBottom = Number(barBottom);\n }\n\n const show = getOrApply(showBar as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue\n });\n\n if (show) {\n let svalue = `${dataValue}`;\n if (str.endsWith(svalue, '%')) {\n svalue = svalue.substr(0, svalue.length - 1);\n }\n const num = Number(svalue);\n if (isNaN(num)) {\n return percentCompleteBarGroup;\n }\n\n if ((progressBarDefine.barType ?? 'default') === 'default') {\n const percentile =\n num < progressBarDefine.min\n ? 0\n : num > progressBarDefine.max\n ? 1\n : (num - progressBarDefine.min) / (progressBarDefine.max - progressBarDefine.min);\n\n const barMaxWidth = contentWidth;\n const barTop = top + contentHeight - (barHeight as number) - (barBottom as number);\n // const barLeft = 0 + barPaddingLeft;\n let barSize = Math.min(barMaxWidth * percentile, barMaxWidth);\n const barLeft = barRightToLeft ? left + right - barSize : left;\n if (col === table.colCount - 1 && percentile === 1 && !barRightToLeft) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n barSize -= 1;\n }\n const bgFillColor = getOrApply(barBgColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n });\n\n if (bgFillColor) {\n const barBack = createRect({\n x: barLeft,\n y: barTop,\n width: barMaxWidth,\n height: barHeight,\n fill: bgFillColor\n });\n percentCompleteBarGroup.addChild(barBack);\n }\n\n const fillColor =\n getOrApply(barColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n const barMain = createRect({\n x: barLeft,\n y: barTop,\n width: barSize,\n height: barHeight,\n fill: fillColor\n });\n percentCompleteBarGroup.addChild(barMain);\n } else if (progressBarDefine.barType === 'negative') {\n // negative模式参考风神现有数据条样式，显示坐标轴和正负数据条\n // 计算坐标轴位置\n const negativeRange = progressBarDefine.min < 0 ? -progressBarDefine.min : 0;\n const positiveRange = progressBarDefine.max > 0 ? progressBarDefine.max : 0;\n\n const negativeFactor = negativeRange / (negativeRange + positiveRange);\n const positiveFactor = 1 - negativeFactor;\n\n // 计算rate\n const positiveRate = num > 0 ? num / positiveRange : 0;\n const negativeRate = num < 0 ? -num / negativeRange : 0;\n\n // 绘制\n // 绘制背景\n const barMaxWidth = contentWidth;\n const barTop = top + contentHeight - (barHeight as number) - (barBottom as number);\n const barLeft = left;\n const bgFillColor = getOrApply(barBgColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: positiveRate\n });\n if (bgFillColor) {\n const barBack = createRect({\n x: barLeft,\n y: barTop,\n width: barMaxWidth,\n height: barHeight,\n fill: bgFillColor\n });\n percentCompleteBarGroup.addChild(barBack);\n }\n\n // 坐标轴距离左侧边界距离\n const positiveLeft = barRightToLeft ? positiveFactor * barMaxWidth : negativeFactor * barMaxWidth;\n\n // 绘制负值区域\n const barSizeNega = Math.min(barMaxWidth * negativeFactor * negativeRate, barMaxWidth);\n const barRectNega = barRightToLeft\n ? {\n left: barLeft + positiveLeft,\n top: barTop,\n width: barSizeNega,\n height: barHeight as number\n }\n : {\n left: barLeft + positiveLeft - barSizeNega,\n top: barTop,\n width: barSizeNega,\n height: barHeight as number\n };\n const barNagiFillColor =\n getOrApply(barNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: negativeRate\n }) \|\| '#20a8d8';\n const barNega = createRect({\n x: barRectNega.left,\n y: barRectNega.top,\n width: barRectNega.width,\n height: barRectNega.height,\n fill: barNagiFillColor\n });\n percentCompleteBarGroup.addChild(barNega);\n\n // 绘制正值区域\n let barSizePosi = Math.min(barMaxWidth * positiveFactor * positiveRate, barMaxWidth);\n if (col === table.colCount - 1 && positiveRate === 1 && !barRightToLeft) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n barSizePosi -= 1;\n }\n const barRectPosi = barRightToLeft\n ? {\n left: barLeft + positiveLeft - barSizePosi,\n top: barTop,\n width: barSizePosi,\n height: barHeight as number\n }\n : {\n left: barLeft + positiveLeft,\n top: barTop,\n width: barSizePosi,\n height: barHeight as number\n };\n const barPosiFillColor =\n getOrApply(barPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: positiveRate\n }) \|\| '#20a8d8';\n const barPosi = createRect({\n x: barRectPosi.left,\n y: barRectPosi.top,\n width: barRectPosi.width,\n height: barRectPosi.height,\n fill: barPosiFillColor\n });\n percentCompleteBarGroup.addChild(barPosi);\n\n // 绘制坐标轴\n const lineLeft = barRightToLeft ? barRectNega.left : barRectPosi.left;\n const lineStrokeColor = getOrApply(barAxisColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: positiveRate\n });\n const line = createLine({\n x: 0,\n y: 0,\n stroke: lineStrokeColor,\n lineWidth: 1,\n lineDash: [2, 2],\n points: [\n { x: lineLeft, y: 0 },\n { x: lineLeft, y: height }\n ]\n });\n percentCompleteBarGroup.addChild(line);\n\n // 绘制mark\n if (showBarMark && (positiveRate \|\| negativeRate)) {\n const lineWidth = barMarkWidth;\n const points = [];\n let barMarkStrokeColor;\n if (positiveRate > 0) {\n barMarkStrokeColor =\n getOrApply(barMarkPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: positiveRate\n }) \|\| '#20a8d8';\n if (barMarkPosition === 'right') {\n const markLeft = barRightToLeft\n ? barRectPosi.left + barMarkWidth / 2\n : barRectPosi.left + barRectPosi.width - barMarkWidth / 2;\n points.push({ x: markLeft, y: barRectPosi.top });\n points.push({ x: markLeft, y: barRectPosi.top + barRectPosi.height });\n } else if (barMarkPosition === 'bottom') {\n points.push({\n x: barRectPosi.left,\n y: barRectPosi.top + barRectPosi.height - barMarkWidth / 2\n });\n points.push({\n x: barRectPosi.left + barRectPosi.width,\n y: barRectPosi.top + barRectPosi.height - barMarkWidth / 2\n });\n }\n } else if (negativeRate > 0) {\n barMarkStrokeColor =\n getOrApply(barMarkNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile: negativeRate\n }) \|\| '#20a8d8';\n if (barMarkPosition === 'right') {\n const markLeft = barRightToLeft\n ? barRectNega.left + barRectNega.width - barMarkWidth / 2\n : barRectNega.left + barMarkWidth / 2;\n points.push({ x: markLeft, y: barRectNega.top });\n points.push({ x: markLeft, y: barRectNega.top + barRectNega.height });\n } else if (barMarkPosition === 'bottom') {\n points.push({\n x: barRectNega.left,\n y: barRectNega.top + barRectNega.height - barMarkWidth / 2\n });\n points.push({\n x: barRectNega.left + barRectNega.width,\n y: barRectNega.top + barRectNega.height - barMarkWidth / 2\n });\n }\n }\n const barMark = createLine({\n x: 0,\n y: 0,\n stroke: barMarkStrokeColor,\n lineWidth,\n points\n });\n percentCompleteBarGroup.addChild(barMark);\n }\n } else if (progressBarDefine.barType === 'negative_no_axis') {\n // negative_no_axis模式不显示坐标轴，正负数据条同向，区分颜色\n // 计算range\n const _negativeRange = progressBarDefine.min < 0 ? -progressBarDefine.min : 0;\n const _positiveRange = progressBarDefine.max > 0 ? progressBarDefine.max : 0;\n const range = Math.max(_negativeRange, _positiveRange);\n\n // 计算rate\n const percentile = range === 0 ? 0 : Math.abs(num) / range;\n\n // 绘制\n // 绘制背景\n // const barMaxWidth = width - barPaddingLeft - barPaddingRight - 1; /罫線/\n const barMaxWidth = contentWidth;\n let barSize = Math.min(barMaxWidth * percentile, barMaxWidth);\n if (col === table.colCount - 1 && percentile === 1 && !barRightToLeft) {\n // 单元格边框在表格边界会向内缩进1px，为了避免进度图矩形覆盖边框，这里在最后一行向内缩进1px\n // 详见 packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw()\n barSize -= 1;\n }\n // const barTop = bottom - barPaddingBottom - (barHeight as number) - (barBottom as number) - 1; /罫線/\n const barTop = top + contentHeight - (barHeight as number) - (barBottom as number);\n // const barLeft = barRightToLeft ? right - barPaddingRight - barSize : left + barPaddingLeft;\n const barLeft = barRightToLeft ? left + right - barSize : left;\n\n const bgFillColor = getOrApply(barBgColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n });\n if (bgFillColor) {\n const barBack = createRect({\n x: barLeft,\n y: barTop,\n width: barMaxWidth,\n height: barHeight,\n fill: bgFillColor\n });\n percentCompleteBarGroup.addChild(barBack);\n }\n\n // 绘制bar\n const barRect = {\n left: barLeft,\n top: barTop,\n width: barSize,\n height: barHeight as number\n };\n let barRectFillColor;\n if (num >= 0) {\n barRectFillColor =\n getOrApply(barPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n percentile,\n dataValue\n }) \|\| '#20a8d8';\n } else {\n barRectFillColor =\n getOrApply(barNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n }\n const bar = createRect({\n x: barRect.left,\n y: barRect.top,\n width: barRect.width,\n height: barRect.height,\n fill: barRectFillColor\n });\n percentCompleteBarGroup.addChild(bar);\n\n // 绘制mark\n if (showBarMark && num) {\n const lineWidth = barMarkWidth;\n const points = [];\n let barMarkStrokeColor;\n if (num >= 0) {\n barMarkStrokeColor =\n getOrApply(barMarkPositiveColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n } else {\n barMarkStrokeColor =\n getOrApply(barMarkNegativeColor as any, {\n col,\n row,\n table,\n context: null,\n value,\n dataValue,\n percentile\n }) \|\| '#20a8d8';\n }\n if (barMarkPosition === 'right') {\n const markLeft = barRightToLeft\n ? barRect.left + barMarkWidth / 2\n : barRect.left + barRect.width - barMarkWidth / 2;\n points.push({ x: markLeft, y: barRect.top });\n points.push({ x: markLeft, y: barRect.top + barRect.height });\n } else if (barMarkPosition === 'bottom') {\n points.push({\n x: barRect.left,\n y: barRect.top + barRect.height - barMarkWidth / 2\n });\n points.push({\n x: barRect.left + barRect.width,\n y: barRect.top + barRect.height - barMarkWidth / 2\n });\n }\n const barMark = createLine({\n x: 0,\n y: 0,\n stroke: barMarkStrokeColor,\n lineWidth,\n points\n });\n percentCompleteBarGroup.addChild(barMark);\n }\n }\n }\n return percentCompleteBarGroup;\n}\n\nexport type CreateProgressBarCell = typeof createProgressBarCell;\n"]}

package/es/scenegraph/group-creater/column-helper.js CHANGED Viewed

@@ -32,13 +32,19 @@ export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd
         }
         let colForDefine = col, rowForDefine = row;
         range && (colForDefine = range.start.col, rowForDefine = range.start.row);
-        const define = "body" !== cellLocation ? table.getHeaderDefine(colForDefine, rowForDefine) : table.getBodyColumnDefine(colForDefine, rowForDefine), mayHaveIcon = "body" !== cellLocation || ((null == define ? void 0 : define.dragOrder) || !!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree));
-        if (!range && ("body" !== cellLocation || (null == define ? void 0 : define.mergeCell)) && (range = table.getCellRange(col, row),
+        const define = "body" !== cellLocation ? table.getHeaderDefine(colForDefine, rowForDefine) : table.getBodyColumnDefine(colForDefine, rowForDefine);
+        let mayHaveIcon = "body" !== cellLocation || ((null == define ? void 0 : define.dragOrder) || !!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree));
+        if (!range && (table.internalProps.enableTreeNodeMerge || "body" !== cellLocation || (null == define ? void 0 : define.mergeCell)) && (range = table.getCellRange(col, row),
         isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row,
         isMerge)) {
             const mergeSize = dealMerge(range, mergeMap, table, rowStart > range.start.row);
             cellWidth = mergeSize.cellWidth, cellHeight = mergeSize.cellHeight;
         }
+        if (table.internalProps.enableTreeNodeMerge && isMerge) {
+            const {vtableMergeName: vtableMergeName, vTableMerge: vTableMerge} = table.getCellRawRecord(range.start.col, range.start.row);
+            vTableMerge && (mayHaveIcon = !0, table.options.groupTitleCustomLayout && (customResult = dealWithCustom(table.options.groupTitleCustomLayout, void 0, range.start.col, range.start.row, table.getColsWidth(range.start.col, range.end.col), table.getRowsHeight(range.start.row, range.end.row), !1, table.isAutoRowHeight(row), [ 0, 0, 0, 0 ], range, table))),
+            vtableMergeName && (value = vtableMergeName);
+        }
         const cellStyle = customStyle || table._getCellStyle(col, row), cellTheme = getStyleTheme(cellStyle, table, range ? range.start.col : col, range ? range.start.row : row, getProp).theme;
         cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table), cellTheme.group.width = colWidth,
         cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight,

package/es/scenegraph/group-creater/column-helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef /\nimport type { IThemeSpec } from './../../vrender';\nimport type { CellLocation, CellRange, ColumnDefine, IRowSeriesNumber, TextColumnDefine } from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell, dealWithMergeCellSize, resizeCellGroup } from './cell-helper';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { dealWithCustom } from '../component/custom';\n/\n 创建复合列同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellLocation\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n /\nexport function createComplexColumn(\n columnGroup: Group,\n col: number,\n colWidth: number,\n rowStart: number,\n rowEnd: number,\n mergeMap: MergeMap,\n defaultRowHeight: number \| number[],\n table: BaseTableAPI,\n cellLocation: CellLocation,\n rowLimit?: number\n) {\n let padding;\n let textAlign;\n let textBaseline;\n /* useColumnTheme 判断是否可以使用columnTheme /\n // insert cell into column group top\n let y = 0;\n // if (columnGroup.colHeight) {\n // // insert cell into column group bottom\n // y = columnGroup.colHeight;\n // }\n if (columnGroup.lastChild && (columnGroup.lastChild as Group).row === rowStart - 1) {\n y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n } else if (columnGroup.colHeight) {\n y = columnGroup.colHeight;\n }\n\n for (let j = rowStart; j <= rowEnd; j++) {\n const row = j;\n let value = table.getCellValue(col, row);\n\n // 处理单元格合并\n let cellWidth = colWidth;\n // let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n let cellHeight = table.getRowHeight(row);\n let range;\n let isMerge;\n let customStyle;\n let customResult;\n if (table.internalProps.customMergeCell) {\n const customMerge = table.getCustomMerge(col, row);\n if (customMerge) {\n const {\n range: customMergeRange,\n text: customMergeText,\n style: customMergeStyle,\n customLayout,\n customRender\n } = customMerge;\n range = customMergeRange;\n isMerge = range.start.col !== range.end.col \|\| range.start.row !== range.end.row;\n if (isMerge) {\n const needUpdateRange = rowStart > range.start.row;\n const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n cellWidth = mergeSize.cellWidth;\n cellHeight = mergeSize.cellHeight;\n }\n value = customMergeText;\n customStyle = customMergeStyle;\n\n if (customLayout \|\| customRender) {\n customResult = dealWithCustom(\n customLayout,\n customRender,\n customMergeRange.start.col,\n customMergeRange.start.row,\n table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col),\n table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row),\n false,\n // table.heightMode === 'autoHeight',\n table.isAutoRowHeight(row),\n [0, 0, 0, 0],\n range,\n table\n );\n }\n }\n }\n\n let colForDefine = col;\n let rowForDefine = row;\n if (range) {\n colForDefine = range.start.col;\n rowForDefine = range.start.row;\n }\n const define =\n cellLocation !== 'body'\n ? table.getHeaderDefine(colForDefine, rowForDefine)\n : table.getBodyColumnDefine(colForDefine, rowForDefine);\n const mayHaveIcon =\n cellLocation !== 'body'\n ? true\n : (define as IRowSeriesNumber)?.dragOrder \|\| !!define?.icon \|\| !!(define as ColumnDefine)?.tree;\n\n if (!range && (cellLocation !== 'body' \|\| (define as TextColumnDefine)?.mergeCell)) {\n // 只有表头或者column配置合并单元格后再进行信息获取\n range = table.getCellRange(col, row);\n isMerge = range.start.col !== range.end.col \|\| range.start.row !== range.end.row;\n // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n if (isMerge) {\n const needUpdateRange = rowStart > range.start.row;\n const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n cellWidth = mergeSize.cellWidth;\n cellHeight = mergeSize.cellHeight;\n }\n }\n\n const cellStyle = customStyle \|\| table._getCellStyle(col, row);\n const cellTheme = getStyleTheme(\n cellStyle,\n table,\n range ? range.start.col : col,\n range ? range.start.row : row,\n getProp\n ).theme;\n cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);\n cellTheme.group.width = colWidth;\n cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n if (cellTheme._vtable.padding) {\n padding = cellTheme._vtable.padding;\n }\n if (cellTheme.text.textAlign) {\n textAlign = cellTheme.text.textAlign;\n }\n if (cellTheme.text.textBaseline) {\n textBaseline = cellTheme.text.textBaseline;\n }\n\n // enable clip body\n if (cellLocation !== 'body' && !cellTheme.group.fill) {\n cellTheme.group.fill = '#fff';\n }\n // margin = getProp('margin', headerStyle, col, 0, table)\n\n const type =\n (table.isHeader(col, row)\n ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n : table.getBodyColumnType(col, row)) \|\| 'text';\n\n // deal with promise data\n if (isPromise(value)) {\n createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);\n dealPromiseData(\n value,\n table,\n createCell.bind(\n null,\n type,\n value,\n define,\n table,\n col,\n row,\n colWidth,\n cellWidth,\n cellHeight,\n columnGroup,\n y,\n padding,\n textAlign,\n textBaseline,\n mayHaveIcon,\n cellTheme,\n range,\n customResult\n )\n );\n columnGroup.updateColumnRowNumber(row);\n const height = table.getRowHeight(row);\n columnGroup.updateColumnHeight(height);\n y += height;\n } else {\n const cellGroup = createCell(\n type,\n value,\n define as ColumnDefine,\n table,\n col,\n row,\n colWidth,\n cellWidth,\n cellHeight,\n columnGroup,\n y,\n padding,\n textAlign,\n textBaseline,\n mayHaveIcon,\n cellTheme,\n range,\n customResult\n );\n columnGroup.updateColumnRowNumber(row);\n if (isMerge) {\n const rangeHeight = table.getRowHeight(row);\n const rangeWidth = table.getColWidth(col);\n\n const { width: contentWidth } = cellGroup.attribute;\n const { height: contentHeight } = cellGroup.attribute;\n cellGroup.contentWidth = contentWidth;\n cellGroup.contentHeight = contentHeight;\n\n // resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table);\n dealWithMergeCellSize(range, contentWidth, contentHeight, padding, textAlign, textBaseline, table);\n columnGroup.updateColumnHeight(rangeHeight);\n y += rangeHeight;\n } else {\n // columnGroup.updateColumnHeight(cellGroup.attribute.height);\n // y += cellGroup.attribute.height;\n columnGroup.updateColumnHeight(cellHeight);\n y += cellHeight;\n }\n }\n if (rowLimit && row > rowLimit) {\n break;\n }\n }\n\n columnGroup.setAttribute('width', colWidth);\n return {\n width: colWidth,\n height: y\n };\n}\n\n/\n 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n col: number,\n colWidth: number,\n table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n style,\n table,\n col,\n table.columnHeaderLevelCount,\n getRawProp\n );\n\n // get column header style\n columnTheme.group.width = colWidth;\n columnTheme.group.height = 0;\n return { theme: columnTheme, hasFunctionPros };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI, forceUpdate: boolean) {\n let cellWidth = 0;\n let cellHeight = 0;\n const mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n if (!mergeResult \|\| forceUpdate) {\n for (let col = range.start.col; col <= range.end.col; col++) {\n cellWidth += table.getColWidth(col);\n }\n\n // let cellHeight = 0;\n for (let i = range.start.row; i <= range.end.row; i++) {\n cellHeight += table.getRowHeight(i);\n }\n\n mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n cellWidth,\n cellHeight\n });\n } else {\n cellWidth = mergeResult.cellWidth;\n cellHeight = mergeResult.cellHeight;\n }\n return {\n cellWidth,\n cellHeight\n };\n}\n\nfunction createEmptyCellGroup(\n col: number,\n row: number,\n x: number,\n y: number,\n width: number,\n height: number,\n columnGroup: Group\n) {\n const cellGroup = new Group({\n x,\n y,\n width,\n height\n });\n cellGroup.role = 'cell';\n cellGroup.col = col;\n cellGroup.row = row;\n columnGroup.addChild(cellGroup);\n}\n"]}
1	+ {"version":3,"sources":["../src/scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef /\nimport type { IThemeSpec } from './../../vrender';\nimport type {\n CellLocation,\n CellRange,\n ColumnDefine,\n IRowSeriesNumber,\n ListTableConstructorOptions,\n TextColumnDefine\n} from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell, dealWithMergeCellSize, resizeCellGroup } from './cell-helper';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { dealWithCustom } from '../component/custom';\n/\n 创建复合列同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellLocation\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n /\nexport function createComplexColumn(\n columnGroup: Group,\n col: number,\n colWidth: number,\n rowStart: number,\n rowEnd: number,\n mergeMap: MergeMap,\n defaultRowHeight: number \| number[],\n table: BaseTableAPI,\n cellLocation: CellLocation,\n rowLimit?: number\n) {\n let padding;\n let textAlign;\n let textBaseline;\n /* useColumnTheme 判断是否可以使用columnTheme /\n // insert cell into column group top\n let y = 0;\n // if (columnGroup.colHeight) {\n // // insert cell into column group bottom\n // y = columnGroup.colHeight;\n // }\n if (columnGroup.lastChild && (columnGroup.lastChild as Group).row === rowStart - 1) {\n y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n } else if (columnGroup.colHeight) {\n y = columnGroup.colHeight;\n }\n\n for (let j = rowStart; j <= rowEnd; j++) {\n const row = j;\n let value = table.getCellValue(col, row);\n\n // 处理单元格合并\n let cellWidth = colWidth;\n // let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n let cellHeight = table.getRowHeight(row);\n let range;\n let isMerge;\n let customStyle;\n let customResult;\n if (table.internalProps.customMergeCell) {\n const customMerge = table.getCustomMerge(col, row);\n if (customMerge) {\n const {\n range: customMergeRange,\n text: customMergeText,\n style: customMergeStyle,\n customLayout,\n customRender\n } = customMerge;\n range = customMergeRange;\n isMerge = range.start.col !== range.end.col \|\| range.start.row !== range.end.row;\n if (isMerge) {\n const needUpdateRange = rowStart > range.start.row;\n const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n cellWidth = mergeSize.cellWidth;\n cellHeight = mergeSize.cellHeight;\n }\n value = customMergeText;\n customStyle = customMergeStyle;\n\n if (customLayout \|\| customRender) {\n customResult = dealWithCustom(\n customLayout,\n customRender,\n customMergeRange.start.col,\n customMergeRange.start.row,\n table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col),\n table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row),\n false,\n // table.heightMode === 'autoHeight',\n table.isAutoRowHeight(row),\n [0, 0, 0, 0],\n range,\n table\n );\n }\n }\n }\n\n let colForDefine = col;\n let rowForDefine = row;\n if (range) {\n colForDefine = range.start.col;\n rowForDefine = range.start.row;\n }\n const define =\n cellLocation !== 'body'\n ? table.getHeaderDefine(colForDefine, rowForDefine)\n : table.getBodyColumnDefine(colForDefine, rowForDefine);\n let mayHaveIcon =\n cellLocation !== 'body'\n ? true\n : (define as IRowSeriesNumber)?.dragOrder \|\| !!define?.icon \|\| !!(define as ColumnDefine)?.tree;\n\n if (\n !range &&\n (table.internalProps.enableTreeNodeMerge \|\| cellLocation !== 'body' \|\| (define as TextColumnDefine)?.mergeCell)\n ) {\n // 只有表头或者column配置合并单元格后再进行信息获取\n range = table.getCellRange(col, row);\n isMerge = range.start.col !== range.end.col \|\| range.start.row !== range.end.row;\n // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n if (isMerge) {\n const needUpdateRange = rowStart > range.start.row;\n const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n cellWidth = mergeSize.cellWidth;\n cellHeight = mergeSize.cellHeight;\n }\n }\n\n if (table.internalProps.enableTreeNodeMerge && isMerge) {\n const { vtableMergeName, vTableMerge } = table.getCellRawRecord(range.start.col, range.start.row);\n if (vTableMerge) {\n mayHaveIcon = true;\n if ((table.options as ListTableConstructorOptions).groupTitleCustomLayout) {\n customResult = dealWithCustom(\n (table.options as ListTableConstructorOptions).groupTitleCustomLayout,\n undefined,\n range.start.col,\n range.start.row,\n table.getColsWidth(range.start.col, range.end.col),\n table.getRowsHeight(range.start.row, range.end.row),\n false,\n table.isAutoRowHeight(row),\n [0, 0, 0, 0],\n range,\n table\n );\n }\n }\n if (vtableMergeName) {\n value = vtableMergeName;\n }\n }\n\n const cellStyle = customStyle \|\| table._getCellStyle(col, row);\n const cellTheme = getStyleTheme(\n cellStyle,\n table,\n range ? range.start.col : col,\n range ? range.start.row : row,\n getProp\n ).theme;\n cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);\n cellTheme.group.width = colWidth;\n cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n if (cellTheme._vtable.padding) {\n padding = cellTheme._vtable.padding;\n }\n if (cellTheme.text.textAlign) {\n textAlign = cellTheme.text.textAlign;\n }\n if (cellTheme.text.textBaseline) {\n textBaseline = cellTheme.text.textBaseline;\n }\n\n // enable clip body\n if (cellLocation !== 'body' && !cellTheme.group.fill) {\n cellTheme.group.fill = '#fff';\n }\n // margin = getProp('margin', headerStyle, col, 0, table)\n\n const type =\n (table.isHeader(col, row)\n ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n : table.getBodyColumnType(col, row)) \|\| 'text';\n\n // deal with promise data\n if (isPromise(value)) {\n createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);\n dealPromiseData(\n value,\n table,\n createCell.bind(\n null,\n type,\n value,\n define,\n table,\n col,\n row,\n colWidth,\n cellWidth,\n cellHeight,\n columnGroup,\n y,\n padding,\n textAlign,\n textBaseline,\n mayHaveIcon,\n cellTheme,\n range,\n customResult\n )\n );\n columnGroup.updateColumnRowNumber(row);\n const height = table.getRowHeight(row);\n columnGroup.updateColumnHeight(height);\n y += height;\n } else {\n const cellGroup = createCell(\n type,\n value,\n define as ColumnDefine,\n table,\n col,\n row,\n colWidth,\n cellWidth,\n cellHeight,\n columnGroup,\n y,\n padding,\n textAlign,\n textBaseline,\n mayHaveIcon,\n cellTheme,\n range,\n customResult\n );\n columnGroup.updateColumnRowNumber(row);\n if (isMerge) {\n const rangeHeight = table.getRowHeight(row);\n const rangeWidth = table.getColWidth(col);\n\n const { width: contentWidth } = cellGroup.attribute;\n const { height: contentHeight } = cellGroup.attribute;\n cellGroup.contentWidth = contentWidth;\n cellGroup.contentHeight = contentHeight;\n\n // resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table);\n dealWithMergeCellSize(range, contentWidth, contentHeight, padding, textAlign, textBaseline, table);\n columnGroup.updateColumnHeight(rangeHeight);\n y += rangeHeight;\n } else {\n // columnGroup.updateColumnHeight(cellGroup.attribute.height);\n // y += cellGroup.attribute.height;\n columnGroup.updateColumnHeight(cellHeight);\n y += cellHeight;\n }\n }\n if (rowLimit && row > rowLimit) {\n break;\n }\n }\n\n columnGroup.setAttribute('width', colWidth);\n return {\n width: colWidth,\n height: y\n };\n}\n\n/\n 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n col: number,\n colWidth: number,\n table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n style,\n table,\n col,\n table.columnHeaderLevelCount,\n getRawProp\n );\n\n // get column header style\n columnTheme.group.width = colWidth;\n columnTheme.group.height = 0;\n return { theme: columnTheme, hasFunctionPros };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI, forceUpdate: boolean) {\n let cellWidth = 0;\n let cellHeight = 0;\n const mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n if (!mergeResult \|\| forceUpdate) {\n for (let col = range.start.col; col <= range.end.col; col++) {\n cellWidth += table.getColWidth(col);\n }\n\n // let cellHeight = 0;\n for (let i = range.start.row; i <= range.end.row; i++) {\n cellHeight += table.getRowHeight(i);\n }\n\n mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n cellWidth,\n cellHeight\n });\n } else {\n cellWidth = mergeResult.cellWidth;\n cellHeight = mergeResult.cellHeight;\n }\n return {\n cellWidth,\n cellHeight\n };\n}\n\nfunction createEmptyCellGroup(\n col: number,\n row: number,\n x: number,\n y: number,\n width: number,\n height: number,\n columnGroup: Group\n) {\n const cellGroup = new Group({\n x,\n y,\n width,\n height\n });\n cellGroup.role = 'cell';\n cellGroup.col = col;\n cellGroup.row = row;\n columnGroup.addChild(cellGroup);\n}\n"]}

package/es/scenegraph/group-creater/init-scenegraph.js CHANGED Viewed

@@ -10,9 +10,9 @@ export function initSceneGraph(scene) {
         clip: !0,
         pickable: !1
     }), scene.tableGroup.role = "table";
-    const colHeaderGroup = createContainerGroup(0, 0, !0);
+    const colHeaderGroup = createContainerGroup(0, 0, !scene.table.options.enableTreeStickCell);
     colHeaderGroup.role = "col-header", scene.colHeaderGroup = colHeaderGroup;
-    const cornerHeaderGroup = createContainerGroup(0, 0, !0);
+    const cornerHeaderGroup = createContainerGroup(0, 0, !scene.table.options.enableTreeStickCell);
     cornerHeaderGroup.role = "corner-header", scene.cornerHeaderGroup = cornerHeaderGroup;
     const rowHeaderGroup = createContainerGroup(0, 0, !0);
     rowHeaderGroup.role = "row-header", scene.rowHeaderGroup = rowHeaderGroup;

package/es/scenegraph/group-creater/init-scenegraph.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/scenegraph/group-creater/init-scenegraph.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;~~AAIzC~~,MAAM,UAAU,cAAc,CAAC,KAAiB;IAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC;IAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC;IAE9C,KAAK,CAAC,UAAU,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACzF,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,OAAO,CAAC;IAEhC,MAAM,cAAc,GAAG,oBAAoB,CAAC,CAAC,~~EAAE~~,CAAC,~~EAAE~~,~~IAAI~~,CAAC,CAAC;~~IACxD~~,cAAc,CAAC,IAAI,GAAG,YAAY,CAAC;IACnC,KAAK,CAAC,cAAc,GAAG,cAAc,CAAC;IAEtC,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,CAAC,~~EAAE~~,CAAC,~~EAAE~~,~~IAAI~~,CAAC,CAAC;~~IAC3D~~,iBAAiB,CAAC,IAAI,GAAG,eAAe,CAAC;IACzC,KAAK,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAE5C,MAAM,cAAc,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACxD,cAAc,CAAC,IAAI,GAAG,YAAY,CAAC;IACnC,KAAK,CAAC,cAAc,GAAG,cAAc,CAAC;IAEtC,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACvD,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;IACxB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAE5B,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1D,gBAAgB,CAAC,IAAI,GAAG,cAAc,CAAC;IACvC,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAE1C,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3D,iBAAiB,CAAC,IAAI,GAAG,eAAe,CAAC;IACzC,KAAK,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAE5C,MAAM,cAAc,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,cAAc,CAAC,IAAI,GAAG,WAAW,CAAC;IAClC,KAAK,CAAC,cAAc,GAAG,cAAc,CAAC;IAEtC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,mBAAmB,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACrD,KAAK,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IAEhD,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAChE,sBAAsB,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC3D,KAAK,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;IAEtD,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/D,qBAAqB,CAAC,IAAI,GAAG,2BAA2B,CAAC;IACzD,KAAK,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IAEpD,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAErC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC1C,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAE7C,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC1C,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAE5C,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IAClD,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAC/C,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IACjD,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC7C,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAa,EAAE,MAAc,EAAE,IAAc;IACzE,OAAO,IAAI,KAAK,CAAC;QACf,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,KAAK;QACL,MAAM;QACN,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,KAAK;QACnB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;AACL,CAAC","file":"init-scenegraph.js","sourcesContent":["import { ~~Group~~ } from '~~../graphic/group~~';\nimport ~~type~~ { ~~Scenegraph~~ } from '../~~scenegraph~~';\nimport { ~~createCornerCell~~ } from '../~~style/corner-cell~~';\n\nexport function initSceneGraph(scene: Scenegraph) {\n const width = scene.table.tableNoFrameWidth;\n const height = scene.table.tableNoFrameHeight;\n\n scene.tableGroup = new Group({ x: 0, y: 0, width, height, clip: true, pickable: false });\n scene.tableGroup.role = 'table';\n\n const colHeaderGroup = createContainerGroup(0, 0, ~~true~~);\n colHeaderGroup.role = 'col-header';\n scene.colHeaderGroup = colHeaderGroup;\n\n const cornerHeaderGroup = createContainerGroup(0, 0, ~~true~~);\n cornerHeaderGroup.role = 'corner-header';\n scene.cornerHeaderGroup = cornerHeaderGroup;\n\n const rowHeaderGroup = createContainerGroup(0, 0, true);\n rowHeaderGroup.role = 'row-header';\n scene.rowHeaderGroup = rowHeaderGroup;\n\n const bodyGroup = createContainerGroup(width, 0, true);\n bodyGroup.role = 'body';\n scene.bodyGroup = bodyGroup;\n\n const rightFrozenGroup = createContainerGroup(0, 0, true);\n rightFrozenGroup.role = 'right-frozen';\n scene.rightFrozenGroup = rightFrozenGroup;\n\n const bottomFrozenGroup = createContainerGroup(0, 0, true);\n bottomFrozenGroup.role = 'bottom-frozen';\n scene.bottomFrozenGroup = bottomFrozenGroup;\n\n const componentGroup = createContainerGroup(0, 0);\n componentGroup.role = 'component';\n scene.componentGroup = componentGroup;\n\n const rightTopCornerGroup = createContainerGroup(0, 0, true);\n rightTopCornerGroup.role = 'corner-right-top-header';\n scene.rightTopCornerGroup = rightTopCornerGroup;\n\n const rightBottomCornerGroup = createContainerGroup(0, 0, true);\n rightBottomCornerGroup.role = 'corner-right-bottom-header';\n scene.rightBottomCornerGroup = rightBottomCornerGroup;\n\n const leftBottomCornerGroup = createContainerGroup(0, 0, true);\n leftBottomCornerGroup.role = 'corner-left-bottom-header';\n scene.leftBottomCornerGroup = leftBottomCornerGroup;\n\n scene.tableGroup.addChild(bodyGroup);\n //注意这块添加的顺序会影响select框选效果有可能引起框选框覆盖其他部分group的问题具体问题出在update-select-border文件中的updateComponent方法\n scene.tableGroup.addChild(rowHeaderGroup);\n scene.tableGroup.addChild(bottomFrozenGroup);\n\n scene.tableGroup.addChild(colHeaderGroup);\n scene.tableGroup.addChild(rightFrozenGroup);\n\n scene.tableGroup.addChild(rightBottomCornerGroup);\n scene.tableGroup.addChild(rightTopCornerGroup);\n scene.tableGroup.addChild(leftBottomCornerGroup);\n scene.tableGroup.addChild(cornerHeaderGroup);\n scene.tableGroup.addChild(componentGroup);\n}\n\nfunction createContainerGroup(width: number, height: number, clip?: boolean) {\n return new Group({\n x: 0,\n y: 0,\n width,\n height,\n clip: clip ?? false,\n pickable: false\n });\n}\n"]}
1	+ {"version":3,"sources":["../src/scenegraph/group-creater/init-scenegraph.ts"],"names":[],"mappings":"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","file":"init-scenegraph.js","sourcesContent":["import type { ListTableConstructorOptions } from '../..';\nimport { Group } from '../graphic/group';\nimport type { Scenegraph } from '../scenegraph';\n\nexport function initSceneGraph(scene: Scenegraph) {\n const width = scene.table.tableNoFrameWidth;\n const height = scene.table.tableNoFrameHeight;\n\n scene.tableGroup = new Group({ x: 0, y: 0, width, height, clip: true, pickable: false });\n scene.tableGroup.role = 'table';\n\n const colHeaderGroup = createContainerGroup(\n 0,\n 0,\n !(scene.table.options as ListTableConstructorOptions).enableTreeStickCell\n );\n colHeaderGroup.role = 'col-header';\n scene.colHeaderGroup = colHeaderGroup;\n\n const cornerHeaderGroup = createContainerGroup(\n 0,\n 0,\n !(scene.table.options as ListTableConstructorOptions).enableTreeStickCell\n );\n cornerHeaderGroup.role = 'corner-header';\n scene.cornerHeaderGroup = cornerHeaderGroup;\n\n const rowHeaderGroup = createContainerGroup(0, 0, true);\n rowHeaderGroup.role = 'row-header';\n scene.rowHeaderGroup = rowHeaderGroup;\n\n const bodyGroup = createContainerGroup(width, 0, true);\n bodyGroup.role = 'body';\n scene.bodyGroup = bodyGroup;\n\n const rightFrozenGroup = createContainerGroup(0, 0, true);\n rightFrozenGroup.role = 'right-frozen';\n scene.rightFrozenGroup = rightFrozenGroup;\n\n const bottomFrozenGroup = createContainerGroup(0, 0, true);\n bottomFrozenGroup.role = 'bottom-frozen';\n scene.bottomFrozenGroup = bottomFrozenGroup;\n\n const componentGroup = createContainerGroup(0, 0);\n componentGroup.role = 'component';\n scene.componentGroup = componentGroup;\n\n const rightTopCornerGroup = createContainerGroup(0, 0, true);\n rightTopCornerGroup.role = 'corner-right-top-header';\n scene.rightTopCornerGroup = rightTopCornerGroup;\n\n const rightBottomCornerGroup = createContainerGroup(0, 0, true);\n rightBottomCornerGroup.role = 'corner-right-bottom-header';\n scene.rightBottomCornerGroup = rightBottomCornerGroup;\n\n const leftBottomCornerGroup = createContainerGroup(0, 0, true);\n leftBottomCornerGroup.role = 'corner-left-bottom-header';\n scene.leftBottomCornerGroup = leftBottomCornerGroup;\n\n scene.tableGroup.addChild(bodyGroup);\n //注意这块添加的顺序会影响select框选效果有可能引起框选框覆盖其他部分group的问题具体问题出在update-select-border文件中的updateComponent方法\n scene.tableGroup.addChild(rowHeaderGroup);\n scene.tableGroup.addChild(bottomFrozenGroup);\n\n scene.tableGroup.addChild(colHeaderGroup);\n scene.tableGroup.addChild(rightFrozenGroup);\n\n scene.tableGroup.addChild(rightBottomCornerGroup);\n scene.tableGroup.addChild(rightTopCornerGroup);\n scene.tableGroup.addChild(leftBottomCornerGroup);\n scene.tableGroup.addChild(cornerHeaderGroup);\n scene.tableGroup.addChild(componentGroup);\n}\n\nfunction createContainerGroup(width: number, height: number, clip?: boolean) {\n return new Group({\n x: 0,\n y: 0,\n width,\n height,\n clip: clip ?? false,\n pickable: false\n });\n}\n"]}

package/es/scenegraph/layout/compute-col-width.js CHANGED Viewed

@@ -8,8 +8,6 @@ import { getProp } from "../utils/get-prop";
 import { Factory } from "../../core/factory";
-import { Group as VGroup } from "./../../vrender";
 import { isArray, isFunction, isNumber, isObject, isValid } from "@visactor/vutils";
 import { decodeReactDom, dealPercentCalc } from "../component/custom";
@@ -159,7 +157,7 @@ function computeCustomRenderWidth(col, row, table) {
         };
         if (isFunction(customLayout)) {
             const customLayoutObj = customLayout(arg);
-            if (customLayoutObj.rootContainer instanceof VGroup) {
+            if (customLayoutObj.rootContainer) {
                 customLayoutObj.rootContainer = decodeReactDom(customLayoutObj.rootContainer), dealPercentCalc(customLayoutObj.rootContainer, 0, table.getRowHeight(row));
                 const setedWidth = customLayoutObj.rootContainer.attribute.width;
                 customLayoutObj.rootContainer.setStage(table.scenegraph.stage), width = setedWidth > 0 ? setedWidth : null !== (_b = customLayoutObj.rootContainer.AABBBounds.width()) && void 0 !== _b ? _b : 0,