opensource/univer
3
0
Fork 0
mirror of https://github.com/dream-num/univer.git synced 2026-08-29 07:13:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(dataValidation): fix get validator status api in merge cell (#6266)

Browse Source
This commit is contained in:
wpxp123456
2025-12-09 14:19:52 +08:00
committed by GitHub
parent 8ffeac5419
commit 710faf9963
1 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/sheets-data-validation/src/services/dv-validator-service.ts
+54 -10
View File
@@ -81,13 +81,22 @@ export class SheetsDataValidationValidatorService extends Disposable {
throw new Error(`row or col is not defined, row: ${row}, col: ${col}`);
}
const rule = this._sheetDataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);
let _row = row;
let _col = col;
const mergedCell = worksheet.getMergedCell(row, col);
if (mergedCell) {
_row = mergedCell.startRow;
_col = mergedCell.startColumn;
}
const rule = this._sheetDataValidationModel.getRuleByLocation(unitId, subUnitId, _row, _col);
if (!rule) {
return DataValidationStatus.VALID;
}
return new Promise<DataValidationStatus>((resolve) => {
this._sheetDataValidationModel.validator(rule, { unitId, subUnitId, row, col, worksheet, workbook }, (status) => {
this._sheetDataValidationModel.validator(rule, { unitId, subUnitId, row: _row, col: _col, worksheet, workbook }, (status) => {
resolve(status);
});
});
@@ -107,7 +116,7 @@ export class SheetsDataValidationValidatorService extends Disposable {
return this._validatorByCell(workbook, worksheet, row, col);
}
validatorRanges(unitId: string, subUnitId: string, ranges: IRange[]) {
async validatorRanges(unitId: string, subUnitId: string, ranges: IRange[]) {
if (!ranges.length) {
return Promise.resolve([]);
}
@@ -121,18 +130,53 @@ export class SheetsDataValidationValidatorService extends Disposable {
if (!worksheet) {
throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);
}
const allRules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
const ruleRanges = allRules.map((i) => i.ranges).flat();
const intersectRanges = ranges.map((range) => ruleRanges.map((ruleRange) => getIntersectRange(range, ruleRange))).flat().filter(Boolean) as IRange[];
return Promise.all(intersectRanges.map((range) => {
const promises: Promise<DataValidationStatus>[] = [];
Range.foreach(range, (row, col) => {
promises.push(this._validatorByCell(workbook, worksheet, row, col));
const mergeCells: Array<{
resultRowIndex: number;
resultColIndex: number;
row: number;
col: number;
}> = [];
const result = await Promise.all(
intersectRanges.map((range, resultRowIndex) => {
const promises: Promise<DataValidationStatus>[] = [];
for (let row = range.startRow; row <= range.endRow; row++) {
for (let col = range.startColumn; col <= range.endColumn; col++) {
promises.push(this._validatorByCell(workbook, worksheet, row, col));
const mergedCell = worksheet.getMergedCell(row, col);
if (mergedCell) {
mergeCells.push({
resultRowIndex,
resultColIndex: promises.length - 1,
row: mergedCell.startRow,
col: mergedCell.startColumn,
});
}
}
}
return Promise.all(promises);
})
);
/**
* If this range has merged cells, the validation status of merged cells should be the same as the main cell, so we need to update the status of merged cells here after all validations are done.
* Because during the validation process, merged cells are all marked as VALIDATING status in cache.
*/
if (mergeCells.length) {
mergeCells.forEach(({ resultRowIndex, resultColIndex, row, col }) => {
if (result[resultRowIndex][resultColIndex] === DataValidationStatus.VALIDATING) {
result[resultRowIndex][resultColIndex] = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col) ?? DataValidationStatus.VALID;
}
});
return Promise.all(promises);
}));
}
return result;
}
async validatorWorksheet(unitId: string, subUnitId: string) {