Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(conditional-formatting): support row/col hidden (#1747)
Gpound.liu7ed59d138b91
diff --git a/packages/sheets-conditional-formatting-ui/src/commands/commands/add-average-cf.command.ts b/packages/sheets-conditional-formatting-ui/src/commands/commands/add-average-cf.command.tsindex 87dacbc85e..248885e1d5 100644--- a/packages/sheets-conditional-formatting-ui/src/commands/commands/add-average-cf.command.ts+++ b/packages/sheets-conditional-formatting-ui/src/commands/commands/add-average-cf.command.ts@@ -30,7 +30,7 @@ interface IAddAverageCfParams {operator: IAverageHighlightCell['operator'];}// { ranges: [{ startRow: 0, endRow: 10, startColumn: 3, endColumn: 3 }, { startRow: 0, endRow: 10, startColumn: 5, endColumn: 5 }], style: { fs: 30 }, operator: 'greaterThan' };-export const DddAverageCfCommand: ICommand<IAddAverageCfParams> = {+export const AddAverageCfCommand: ICommand<IAddAverageCfParams> = {type: CommandType.COMMAND,id: 'sheet.command.add-average-conditional-rule',handler(accessor, params) {diff --git a/packages/sheets-conditional-formatting-ui/src/plugin.ts b/packages/sheets-conditional-formatting-ui/src/plugin.tsindex afe769e01a..726b448d30 100644--- a/packages/sheets-conditional-formatting-ui/src/plugin.ts+++ b/packages/sheets-conditional-formatting-ui/src/plugin.ts@@ -17,7 +17,7 @@import { ICommandService, Plugin, PluginType } from '@univerjs/core';import { Inject, Injector } from '@wendellhu/redi';import { SHEET_CONDITIONAL_FORMATTING_PLUGIN, SheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting';-import { DddAverageCfCommand } from './commands/commands/add-average-cf.command';+import { AddAverageCfCommand } from './commands/commands/add-average-cf.command';import { AddColorScaleConditionalRuleCommand } from './commands/commands/add-color-scale-cf.command';import { AddDataBarConditionalRuleCommand } from './commands/commands/add-data-bar-cf.command';import { AddDuplicateValuesCfCommand } from './commands/commands/add-duplicate-values-cf.command';@@ -46,7 +46,7 @@ import { ConditionalFormattingClearController } from './controllers/cf.clear.conexport class SheetsConditionalFormattingUiPlugin extends Plugin {static override type = PluginType.Sheet;static commandList = [- DddAverageCfCommand,+ AddAverageCfCommand,AddColorScaleConditionalRuleCommand,AddDataBarConditionalRuleCommand,AddDuplicateValuesCfCommand,diff --git a/packages/sheets-conditional-formatting/src/render/data-bar.render.ts b/packages/sheets-conditional-formatting/src/render/data-bar.render.tsindex 3d4e966504..c0a41a366a 100644--- a/packages/sheets-conditional-formatting/src/render/data-bar.render.ts+++ b/packages/sheets-conditional-formatting/src/render/data-bar.render.ts@@ -46,6 +46,10 @@ export class DataBar extends SheetExtension {Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {const cellData = worksheet.getCell(row, col) as IDataBarCellData;if (cellData && cellData.dataBar) {+ if (!worksheet.getColVisible(col) || !worksheet.getRowVisible(row)) {+ return;+ }+const { color, value, startPoint, isGradient } = cellData.dataBar;const cellInfo = this.getCellIndex(row, col, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);let { isMerged, isMergedMainCell, mergeInfo, startY, endY, startX, endX } = cellInfo;diff --git a/packages/sheets-conditional-formatting/src/render/icon.render.ts b/packages/sheets-conditional-formatting/src/render/icon.render.tsindex d9a389826a..47c542b80c 100644--- a/packages/sheets-conditional-formatting/src/render/icon.render.ts+++ b/packages/sheets-conditional-formatting/src/render/icon.render.ts@@ -58,6 +58,10 @@ export class ConditionalFormattingIcon extends SheetExtension {Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {const cellData = worksheet.getCell(row, col) as IIconSetCellData;if (cellData?.iconSet) {+ if (!worksheet.getColVisible(col) || !worksheet.getRowVisible(row)) {+ return;+ }+const { iconType, iconId } = cellData.iconSet;if (iconType === EMPTY_ICON_TYPE) {return;