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
feat(sheets-data-validation): optimize data validation memory usage (#4129)
zhangw814bc84b8395
diff --git a/packages/core/src/sheets/typedef.ts b/packages/core/src/sheets/typedef.tsindex 2c8fe3fb84..c211cd11c3 100644--- a/packages/core/src/sheets/typedef.ts+++ b/packages/core/src/sheets/typedef.ts@@ -19,7 +19,6 @@ import type { IObjectArrayPrimitiveType, IObjectMatrixPrimitiveType, Nullable }import type { LocaleType } from '../types/enum/locale-type';import type { IDocumentData } from '../types/interfaces';import type { ICellCustomRender } from '../types/interfaces/i-cell-custom-render';-import type { ICellValidationData } from '../types/interfaces/i-cell-validation-data';import type { IStyleData } from '../types/interfaces/i-style-data';import { type BooleanNumber, CellValueType } from '../types/enum';@@ -272,7 +271,6 @@ export interface ICellMarks {export interface ICellDataForSheetInterceptor extends ICellData {interceptorStyle?: Nullable<IStyleData>;isInArrayFormulaRange?: Nullable<boolean>;- dataValidation?: Nullable<ICellValidationData>;markers?: ICellMarks;customRender?: Nullable<ICellCustomRender[]>;interceptorAutoHeight?: () => number | undefined;diff --git a/packages/core/src/types/interfaces/i-cell-custom-render.ts b/packages/core/src/types/interfaces/i-cell-custom-render.tsindex 22924f0893..debd7aa0f7 100644--- a/packages/core/src/types/interfaces/i-cell-custom-render.ts+++ b/packages/core/src/types/interfaces/i-cell-custom-render.ts@@ -23,7 +23,7 @@ import type { Worksheet } from '../../sheets/worksheet';import type { IStyleData } from './i-style-data';export interface ICellRenderContext {- data: ICellDataForSheetInterceptor;+ data: Nullable<ICellDataForSheetInterceptor>;style: Nullable<IStyleData>;primaryWithCoord: ICellWithCoord;unitId: string;diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-alert.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-alert.controller.tsindex 630b60816b..5cfd626fd0 100644--- a/packages/sheets-data-validation-ui/src/controllers/dv-alert.controller.ts+++ b/packages/sheets-data-validation-ui/src/controllers/dv-alert.controller.ts@@ -17,6 +17,7 @@import type { Workbook } from '@univerjs/core';import type { BaseDataValidator } from '@univerjs/data-validation';import { DataValidationStatus, Disposable, Inject, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';+import { SheetDataValidationModel } from '@univerjs/sheets-data-validation';import { CellAlertManagerService, CellAlertType, HoverManagerService } from '@univerjs/sheets-ui';import { IZenZoneService } from '@univerjs/ui';import { debounceTime } from 'rxjs';@@ -29,7 +30,8 @@ export class DataValidationAlertController extends Disposable {@Inject(CellAlertManagerService) private readonly _cellAlertManagerService: CellAlertManagerService,@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@Inject(LocaleService) private readonly _localeService: LocaleService,- @IZenZoneService private readonly _zenZoneService: IZenZoneService+ @IZenZoneService private readonly _zenZoneService: IZenZoneService,+ @Inject(SheetDataValidationModel) private readonly _dataValidationModel: SheetDataValidationModel) {super();this._init();@@ -46,10 +48,11 @@ export class DataValidationAlertController extends Disposable {const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;const worksheet = workbook.getActiveSheet();if (!worksheet) return;+ const rule = this._dataValidationModel.getRuleByLocation(cellPos.location.unitId, cellPos.location.subUnitId, cellPos.location.row, cellPos.location.col);+ if (!rule) return;- const cellData = worksheet.getCell(cellPos.location.row, cellPos.location.col);-- if (cellData?.dataValidation?.validStatus === DataValidationStatus.INVALID) {+ const validStatus = this._dataValidationModel.validator(rule, cellPos.location);+ if (validStatus === DataValidationStatus.INVALID) {const currentAlert = this._cellAlertManagerService.currentAlert.get(ALERT_KEY);const currentLoc = currentAlert?.alert?.location;if (@@ -61,8 +64,8 @@ export class DataValidationAlertController extends Disposable {) {return;}- const validator = cellData.dataValidation.validator as BaseDataValidator;- const rule = cellData.dataValidation.rule;++ const validator = this._dataValidationModel.getValidator(rule.type) as BaseDataValidator;if (!validator) {return;}diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.tsindex 16387a374f..9821d19dc4 100644--- a/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.ts+++ b/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.ts@@ -146,7 +146,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {if (!rule) {return next(cell);}- const validStatus = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col)?.status ?? DataValidationStatus.VALID;+ const validStatus = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col) ?? DataValidationStatus.VALID;const validator = this._dataValidatorRegistryService.getValidatorItem(rule.type);const cellOrigin = pos.rawData;let cache: Nullable<CellValue>;@@ -167,12 +167,6 @@ export class SheetsDataValidationRenderController extends RxDisposable {return next({...cell,- dataValidation: {- ruleId,- validStatus,- rule,- validator,- },markers: {...cell?.markers,...validStatus === DataValidationStatus.INVALID ? INVALID_MARK : null,@@ -205,15 +199,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {const mergeCell = skeleton.worksheet.getMergedCell(row, col);const info: ICellRenderContext = {- data: {- ...cell,- dataValidation: {- ruleId,- validStatus,- rule,- validator,- },- },+ data: cell,style: skeleton.getsStyles().getStyleByCell(cell),primaryWithCoord: skeleton.getCellWithCoordByIndex(mergeCell?.startRow ?? row, mergeCell?.startColumn ?? col),unitId,@@ -236,15 +222,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {const mergeCell = skeleton.worksheet.getMergedCell(row, col);const info: ICellRenderContext = {- data: {- ...cell,- dataValidation: {- ruleId,- validStatus,- rule,- validator,- },- },+ data: cell,style: skeleton.getsStyles().getStyleByCell(cell),primaryWithCoord: skeleton.getCellWithCoordByIndex(mergeCell?.startRow ?? row, mergeCell?.startColumn ?? col),unitId,@@ -305,7 +283,6 @@ export class SheetsDataValidationMobileRenderController extends RxDisposable {this._initAutoHeight();}- // eslint-disable-next-line max-lines-per-functionprivate _initViewModelIntercept() {this.disposeWithMe(this._sheetInterceptorService.intercept(@@ -326,7 +303,7 @@ export class SheetsDataValidationMobileRenderController extends RxDisposable {if (!rule) {return next(cell);}- const validStatus = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col)?.status ?? DataValidationStatus.VALID;+ const validStatus = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col) ?? DataValidationStatus.VALID;const validator = this._dataValidatorRegistryService.getValidatorItem(rule.type);const cellOrigin = worksheet.getCellRaw(row, col);const cellValue = getCellValueOrigin(cellOrigin);@@ -334,12 +311,6 @@ export class SheetsDataValidationMobileRenderController extends RxDisposable {return next({...cell,- dataValidation: {- ruleId,- validStatus,- rule,- validator,- },markers: {...cell?.markers,...validStatus === DataValidationStatus.INVALID ? INVALID_MARK : null,@@ -372,15 +343,7 @@ export class SheetsDataValidationMobileRenderController extends RxDisposable {const mergeCell = skeleton.worksheet.getMergedCell(row, col);const info: ICellRenderContext = {- data: {- ...cell,- dataValidation: {- ruleId,- validStatus,- rule,- validator,- },- },+ data: cell,style: skeleton.getsStyles().getStyleByCell(cell),primaryWithCoord: skeleton.getCellWithCoordByIndex(mergeCell?.startRow ?? row, mergeCell?.startColumn ?? col),unitId,diff --git a/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsx b/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsxindex bea55f7efd..1bea9c4230 100644--- a/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsx@@ -22,7 +22,7 @@ import { CellValueType, DataValidationErrorStyle, dayjs, ICommandService, Localeimport { Button, DatePanel } from '@univerjs/design';import { DeviceInputEventType } from '@univerjs/engine-render';import { SetRangeValuesCommand } from '@univerjs/sheets';-import { getCellValueOrigin } from '@univerjs/sheets-data-validation';+import { getCellValueOrigin, SheetDataValidationModel } from '@univerjs/sheets-data-validation';import { getPatternType } from '@univerjs/sheets-numfmt';import { SetCellEditVisibleOperation } from '@univerjs/sheets-ui';import { KeyCode } from '@univerjs/ui';@@ -52,18 +52,24 @@ export function DateDropdown(props: IDropdownComponentProps) {const commandService = useDependency(ICommandService);const rejectInputController = useDependency(DataValidationRejectInputController);const cellData = worksheet.getCell(row, col);- const rule = cellData?.dataValidation?.rule;- const validator = cellData?.dataValidation?.validator as DateValidator | undefined;const cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col));const originDate = transformDate(cellStr);const [localDate, setLocalDate] = useState<dayjs.Dayjs | undefined>(originDate);- const showTime = Boolean(rule?.bizInfo?.showTime);+const date = localDate && localDate.isValid() ? localDate : dayjs();const localeService = useDependency(LocaleService);- if (!cellData || !rule || !validator) {- return;+ const sheetsDataValidationModel = useDependency(SheetDataValidationModel);++ const rule = sheetsDataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);+ if (!rule) {+ return null;}+ const validator = sheetsDataValidationModel.getValidator(rule.type) as DateValidator | undefined;+ if (!cellData || !validator) {+ return;+ }+ const showTime = Boolean(rule.bizInfo?.showTime);const handleSave = async () => {if (!date) {return;diff --git a/packages/sheets-data-validation-ui/src/views/components/drop-down/CellDropdown.tsx b/packages/sheets-data-validation-ui/src/views/components/drop-down/CellDropdown.tsxindex 099b9ae486..240ec8266c 100644--- a/packages/sheets-data-validation-ui/src/views/components/drop-down/CellDropdown.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/drop-down/CellDropdown.tsx@@ -23,7 +23,6 @@ export function CellDropdown() {const dropdownManagerService = useDependency(DataValidationDropdownManagerService);const activeDropdown = useObservable(dropdownManagerService.activeDropdown$, dropdownManagerService.activeDropdown);const componentManager = useDependency(ComponentManager);-if (!activeDropdown) {return null;}diff --git a/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx b/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsxindex 8b3f2a4616..917159e7dc 100644--- a/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx@@ -28,7 +28,7 @@ import { RichTextEditingMutation } from '@univerjs/docs';import { DeviceInputEventType } from '@univerjs/engine-render';import { CheckMarkSingle } from '@univerjs/icons';import { RangeProtectionPermissionEditPoint, SetRangeValuesCommand, WorkbookEditablePermission, WorksheetEditPermission } from '@univerjs/sheets';-import { deserializeListOptions, getDataValidationCellValue, serializeListOptions } from '@univerjs/sheets-data-validation';+import { deserializeListOptions, getDataValidationCellValue, serializeListOptions, SheetDataValidationModel } from '@univerjs/sheets-data-validation';import { IEditorBridgeService, SetCellEditVisibleOperation, SheetPermissionInterceptorBaseController } from '@univerjs/sheets-ui';import { KeyCode, RectPopup, useObservable } from '@univerjs/ui';import React, { useEffect, useMemo, useState } from 'react';@@ -145,6 +145,7 @@ export function ListDropDown(props: IDropdownComponentProps) {const editorBridgeService = useDependency(IEditorBridgeService);const instanceService = useDependency(IUniverInstanceService);const ruleChange$ = useMemo(() => dataValidationModel.ruleChange$.pipe(debounceTime(16)), []);+ const sheetsDataValidationModel = useDependency(SheetDataValidationModel);useObservable(ruleChange$);const anchorRect = RectPopup.useContext();const cellWidth = (anchorRect.current?.right ?? 0) - (anchorRect.current?.left ?? 0);@@ -172,9 +173,17 @@ export function ListDropDown(props: IDropdownComponentProps) {return null;}+ const rule = sheetsDataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);+ if (!rule) {+ return null;+ }+ const validator = sheetsDataValidationModel.getValidator(rule.type) as ListMultipleValidator | undefined;+ if (!validator) {+ return null;+ }+const cellData = worksheet.getCell(row, col);- const rule = cellData?.dataValidation?.rule;- const validator = cellData?.dataValidation?.validator as ListMultipleValidator | undefined;+const showColor = rule?.renderMode === DataValidationRenderMode.CUSTOM || rule?.renderMode === undefined;if (!cellData || !rule || !validator || validator.id.indexOf(DataValidationType.LIST) !== 0) {diff --git a/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts b/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.tsindex f3b1784982..4b4b16ea98 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts@@ -15,14 +15,14 @@*/import type { ICellRenderContext, IDataValidationRule, IStyleData, Nullable } from '@univerjs/core';-import type { BaseDataValidator, IBaseDataValidationWidget, IFormulaResult } from '@univerjs/data-validation';+import type { IBaseDataValidationWidget, IFormulaResult } from '@univerjs/data-validation';import type { IMouseEvent, IPointerEvent, UniverRenderingContext, UniverRenderingContext2D } from '@univerjs/engine-render';import type { ISetRangeValuesCommandParams } from '@univerjs/sheets';import type { CheckboxValidator } from '@univerjs/sheets-data-validation';import { HorizontalAlign, ICommandService, Inject, isFormulaString, ThemeService, UniverInstanceType, VerticalAlign } from '@univerjs/core';import { Checkbox, CURSOR_TYPE, fixLineWidthByScale, IRenderManagerService, Transform } from '@univerjs/engine-render';import { SetRangeValuesCommand } from '@univerjs/sheets';-import { CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, DataValidationFormulaService, getCellValueOrigin, getFormulaResult, isLegalFormulaResult, transformCheckboxValue } from '@univerjs/sheets-data-validation';+import { CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, DataValidationFormulaService, getCellValueOrigin, getFormulaResult, isLegalFormulaResult, SheetDataValidationModel, transformCheckboxValue } from '@univerjs/sheets-data-validation';const MARGIN_H = 6;@@ -71,7 +71,8 @@ export class CheckboxRender implements IBaseDataValidationWidget {@ICommandService private readonly _commandService: ICommandService,@Inject(DataValidationFormulaService) private readonly _formulaService: DataValidationFormulaService,@Inject(ThemeService) private readonly _themeService: ThemeService,- @Inject(IRenderManagerService) private readonly _renderManagerService: IRenderManagerService+ @Inject(IRenderManagerService) private readonly _renderManagerService: IRenderManagerService,+ @Inject(SheetDataValidationModel) private readonly _dataValidationModel: SheetDataValidationModel) {}@@ -100,12 +101,15 @@ export class CheckboxRender implements IBaseDataValidationWidget {}drawWith(ctx: UniverRenderingContext2D, info: ICellRenderContext): void {- const { style, data, primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info;+ const { style, primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info;const cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;const value = getCellValueOrigin(worksheet.getCellRaw(row, col));- const rule = data.dataValidation?.rule;- const validator = data.dataValidation?.validator as CheckboxValidator;- if (!rule || !validator) {+ const rule = this._dataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);+ if (!rule) {+ return;+ }+ const validator = this._dataValidationModel.getValidator(rule.type) as CheckboxValidator;+ if (!validator) {return;}@@ -177,11 +181,14 @@ export class CheckboxRender implements IBaseDataValidationWidget {if (evt.button === 2) {return;}- const { primaryWithCoord, unitId, subUnitId, data, worksheet, row, col } = info;+ const { primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info;const value = getCellValueOrigin(worksheet.getCellRaw(row, col));- const rule = data.dataValidation?.rule;- const validator = data.dataValidation?.validator as BaseDataValidator;- if (!rule || !validator) {+ const rule = this._dataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);+ if (!rule) {+ return;+ }+ const validator = this._dataValidationModel.getValidator(rule.type) as CheckboxValidator;+ if (!validator) {return;}diff --git a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.ts b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.tsindex b13aaf7e85..994c06ceae 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.ts@@ -22,7 +22,7 @@ import type { IShowDataValidationDropdownParams } from '../../commands/operationimport type { IDropdownInfo } from './dropdown-widget';import { HorizontalAlign, ICommandService, Inject, UniverInstanceType, VerticalAlign } from '@univerjs/core';import { CURSOR_TYPE, getFontStyleString, IRenderManagerService } from '@univerjs/engine-render';-import { getCellValueOrigin } from '@univerjs/sheets-data-validation';+import { getCellValueOrigin, SheetDataValidationModel } from '@univerjs/sheets-data-validation';import { ShowDataValidationDropdown } from '../../commands/operations/data-validation.operation';import { CELL_PADDING_H, CELL_PADDING_V, Dropdown, ICON_PLACE, layoutDropdowns, MARGIN_V } from './shape';@@ -34,7 +34,8 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {constructor(@ICommandService private readonly _commandService: ICommandService,- @Inject(IRenderManagerService) private readonly _renderManagerService: IRenderManagerService+ @Inject(IRenderManagerService) private readonly _renderManagerService: IRenderManagerService,+ @Inject(SheetDataValidationModel) private readonly _dataValidationModel: SheetDataValidationModel) {// empty}@@ -80,14 +81,17 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {const { primaryWithCoord, row, col, style, data, subUnitId } = info;const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;- const fontRenderExtension = data.fontRenderExtension;+ const fontRenderExtension = data?.fontRenderExtension;const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};- const validation = data.dataValidation;const map = this._ensureMap(subUnitId);const key = this._generateKey(row, col);-- if (!validation) {+ const rule = this._dataValidationModel.getRuleByLocation(info.unitId, info.subUnitId, row, col);+ if (!rule) {+ return;+ }+ const validator = this._dataValidationModel.getValidator(rule.type) as ListMultipleValidator;+ if (!validator) {return;}@@ -102,8 +106,6 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {const { cl } = style || {};const color = (typeof cl === 'object' ? cl?.rgb : cl) ?? '#000';const fontStyle = getFontStyleString(style ?? undefined);- const { rule, validator: _validator } = validation;- const validator = _validator as ListMultipleValidator;const { vt: _vt, ht } = style || {};const vt = _vt ?? VerticalAlign.MIDDLE;const cellValue = getCellValueOrigin(data) ?? '';@@ -170,8 +172,8 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {}calcCellAutoHeight(info: ICellRenderContext): number | undefined {- const { primaryWithCoord, style, data } = info;- const fontRenderExtension = data.fontRenderExtension;+ const { primaryWithCoord, style, data, row, col } = info;+ const fontRenderExtension = data?.fontRenderExtension;const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;const cellBounding = {@@ -180,15 +182,17 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {startY: _cellBounding.startY + topOffset,endY: _cellBounding.endY - downOffset,};- const validation = data.dataValidation;- if (!validation) {- return undefined;+ const rule = this._dataValidationModel.getRuleByLocation(info.unitId, info.subUnitId, row, col);+ if (!rule) {+ return;+ }+ const validator = this._dataValidationModel.getValidator(rule.type) as ListMultipleValidator;+ if (!validator) {+ return;}const cellWidth = cellBounding.endX - cellBounding.startX;const cellHeight = cellBounding.endY - cellBounding.startY;const cellValue = getCellValueOrigin(data) ?? '';- const { validator: _validator } = validation;- const validator = _validator as ListMultipleValidator;const items = validator.parseCellValue(cellValue);const fontStyle = getFontStyleString(style ?? undefined);const layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);@@ -196,8 +200,8 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {}calcCellAutoWidth(info: ICellRenderContext): number | undefined {- const { primaryWithCoord, style, data } = info;- const fontRenderExtension = data.fontRenderExtension;+ const { primaryWithCoord, style, data, row, col } = info;+ const fontRenderExtension = data?.fontRenderExtension;const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;const cellBounding = {@@ -206,15 +210,17 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {startY: _cellBounding.startY + topOffset,endY: _cellBounding.endY - downOffset,};- const validation = data.dataValidation;- if (!validation) {- return undefined;+ const rule = this._dataValidationModel.getRuleByLocation(info.unitId, info.subUnitId, row, col);+ if (!rule) {+ return;+ }+ const validator = this._dataValidationModel.getValidator(rule.type) as ListMultipleValidator;+ if (!validator) {+ return;}const cellWidth = cellBounding.endX - cellBounding.startX;const cellHeight = cellBounding.endY - cellBounding.startY;const cellValue = getCellValueOrigin(data) ?? '';- const { validator: _validator } = validation;- const validator = _validator as ListMultipleValidator;const items = validator.parseCellValue(cellValue);const fontStyle = getFontStyleString(style ?? undefined);const layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);diff --git a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.ts b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.tsindex a6df12a6a5..3f897fa183 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.ts@@ -21,7 +21,7 @@ import type { ListValidator } from '@univerjs/sheets-data-validation';import type { IShowDataValidationDropdownParams } from '../../commands/operations/data-validation.operation';import { BooleanNumber, DataValidationRenderMode, DataValidationType, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DocumentDataModel, HorizontalAlign, ICommandService, Inject, LocaleService, Tools, UniverInstanceType, VerticalAlign, WrapStrategy } from '@univerjs/core';import { CURSOR_TYPE, Documents, DocumentSkeleton, DocumentViewModel, getDocsSkeletonPageSize, IRenderManagerService, Rect } from '@univerjs/engine-render';-import { getCellValueOrigin } from '@univerjs/sheets-data-validation';+import { getCellValueOrigin, SheetDataValidationModel } from '@univerjs/sheets-data-validation';import { ShowDataValidationDropdown } from '../../commands/operations/data-validation.operation';import { DROP_DOWN_DEFAULT_COLOR } from '../../const';@@ -168,7 +168,8 @@ export class DropdownWidget implements IBaseDataValidationWidget {constructor(@Inject(LocaleService) private readonly _localeService: LocaleService,@ICommandService private readonly _commandService: ICommandService,- @Inject(IRenderManagerService) private readonly _renderManagerService: IRenderManagerService+ @Inject(IRenderManagerService) private readonly _renderManagerService: IRenderManagerService,+ @Inject(SheetDataValidationModel) private readonly _dataValidationModel: SheetDataValidationModel) {// super}@@ -223,9 +224,15 @@ export class DropdownWidget implements IBaseDataValidationWidget {drawWith(ctx: UniverRenderingContext2D, info: ICellRenderContext, skeleton: SpreadsheetSkeleton): void {const { primaryWithCoord, row, col, style, data, subUnitId } = info;const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;- const rule = data.dataValidation?.rule;- const validator = data.dataValidation?.validator as ListValidator;- const fontRenderExtension = data.fontRenderExtension;+ const rule = this._dataValidationModel.getRuleByLocation(info.unitId, info.subUnitId, row, col);+ if (!rule) {+ return;+ }+ const validator = this._dataValidationModel.getValidator(rule.type) as ListValidator;+ if (!validator) {+ return;+ }+ const fontRenderExtension = data?.fontRenderExtension;const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};if (!rule || !validator || !validator || validator.id.indexOf(DataValidationType.LIST) !== 0) {@@ -351,14 +358,13 @@ export class DropdownWidget implements IBaseDataValidationWidget {}calcCellAutoHeight(info: ICellRenderContext): number | undefined {- const { primaryWithCoord, style, data } = info;+ const { primaryWithCoord, style, data, row, col } = info;const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;- const fontRenderExtension = data.fontRenderExtension;+ const fontRenderExtension = data?.fontRenderExtension;const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};- const rule = data.dataValidation?.rule;-+ const rule = this._dataValidationModel.getRuleByLocation(info.unitId, info.subUnitId, row, col);if (!rule) {return;}@@ -418,15 +424,20 @@ export class DropdownWidget implements IBaseDataValidationWidget {}calcCellAutoWidth(info: ICellRenderContext): number | undefined {- const { primaryWithCoord, style, data } = info;+ const { primaryWithCoord, style, data, row, col } = info;const cellRange = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;- const fontRenderExtension = data.fontRenderExtension;+ const fontRenderExtension = data?.fontRenderExtension;const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};- const rule = data.dataValidation?.rule;- if (!rule) return;- if (rule.renderMode === DataValidationRenderMode.TEXT) return;+ const rule = this._dataValidationModel.getRuleByLocation(info.unitId, info.subUnitId, row, col);+ if (!rule) {+ return;+ }++ if (rule.renderMode === DataValidationRenderMode.TEXT) {+ return;+ }const cellBounding = {startX: cellRange.startX + leftOffset,@@ -468,15 +479,18 @@ export class DropdownWidget implements IBaseDataValidationWidget {}isHit(position: { x: number; y: number }, info: ICellRenderContext) {- const { data, subUnitId, row, col } = info;+ const { subUnitId, row, col } = info;const map = this._ensureMap(subUnitId);const dropdownInfo = map.get(this._generateKey(row, col));- const validation = data.dataValidation;+ const rule = this._dataValidationModel.getRuleByLocation(info.unitId, info.subUnitId, row, col);+ if (!rule) {+ return false;+ }- if (!validation || !dropdownInfo) {+ if (!dropdownInfo) {return false;}- if (validation.rule.renderMode === DataValidationRenderMode.TEXT) {+ if (rule.renderMode === DataValidationRenderMode.TEXT) {return false;}const { top, left, width, height } = dropdownInfo;diff --git a/packages/sheets-data-validation/src/commands/commands/data-validation.command.ts b/packages/sheets-data-validation/src/commands/commands/data-validation.command.tsindex 0c37a4e9c4..c5d4c5ece3 100644--- a/packages/sheets-data-validation/src/commands/commands/data-validation.command.ts+++ b/packages/sheets-data-validation/src/commands/commands/data-validation.command.ts@@ -18,7 +18,7 @@ import type { CellValue, IAccessor, ICellData, ICommand, IDataValidationRuleBaseimport type { DataValidationChangeSource, IAddDataValidationMutationParams, IRemoveDataValidationMutationParams, IUpdateDataValidationMutationParams } from '@univerjs/data-validation';import type { ISetRangeValuesMutationParams, ISheetCommandSharedParams } from '@univerjs/sheets';import type { RangeMutation } from '../../models/rule-matrix';-import { CommandType, DataValidationType, ICommandService, isFormulaString, IUndoRedoService, IUniverInstanceService, ObjectMatrix, Range, sequenceExecute, Tools } from '@univerjs/core';+import { CommandType, DataValidationType, ICommandService, isFormulaString, isRangesEqual, IUndoRedoService, IUniverInstanceService, ObjectMatrix, Range, sequenceExecute, Tools } from '@univerjs/core';import { AddDataValidationMutation, DataValidatorRegistryService, getRuleOptions, getRuleSetting, RemoveDataValidationMutation, UpdateDataValidationMutation, UpdateRuleType } from '@univerjs/data-validation';import { LexerTreeBuilder } from '@univerjs/engine-formula';import { getSheetCommandTarget, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets';@@ -70,7 +70,7 @@ export function getDataValidationDiffMutations(}const { worksheet } = target;const redoMatrix = new ObjectMatrix<ICellData>();-+ let setRangeValue = false;function setRangesDefaultValue(ranges: IRange[], defaultValue: CellValue) {if (!fillDefaultValue) {return;@@ -80,6 +80,7 @@ export function getDataValidationDiffMutations(const cellData = worksheet.getCellRaw(row, column);const value = getStringCellValue(cellData);if (isBlankCell(cellData) || value === defaultValue) {+ setRangeValue = true;redoMatrix.setValue(row, column, {v: defaultValue,p: null,@@ -124,7 +125,7 @@ export function getDataValidationDiffMutations(const newFormula = isFormulaString(diff.rule.formula1!) ? lexerTreeBuilder.moveFormulaRefOffset(diff.rule.formula1!, columnDiff, rowDiff) : diff.rule.formula1;const newFormula2 = isFormulaString(diff.rule.formula2!) ? lexerTreeBuilder.moveFormulaRefOffset(diff.rule.formula2!, columnDiff, rowDiff) : diff.rule.formula2;- if (newFormula !== diff.rule.formula1 || newFormula2 !== diff.rule.formula2) {+ if (newFormula !== diff.rule.formula1 || newFormula2 !== diff.rule.formula2 || !isRangesEqual(diff.newRanges, diff.oldRanges)) {redoMutations.push({id: UpdateDataValidationMutation.id,params: {@@ -228,22 +229,24 @@ export function getDataValidationDiffMutations(}});- const redoSetRangeValues = {- id: SetRangeValuesMutation.id,- params: {- unitId,- subUnitId,- cellValue: redoMatrix.getData(),- } as ISetRangeValuesMutationParams,- };+ if (setRangeValue) {+ const redoSetRangeValues = {+ id: SetRangeValuesMutation.id,+ params: {+ unitId,+ subUnitId,+ cellValue: redoMatrix.getData(),+ } as ISetRangeValuesMutationParams,+ };- const undoSetRangeValues = {- id: SetRangeValuesMutation.id,- params: SetRangeValuesUndoMutationFactory(accessor, redoSetRangeValues.params),- };+ const undoSetRangeValues = {+ id: SetRangeValuesMutation.id,+ params: SetRangeValuesUndoMutationFactory(accessor, redoSetRangeValues.params),+ };- redoMutations.push(redoSetRangeValues);- undoMutations.push(undoSetRangeValues);+ redoMutations.push(redoSetRangeValues);+ undoMutations.push(undoSetRangeValues);+ }return {redoMutations,diff --git a/packages/sheets-data-validation/src/facade/f-workbook.ts b/packages/sheets-data-validation/src/facade/f-workbook.tsindex dc3fd43ea5..a720a985ee 100644--- a/packages/sheets-data-validation/src/facade/f-workbook.ts+++ b/packages/sheets-data-validation/src/facade/f-workbook.ts@@ -16,16 +16,14 @@import type { IRuleChange } from '@univerjs/data-validation';import type { IAddSheetDataValidationCommandParams,- IDataValidationResCache,IRemoveSheetAllDataValidationCommandParams,IRemoveSheetDataValidationCommandParams,IUpdateSheetDataValidationOptionsCommandParams,IUpdateSheetDataValidationRangeCommandParams,-IUpdateSheetDataValidationSettingCommandParams,IValidStatusChange } from '@univerjs/sheets-data-validation';+import { type DataValidationStatus, type IDisposable, type IExecutionOptions, type Nullable, type ObjectMatrix, toDisposable } from '@univerjs/core';-import { type IDisposable, type IExecutionOptions, type Nullable, type ObjectMatrix, toDisposable } from '@univerjs/core';import { FWorkbook } from '@univerjs/sheets/facade';import { AddSheetDataValidationCommand,RemoveSheetAllDataValidationCommand,@@ -43,7 +41,7 @@ export interface IFWorkbookDataValidationMixin {* get data validation validator status for current workbook* @returns matrix of validator status*/- getValidatorStatus(this: FWorkbook): Promise<Record<string, ObjectMatrix<Nullable<IDataValidationResCache>>>>;+ getValidatorStatus(this: FWorkbook): Promise<Record<string, ObjectMatrix<Nullable<DataValidationStatus>>>>;/*** The onDataValidationChange event is fired when the data validation rule of this sheet is changed.@@ -138,7 +136,7 @@ export class FWorkbookDataValidationMixin extends FWorkbook implements IFWorkboo* get data validation validator status for current workbook* @returns matrix of validator status*/- override getValidatorStatus(): Promise<Record<string, ObjectMatrix<Nullable<IDataValidationResCache>>>> {+ override getValidatorStatus(): Promise<Record<string, ObjectMatrix<Nullable<DataValidationStatus>>>> {const validatorService = this._injector.get(SheetsDataValidationValidatorService);return validatorService.validatorWorkbook(this._workbook.getUnitId());}diff --git a/packages/sheets-data-validation/src/facade/f-worksheet.ts b/packages/sheets-data-validation/src/facade/f-worksheet.tsindex e10a90f7a7..907c59a2f3 100644--- a/packages/sheets-data-validation/src/facade/f-worksheet.ts+++ b/packages/sheets-data-validation/src/facade/f-worksheet.ts@@ -14,8 +14,7 @@* limitations under the License.*/-import type { Nullable, ObjectMatrix } from '@univerjs/core';-import type { IDataValidationResCache } from '@univerjs/sheets-data-validation';+import type { DataValidationStatus, Nullable, ObjectMatrix } from '@univerjs/core';import { DataValidationModel } from '@univerjs/data-validation';import { FWorksheet } from '@univerjs/sheets/facade';import { SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';@@ -31,7 +30,7 @@ export interface IFWorksheetDataValidationMixin {* get data validation validator status for current sheet* @returns matrix of validator status*/- getValidatorStatus(): Promise<ObjectMatrix<Nullable<IDataValidationResCache>>>;+ getValidatorStatus(): Promise<ObjectMatrix<Nullable<DataValidationStatus>>>;}export class FWorksheetDataValidationMixin extends FWorksheet implements IFWorksheetDataValidationMixin {@@ -40,7 +39,7 @@ export class FWorksheetDataValidationMixin extends FWorksheet implements IFWorksreturn dataValidationModel.getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((rule) => new FDataValidation(rule));}- override getValidatorStatus(): Promise<ObjectMatrix<Nullable<IDataValidationResCache>>> {+ override getValidatorStatus(): Promise<ObjectMatrix<Nullable<DataValidationStatus>>> {const validatorService = this._injector.get(SheetsDataValidationValidatorService);return validatorService.validatorWorksheet(this._workbook.getUnitId(),diff --git a/packages/sheets-data-validation/src/index.ts b/packages/sheets-data-validation/src/index.tsindex 9cd2815f7b..58ea8b2078 100644--- a/packages/sheets-data-validation/src/index.ts+++ b/packages/sheets-data-validation/src/index.ts@@ -18,7 +18,6 @@ export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';export { type IValidStatusChange, SheetDataValidationModel } from './models/sheet-data-validation-model';export { UniverSheetsDataValidationPlugin } from './plugin';export { DataValidationCacheService } from './services/dv-cache.service';-export type { IDataValidationResCache } from './services/dv-cache.service';export { DataValidationCustomFormulaService } from './services/dv-custom-formula.service';export { DataValidationFormulaService } from './services/dv-formula.service';export { SheetsDataValidationValidatorService } from './services/dv-validator-service';diff --git a/packages/sheets-data-validation/src/models/sheet-data-validation-model.ts b/packages/sheets-data-validation/src/models/sheet-data-validation-model.tsindex b8b4a2b303..59ec897daa 100644--- a/packages/sheets-data-validation/src/models/sheet-data-validation-model.ts+++ b/packages/sheets-data-validation/src/models/sheet-data-validation-model.ts@@ -163,15 +163,12 @@ export class SheetDataValidationModel extends Disposable {if (payload.type === UpdateRuleType.RANGE) {ruleMatrix.updateRange(ruleId, payload.payload);- this._dataValidationCacheService.updateRuleRanges(unitId, subUnitId, ruleId, payload.payload, oldRule.ranges);- } else if (payload.type === UpdateRuleType.SETTING) {- this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, oldRule.ranges);} else if (payload.type === UpdateRuleType.ALL) {ruleMatrix.updateRange(ruleId, payload.payload.ranges);- this._dataValidationCacheService.updateRuleRanges(unitId, subUnitId, ruleId, payload.payload.ranges, oldRule.ranges);- this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, oldRule.ranges);}+ this._dataValidationCacheService.removeRule(unitId, subUnitId, oldRule);+ this._dataValidationCacheService.addRule(unitId, subUnitId, newRule);this._dataValidationFormulaService.removeRule(unitId, subUnitId, oldRule.uid);this._dataValidationFormulaService.addRule(unitId, subUnitId, newRule);this._dataValidationCustomFormulaService.deleteByRuleId(unitId, subUnitId, ruleId);@@ -205,9 +202,6 @@ export class SheetDataValidationModel extends Disposable {validator(rule: ISheetDataValidationRule, pos: ISheetLocation, _onCompete?: (status: DataValidationStatus, changed: boolean) => void): DataValidationStatus {const { col, row, unitId, subUnitId, worksheet } = pos;- const ruleId = rule.uid;- const formula1 = rule.formula1;- const formula2 = rule.formula2;const onCompete = (status: DataValidationStatus, changed: boolean) => {if (_onCompete) {_onCompete(status, changed);@@ -228,20 +222,12 @@ export class SheetDataValidationModel extends Disposable {const validator = this.getValidator(rule.type);const cellRaw = worksheet.getCellRaw(row, col);const cellValue = getCellValueOrigin(cellRaw);- const interceptValue = getCellValueOrigin(cell);if (validator) {const cache = this._dataValidationCacheService.ensureCache(unitId, subUnitId);const current = cache.getValue(row, col);- if (!current || current.value !== cellValue || current.interceptValue !== interceptValue || current.ruleId !== ruleId || current.formula1 !== formula1 || current.formula2 !== formula2) {- cache.setValue(row, col, {- value: cellValue,- interceptValue,- status: DataValidationStatus.VALIDATING,- ruleId,- formula1: formula1 || '',- formula2: formula2 || '',- });+ if (current === null || current === undefined) {+ cache.setValue(row, col, DataValidationStatus.VALIDATING);validator.validator({value: cellValue,@@ -257,20 +243,19 @@ export class SheetDataValidationModel extends Disposable {rule).then((status) => {const realStatus = status ? DataValidationStatus.VALID : DataValidationStatus.INVALID;- cache.setValue(row, col, {- value: cellValue,- status: realStatus,- ruleId,- interceptValue,- formula1: formula1 || '',- formula2: formula2 || '',- });- onCompete(realStatus, true);+ if (realStatus === DataValidationStatus.VALID) {+ cache.realDeleteValue(row, col);+ } else {+ cache.setValue(row, col, realStatus);+ }+ const now = cache.getValue(row, col);+ onCompete(realStatus, current !== now);});return DataValidationStatus.VALIDATING;}- onCompete(current.status, false);- return current.status;++ onCompete(current ?? DataValidationStatus.VALID, false);+ return current ?? DataValidationStatus.VALID;} else {onCompete(DataValidationStatus.VALID, false);return DataValidationStatus.VALID;diff --git a/packages/sheets-data-validation/src/services/dv-cache.service.ts b/packages/sheets-data-validation/src/services/dv-cache.service.tsindex fbe4624be2..3e1164c662 100644--- a/packages/sheets-data-validation/src/services/dv-cache.service.ts+++ b/packages/sheets-data-validation/src/services/dv-cache.service.ts@@ -14,23 +14,13 @@* limitations under the License.*/-import type { CellValue, DataValidationStatus, IRange, ISheetDataValidationRule, Nullable } from '@univerjs/core';+import type { DataValidationStatus, IRange, ISheetDataValidationRule, Nullable } from '@univerjs/core';import { Disposable, ICommandService, Inject, ObjectMatrix, Range } from '@univerjs/core';import { type ISetRangeValuesMutationParams, SetRangeValuesMutation } from '@univerjs/sheets';import { Subject } from 'rxjs';-export interface IDataValidationResCache {- value: Nullable<CellValue>;- interceptValue: Nullable<CellValue>;- status: DataValidationStatus;- ruleId: string;- temp?: boolean;- formula1: string;- formula2: string;-}-export class DataValidationCacheService extends Disposable {- private _cacheMatrix: Map<string, Map<string, ObjectMatrix<Nullable<IDataValidationResCache>>>> = new Map();+ private _cacheMatrix: Map<string, Map<string, ObjectMatrix<Nullable<DataValidationStatus>>>> = new Map();private _dirtyRanges$ = new Subject<{ unitId: string; subUnitId: string; ranges: IRange[] }>();readonly dirtyRanges$ = this._dirtyRanges$.asObservable();@@ -49,12 +39,7 @@ export class DataValidationCacheService extends Disposable {if (cellValue) {const range = new ObjectMatrix(cellValue).getDataRange();if (range.endRow === -1) return;-- this._dirtyRanges$.next({- unitId,- subUnitId,- ranges: [range],- });+ this.markRangeDirty(unitId, subUnitId, [range]);}}}));@@ -90,38 +75,6 @@ export class DataValidationCacheService extends Disposable {this._deleteRange(unitId, subUnitId, rule.ranges);}- updateRuleRanges(unitId: string, subUnitId: string, ruleId: string, newRanges: IRange[], oldRanges: IRange[]) {- const cache = this._ensureCache(unitId, subUnitId);- oldRanges.forEach((range) => {- Range.foreach(range, (row, col) => {- const item = cache.getValue(row, col);- item && (item.temp = true);- });- });-- newRanges.forEach((range) => {- Range.foreach(range, (row, col) => {- const item = cache.getValue(row, col);- if (item && item.ruleId === ruleId) {- item.temp = false;- } else {- cache.setValue(row, col, undefined);- }- });- });-- oldRanges.forEach((range) => {- Range.foreach(range, (row, col) => {- const item = cache.getValue(row, col);- if (item && (item.temp === true)) {- cache.realDeleteValue(row, col);- }- });- });-- this._dirtyRanges$.next({ unitId, subUnitId, ranges: [...oldRanges, ...newRanges] });- }-markRangeDirty(unitId: string, subUnitId: string, ranges: IRange[]) {const cache = this._ensureCache(unitId, subUnitId);ranges.forEach((range) => {@@ -154,7 +107,7 @@ export class DataValidationCacheService extends Disposable {return cache.getValue(row, col);}- setValue(unitId: string, subUnitId: string, row: number, col: number, value: IDataValidationResCache) {+ setValue(unitId: string, subUnitId: string, row: number, col: number, value: DataValidationStatus) {const cache = this._ensureCache(unitId, subUnitId);return cache.setValue(row, col, value);}diff --git a/packages/sheets-data-validation/src/services/dv-validator-service.ts b/packages/sheets-data-validation/src/services/dv-validator-service.tsindex 06e18f8d77..7e815ee7dd 100644--- a/packages/sheets-data-validation/src/services/dv-validator-service.ts+++ b/packages/sheets-data-validation/src/services/dv-validator-service.ts@@ -14,8 +14,7 @@* limitations under the License.*/-import type { IDataValidationRule, IRange, Nullable, ObjectMatrix, Workbook } from '@univerjs/core';-import type { IDataValidationResCache } from './dv-cache.service';+import type { IDataValidationRule, IRange, Nullable, ObjectMatrix, Workbook, Worksheet } from '@univerjs/core';import { bufferDebounceTime, DataValidationStatus, Disposable, Inject, IUniverInstanceService, LifecycleService, LifecycleStages, Range, Tools, UniverInstanceType } from '@univerjs/core';import { bufferWhen, filter } from 'rxjs';import { SheetDataValidationModel } from '../models/sheet-data-validation-model';@@ -75,17 +74,9 @@ export class SheetsDataValidationValidatorService extends Disposable {this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(filter(() => this._lifecycleService.stage >= LifecycleStages.Rendered), bufferDebounceTime(20)).subscribe(handleDirtyRanges));}- async validatorCell(unitId: string, subUnitId: string, row: number, col: number) {- const workbook = this._univerInstanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET);- if (!workbook) {- throw new Error(`cannot find current workbook, unitId: ${unitId}`);- }-- const worksheet = workbook.getSheetBySheetId(subUnitId);- if (!worksheet) {- throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);- }-+ private async _validatorByCell(workbook: Workbook, worksheet: Worksheet, row: number, col: number) {+ const unitId = workbook.getUnitId();+ const subUnitId = worksheet.getSheetId();if (!Tools.isDefine(row) || !Tools.isDefine(col)) {throw new Error(`row or col is not defined, row: ${row}, col: ${col}`);}@@ -102,23 +93,56 @@ export class SheetsDataValidationValidatorService extends Disposable {});}+ async validatorCell(unitId: string, subUnitId: string, row: number, col: number) {+ const workbook = this._univerInstanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET);+ if (!workbook) {+ throw new Error(`cannot find current workbook, unitId: ${unitId}`);+ }++ const worksheet = workbook.getSheetBySheetId(subUnitId);+ if (!worksheet) {+ throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);+ }++ return this._validatorByCell(workbook, worksheet, row, col);+ }+validatorRanges(unitId: string, subUnitId: string, ranges: IRange[]) {+ const workbook = this._univerInstanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET);+ if (!workbook) {+ throw new Error(`cannot find current workbook, unitId: ${unitId}`);+ }++ const worksheet = workbook.getSheetBySheetId(subUnitId);+ if (!worksheet) {+ throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);+ }+return Promise.all(ranges.map((range) => {const promises: Promise<DataValidationStatus>[] = [];Range.foreach(range, (row, col) => {- promises.push(this.validatorCell(unitId, subUnitId, row, col));+ promises.push(this._validatorByCell(workbook, worksheet, row, col));});return promises;}));}async validatorWorksheet(unitId: string, subUnitId: string) {+ const workbook = this._univerInstanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET);+ if (!workbook) {+ throw new Error(`cannot find current workbook, unitId: ${unitId}`);+ }++ const worksheet = workbook.getSheetBySheetId(subUnitId);+ if (!worksheet) {+ throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);+ }const rules = this._sheetDataValidationModel.getRules(unitId, subUnitId);await Promise.all(rules.map((rule) => {return Promise.all(rule.ranges.map((range) => {const promises: Promise<DataValidationStatus>[] = [];Range.foreach(range, (row, col) => {- promises.push(this.validatorCell(unitId, subUnitId, row, col));+ promises.push(this._validatorByCell(workbook, worksheet, row, col));});return promises;}));@@ -131,7 +155,7 @@ export class SheetsDataValidationValidatorService extends Disposable {const sheetIds = this._sheetDataValidationModel.getSubUnitIds(unitId);const results = await Promise.all(sheetIds.map((id) => this.validatorWorksheet(unitId, id)));- const map: Record<string, ObjectMatrix<Nullable<IDataValidationResCache>>> = {};+ const map: Record<string, ObjectMatrix<Nullable<DataValidationStatus>>> = {};results.forEach((result, i) => {map[sheetIds[i]] = result;diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.jsonindex fb4a2240a9..4127950140 100644--- a/packages/sheets-hyper-link-ui/package.json+++ b/packages/sheets-hyper-link-ui/package.json@@ -82,6 +82,7 @@"@univerjs/engine-render": "workspace:*","@univerjs/icons": "^0.2.7","@univerjs/sheets": "workspace:*",+ "@univerjs/sheets-data-validation": "workspace:*","@univerjs/sheets-formula-ui": "workspace:*","@univerjs/sheets-hyper-link": "workspace:*","@univerjs/sheets-ui": "workspace:*",diff --git a/packages/sheets-hyper-link-ui/src/controllers/menu.ts b/packages/sheets-hyper-link-ui/src/controllers/menu.tsindex c4c15999a7..53bdfaed4f 100644--- a/packages/sheets-hyper-link-ui/src/controllers/menu.ts+++ b/packages/sheets-hyper-link-ui/src/controllers/menu.ts@@ -45,7 +45,7 @@ const getEditingLinkDisable$ = (accessor: IAccessor, unitId = DOCS_ZEN_EDITOR_UNreturn true;}- if (getShouldDisableCellLink(target.worksheet, state.row, state.column)) {+ if (getShouldDisableCellLink(accessor, target.worksheet, state.row, state.column)) {return true;}@@ -76,7 +76,7 @@ const getLinkDisable$ = (accessor: IAccessor) => {const row = selections[0].range.startRow;const col = selections[0].range.startColumn;- if (getShouldDisableCellLink(sheet, row, col)) {+ if (getShouldDisableCellLink(accessor, sheet, row, col)) {return true;}}),diff --git a/packages/sheets-hyper-link-ui/src/utils/index.ts b/packages/sheets-hyper-link-ui/src/utils/index.tsindex a438d64b26..1667d836cf 100644--- a/packages/sheets-hyper-link-ui/src/utils/index.ts+++ b/packages/sheets-hyper-link-ui/src/utils/index.ts@@ -18,8 +18,9 @@ import type { DocumentDataModel, IAccessor, Workbook, Worksheet } from '@univerjimport { DataValidationType, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { DocSelectionManagerService } from '@univerjs/docs';import { SheetsSelectionsService } from '@univerjs/sheets';+import { SheetDataValidationModel } from '@univerjs/sheets-data-validation';-export const getShouldDisableCellLink = (worksheet: Worksheet, row: number, col: number) => {+export const getShouldDisableCellLink = (accessor: IAccessor, worksheet: Worksheet, row: number, col: number) => {const cell = worksheet.getCell(row, col);if (cell?.f || cell?.si) {return true;@@ -29,8 +30,9 @@ export const getShouldDisableCellLink = (worksheet: Worksheet, row: number, col:DataValidationType.LIST,DataValidationType.LIST_MULTIPLE,];-- if (cell?.dataValidation && disables.includes(cell.dataValidation.rule.type)) {+ const dataValidationModel = accessor.has(SheetDataValidationModel) ? accessor.get(SheetDataValidationModel) : null;+ const rule = dataValidationModel?.getRuleByLocation(worksheet.getUnitId(), worksheet.getSheetId(), row, col);+ if (rule && disables.includes(rule.type)) {return true;}@@ -49,7 +51,7 @@ export const getShouldDisableCurrentCellLink = (accessor: IAccessor) => {}const row = selections[0].range.startRow;const col = selections[0].range.startColumn;- return getShouldDisableCellLink(worksheet, row, col);+ return getShouldDisableCellLink(accessor, worksheet, row, col);};export const shouldDisableAddLink = (accessor: IAccessor) => {diff --git a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts b/packages/sheets-ui/src/services/canvas-pop-manager.service.tsindex e2b74cb793..1409678798 100644--- a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts+++ b/packages/sheets-ui/src/services/canvas-pop-manager.service.ts@@ -426,7 +426,6 @@ export class SheetCanvasPopManagerService extends Disposable {canvasElement: currentRender.engine.getCanvasElement(),hiddenRects$: rects$,});-const disposableCollection = new DisposableCollection();disposableCollection.add(positionObserverDisposable);disposableCollection.add(toDisposable(() => {diff --git a/packages/ui/src/views/components/popup/CanvasPopup.tsx b/packages/ui/src/views/components/popup/CanvasPopup.tsxindex acc999544a..dbf14c00aa 100644--- a/packages/ui/src/views/components/popup/CanvasPopup.tsx+++ b/packages/ui/src/views/components/popup/CanvasPopup.tsx@@ -75,7 +75,6 @@ const SingleCanvasPopup = ({ popup, children }: ISingleCanvasPopupProps) => {return () => anchorRectSub.unsubscribe();}, [canvasElement, hideOnInvisible, anchorRect$, hiddenRects$]);-if ((hidden && hiddenType === 'destroy')) {return null;}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 9bd75d3599..6b0ea256ba 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -2507,6 +2507,9 @@ importers:'@univerjs/sheets':specifier: workspace:*version: link:../sheets+ '@univerjs/sheets-data-validation':+ specifier: workspace:*+ version: link:../sheets-data-validation'@univerjs/sheets-formula-ui':specifier: workspace:*version: link:../sheets-formula-ui