@univerjs/sheets-data-validation-ui 1.0.4 → 1.1.0

package/lib/index.js

@@ -1,8 +1,8 @@
-import { CellValueType, ColorKit, CommandType, DEFAULT_STYLES, DataValidationErrorStyle, DataValidationRenderMode, DataValidationStatus, DataValidationType, DateSystem, DependentOn, Disposable, DisposableCollection, HorizontalAlign, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Optional, Plugin, Rectangle, RedoCommand, RxDisposable, ThemeService, UndoCommand, UniverInstanceType, VerticalAlign, WrapStrategy, bufferDebounceTime, dateKit, debounce, excelDateTimePartsToSerial, excelSerialToDateTimeParts, generateRandomId, getIntersectRange, isFormulaString, isUnitRangesEqual, merge, numfmt, sequenceExecute, shallowEqual, toDisposable } from "@univerjs/core";
+import { CanceledError, CellValueType, ColorKit, CommandType, DEFAULT_STYLES, DataValidationErrorStyle, DataValidationRenderMode, DataValidationStatus, DataValidationType, DateSystem, DependentOn, Disposable, DisposableCollection, HorizontalAlign, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Optional, Plugin, Rectangle, RedoCommand, RxDisposable, ThemeService, UndoCommand, UniverInstanceType, VerticalAlign, WrapStrategy, bufferDebounceTime, dateKit, debounce, excelDateTimePartsToSerial, excelSerialToDateTimeParts, generateRandomId, getIntersectRange, isFormulaString, isUnitRangesEqual, merge, numfmt, sequenceExecute, shallowEqual, toDisposable } from "@univerjs/core";
 import { DataValidationModel, DataValidatorDropdownType, DataValidatorRegistryScope, DataValidatorRegistryService, TWO_FORMULA_OPERATOR_COUNT, UniverDataValidationPlugin, getRuleOptions, getRuleSetting } from "@univerjs/data-validation";
 import { AUTO_FILL_APPLY_TYPE, AutoFillTools, IAutoFillService, INTERCEPTOR_POINT, InterceptCellContentPriority, RangeProtectionPermissionEditPoint, SetRangeValuesCommand, SetWorksheetActiveOperation, SheetInterceptorService, SheetPermissionCheckController, SheetsSelectionsService, UniverSheetsPlugin, VALIDATE_CELL, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, checkRangesEditablePermission, deserializeListOptions, getSheetCommandTarget, rangeToDiscreteRange, serializeListOptions } from "@univerjs/sheets";
 import { ComponentManager, IDialogService, IMenuManagerService, ISidebarService, IconManager, KeyCode, MenuItemType, RibbonDataGroup, RibbonInsertGroup, UniverMobileUIPlugin, getMenuHiddenObservable, useDependency, useEvent, useObservable, useSidebarClick } from "@univerjs/ui";
-import { BehaviorSubject, Subject, bufferTime, debounceTime, distinctUntilChanged, filter, map, of, startWith, switchMap, takeUntil } from "rxjs";
+import { BehaviorSubject, Subject, auditTime, bufferTime, debounceTime, distinctUntilChanged, filter, map, of, startWith, switchMap, takeUntil, tap } from "rxjs";
 import { CURSOR_TYPE, CheckboxShape, DeviceInputEventType, DocSimpleSkeleton, FontCache, IRenderManagerService, Rect, Shape, Text, Transform, UniverRenderEnginePlugin, fixLineWidthByScale, getCurrentTypeOfRenderer, getFontStyleString } from "@univerjs/engine-render";
 import { AddSheetDataValidationCommand, BASE_FORMULA_INPUT_NAME, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, CHECKBOX_FORMULA_INPUT_NAME, CUSTOM_FORMULA_INPUT_NAME, ClearRangeDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, DataValidationCacheService, DataValidationFormulaController, DataValidationFormulaService, LIST_FORMULA_INPUT_NAME, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, SheetDataValidationModel, SheetsDataValidationValidatorService, UniverSheetsDataValidationPlugin, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, createDefaultNewRule, getCellValueOrigin, getDataValidationCellValue, getDataValidationDiffMutations, getFormulaResult, isLegalFormulaResult, transformCheckboxValue } from "@univerjs/sheets-data-validation";
 import { getPatternType } from "@univerjs/sheets-numfmt";
@@ -14,7 +14,7 @@ import { CheckboxIcon, DataValidationIcon, DatePickerIcon, DeleteIcon, DropdownL
 import { deserializeRangeWithSheet, serializeRange } from "@univerjs/engine-formula";
 import { FormulaEditor, RangeSelector } from "@univerjs/sheets-formula-ui";
 
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -25,7 +25,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -38,14 +38,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -56,7 +56,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -64,7 +64,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1054,8 +1054,7 @@ const menuSchema = {
 		order: 0,
 		gridLayout: {
 			row: 1,
-			column: 1,
-			showLabel: true
+			column: 1
 		},
 		menuItemFactory: dataValidationMenuFactory,
 		[OpenValidationPanelOperation.id]: {
@@ -1072,80 +1071,132 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation-ui";
-var version = "1.0.4";
+var version = "1.1.0";
 
 //#endregion
 //#region src/controllers/dv-alert.controller.ts
 const ALERT_KEY = "SHEET_DATA_VALIDATION_ALERT";
 let DataValidationAlertController = class DataValidationAlertController extends Disposable {
-	constructor(_hoverManagerService, _cellAlertManagerService, _univerInstanceService, _localeService, _dataValidationModel) {
+	constructor(_hoverManagerService, _cellAlertManagerService, _univerInstanceService, _localeService, _dataValidationModel, _dataValidationCacheService) {
 		super();
 		this._hoverManagerService = _hoverManagerService;
 		this._cellAlertManagerService = _cellAlertManagerService;
 		this._univerInstanceService = _univerInstanceService;
 		this._localeService = _localeService;
 		this._dataValidationModel = _dataValidationModel;
+		this._dataValidationCacheService = _dataValidationCacheService;
+		_defineProperty(this, "_hoveredCell", null);
 		this._init();
 	}
 	_init() {
 		this._initCellAlertPopup();
 	}
 	_initCellAlertPopup() {
-		this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => (workbook === null || workbook === void 0 ? void 0 : workbook.activeSheet$) ?? of(null))).subscribe(() => this._cellAlertManagerService.removeAlert(ALERT_KEY)));
-		this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(debounceTime(100)).subscribe((cellPos) => {
-			if (cellPos) {
-				var _workbook$getActiveSh;
-				const workbook = this._univerInstanceService.getUnit(cellPos.location.unitId, UniverInstanceType.UNIVER_SHEET);
-				if (!workbook || ((_workbook$getActiveSh = workbook.getActiveSheet()) === null || _workbook$getActiveSh === void 0 ? void 0 : _workbook$getActiveSh.getSheetId()) !== cellPos.location.subUnitId) {
-					this._cellAlertManagerService.removeAlert(ALERT_KEY);
-					return;
-				}
-				const worksheet = workbook.getSheetBySheetId(cellPos.location.subUnitId);
-				if (!worksheet) return;
-				const rule = this._dataValidationModel.getRuleByLocation(cellPos.location.unitId, cellPos.location.subUnitId, cellPos.location.row, cellPos.location.col);
-				if (!rule) {
-					this._cellAlertManagerService.removeAlert(ALERT_KEY);
-					return;
-				}
-				if (this._dataValidationModel.validator(rule, {
-					...cellPos.location,
-					workbook,
-					worksheet
-				}) === DataValidationStatus.INVALID) {
-					var _currentAlert$alert;
-					const currentAlert = this._cellAlertManagerService.currentAlert.get(ALERT_KEY);
-					const currentLoc = currentAlert === null || currentAlert === void 0 || (_currentAlert$alert = currentAlert.alert) === null || _currentAlert$alert === void 0 ? void 0 : _currentAlert$alert.location;
-					if (currentLoc && currentLoc.row === cellPos.location.row && currentLoc.col === cellPos.location.col && currentLoc.subUnitId === cellPos.location.subUnitId && currentLoc.unitId === cellPos.location.unitId) {
-						this._cellAlertManagerService.removeAlert(ALERT_KEY);
-						return;
-					}
-					const validator = this._dataValidationModel.getValidator(rule.type);
-					if (!validator) {
-						this._cellAlertManagerService.removeAlert(ALERT_KEY);
-						return;
-					}
-					this._cellAlertManagerService.showAlert({
-						type: CellAlertType.ERROR,
-						title: this._localeService.t("sheets-data-validation-ui.error.title"),
-						message: validator === null || validator === void 0 ? void 0 : validator.getRuleFinalError(rule, cellPos.location),
-						location: cellPos.location,
-						width: 200,
-						height: 74,
-						key: ALERT_KEY
-					});
-					return;
-				}
+		this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => (workbook === null || workbook === void 0 ? void 0 : workbook.activeSheet$) ?? of(null))).subscribe(() => {
+			this._hoveredCell = null;
+			this._cellAlertManagerService.removeAlert(ALERT_KEY);
+		}));
+		this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(tap(() => {
+			this._hoveredCell = null;
+			this._cellAlertManagerService.removeAlert(ALERT_KEY);
+		}), debounceTime(100)).subscribe((cellPos) => {
+			this._hoveredCell = cellPos;
+			this._refreshAlert();
+		}));
+		this.disposeWithMe(this._dataValidationModel.ruleChange$.subscribe((change) => {
+			var _change$oldRule;
+			if (this._affectsHoveredCell(change, [...change.rule.ranges, ...((_change$oldRule = change.oldRule) === null || _change$oldRule === void 0 ? void 0 : _change$oldRule.ranges) ?? []])) this._refreshAlert();
+		}));
+		this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(filter((change) => this._affectsHoveredCell(change, change.ranges)), tap(() => this._cellAlertManagerService.removeAlert(ALERT_KEY)), auditTime(0)).subscribe(() => this._refreshAlert()));
+		this.disposeWithMe(this._dataValidationModel.validStatusChange$.subscribe((change) => {
+			if (this._isHoveredLocation(change)) {
+				const rule = this._dataValidationModel.getRuleByLocation(change.unitId, change.subUnitId, change.row, change.col);
+				if ((rule === null || rule === void 0 ? void 0 : rule.uid) === change.ruleId) this._updateAlert(change.status);
 			}
+		}));
+		this.disposeWithMe(() => {
+			this._hoveredCell = null;
+			this._cellAlertManagerService.removeAlert(ALERT_KEY);
+		});
+	}
+	_isHoveredLocation(location) {
+		var _this$_hoveredCell;
+		const current = (_this$_hoveredCell = this._hoveredCell) === null || _this$_hoveredCell === void 0 ? void 0 : _this$_hoveredCell.location;
+		return (current === null || current === void 0 ? void 0 : current.unitId) === location.unitId && (current === null || current === void 0 ? void 0 : current.subUnitId) === location.subUnitId && (current === null || current === void 0 ? void 0 : current.row) === location.row && (current === null || current === void 0 ? void 0 : current.col) === location.col;
+	}
+	_affectsHoveredCell(location, ranges) {
+		var _this$_hoveredCell2;
+		const current = (_this$_hoveredCell2 = this._hoveredCell) === null || _this$_hoveredCell2 === void 0 ? void 0 : _this$_hoveredCell2.location;
+		return (current === null || current === void 0 ? void 0 : current.unitId) === location.unitId && (current === null || current === void 0 ? void 0 : current.subUnitId) === location.subUnitId && ranges.some((range) => Rectangle.contains(range, {
+			startRow: current.row,
+			endRow: current.row,
+			startColumn: current.col,
+			endColumn: current.col
+		}));
+	}
+	_getHoveredContext() {
+		var _this$_hoveredCell3;
+		const location = (_this$_hoveredCell3 = this._hoveredCell) === null || _this$_hoveredCell3 === void 0 ? void 0 : _this$_hoveredCell3.location;
+		if (!location) return;
+		const workbook = this._univerInstanceService.getUnit(location.unitId, UniverInstanceType.UNIVER_SHEET);
+		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
+		if (!workbook || !worksheet || worksheet.getSheetId() !== location.subUnitId) return;
+		const rule = this._dataValidationModel.getRuleByLocation(location.unitId, location.subUnitId, location.row, location.col);
+		if (rule) return {
+			location,
+			workbook,
+			worksheet,
+			rule
+		};
+	}
+	_refreshAlert() {
+		const context = this._getHoveredContext();
+		if (!context) {
 			this._cellAlertManagerService.removeAlert(ALERT_KEY);
+			return;
+		}
+		const { location, workbook, worksheet, rule } = context;
+		this._updateAlert(this._dataValidationModel.validator(rule, {
+			...location,
+			workbook,
+			worksheet
 		}));
 	}
+	_updateAlert(status) {
+		var _this$_cellAlertManag;
+		const context = this._getHoveredContext();
+		if (!context || status !== DataValidationStatus.INVALID) {
+			this._cellAlertManagerService.removeAlert(ALERT_KEY);
+			return;
+		}
+		const { location, rule } = context;
+		const validator = this._dataValidationModel.getValidator(rule.type);
+		if (!validator) {
+			this._cellAlertManagerService.removeAlert(ALERT_KEY);
+			return;
+		}
+		const title = this._localeService.t("sheets-data-validation-ui.error.title");
+		const message = validator.getRuleFinalError(rule, location);
+		const currentAlert = (_this$_cellAlertManag = this._cellAlertManagerService.currentAlert.get(ALERT_KEY)) === null || _this$_cellAlertManag === void 0 ? void 0 : _this$_cellAlertManag.alert;
+		if (currentAlert && this._isHoveredLocation(currentAlert.location) && currentAlert.title === title && currentAlert.message === message) return;
+		this._cellAlertManagerService.showAlert({
+			type: CellAlertType.ERROR,
+			title,
+			message,
+			location,
+			width: 200,
+			height: 74,
+			key: ALERT_KEY
+		});
+	}
 };
 DataValidationAlertController = __decorate([
 	__decorateParam(0, Inject(HoverManagerService)),
 	__decorateParam(1, Inject(CellAlertManagerService)),
 	__decorateParam(2, IUniverInstanceService),
 	__decorateParam(3, Inject(LocaleService)),
-	__decorateParam(4, Inject(SheetDataValidationModel))
+	__decorateParam(4, Inject(SheetDataValidationModel)),
+	__decorateParam(5, Inject(DataValidationCacheService))
 ], DataValidationAlertController);
 
 //#endregion
@@ -1487,6 +1538,7 @@ let SheetsDataValidationRenderController = class SheetsDataValidationRenderContr
 		this._dataValidationCacheService = _dataValidationCacheService;
 		this._editorBridgeService = _editorBridgeService;
 		this._initMenu();
+		this._initEditor();
 		this._initDropdown();
 		this._initViewModelIntercept();
 		this._initAutoHeight();
@@ -1494,6 +1546,19 @@ let SheetsDataValidationRenderController = class SheetsDataValidationRenderContr
 	_initMenu() {
 		this._menuManagerService.mergeMenu(menuSchema);
 	}
+	_initEditor() {
+		this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
+			var _this$_editorBridgeSe;
+			if (command.id !== SetCellEditVisibleOperation.id) return;
+			const params = command.params;
+			if (!(params === null || params === void 0 ? void 0 : params.visible) || params.eventType !== DeviceInputEventType.Dblclick || !params.pointerPosition) return;
+			const location = (_this$_editorBridgeSe = this._editorBridgeService) === null || _this$_editorBridgeSe === void 0 ? void 0 : _this$_editorBridgeSe.getEditLocation();
+			if (!location || params.unitId && params.unitId !== location.unitId) return;
+			const { unitId, sheetId, row, column } = location;
+			const rule = this._sheetDataValidationModel.getRuleByLocation(unitId, sheetId, row, column);
+			if (rule && (rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE || rule.type === DataValidationType.CHECKBOX)) throw new CanceledError();
+		}));
+	}
 	_initDropdown() {
 		if (!this._editorBridgeService) return;
 		this.disposeWithMe(this._editorBridgeService.visible$.subscribe((visible) => {

package/lib/types/controllers/dv-alert.controller.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Disposable, IUniverInstanceService, LocaleService } from '@univerjs/core';
-import { SheetDataValidationModel } from '@univerjs/sheets-data-validation';
+import { DataValidationCacheService, SheetDataValidationModel } from '@univerjs/sheets-data-validation';
 import { CellAlertManagerService, HoverManagerService } from '@univerjs/sheets-ui';
 export declare class DataValidationAlertController extends Disposable {
     private readonly _hoverManagerService;
@@ -22,7 +22,14 @@ export declare class DataValidationAlertController extends Disposable {
     private readonly _univerInstanceService;
     private readonly _localeService;
     private readonly _dataValidationModel;
-    constructor(_hoverManagerService: HoverManagerService, _cellAlertManagerService: CellAlertManagerService, _univerInstanceService: IUniverInstanceService, _localeService: LocaleService, _dataValidationModel: SheetDataValidationModel);
+    private readonly _dataValidationCacheService;
+    private _hoveredCell;
+    constructor(_hoverManagerService: HoverManagerService, _cellAlertManagerService: CellAlertManagerService, _univerInstanceService: IUniverInstanceService, _localeService: LocaleService, _dataValidationModel: SheetDataValidationModel, _dataValidationCacheService: DataValidationCacheService);
     private _init;
     private _initCellAlertPopup;
+    private _isHoveredLocation;
+    private _affectsHoveredCell;
+    private _getHoveredContext;
+    private _refreshAlert;
+    private _updateAlert;
 }

package/lib/types/controllers/dv-render.controller.d.ts

@@ -36,6 +36,7 @@ export declare class SheetsDataValidationRenderController extends RxDisposable {
     private readonly _editorBridgeService?;
     constructor(_commandService: ICommandService, _menuManagerService: IMenuManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dropdownManagerService: DataValidationDropdownManagerService, _sheetDataValidationModel: SheetDataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService, _dataValidationCacheService: DataValidationCacheService, _editorBridgeService?: IEditorBridgeService | undefined);
     private _initMenu;
+    private _initEditor;
     private _initDropdown;
     private _initViewModelIntercept;
     private _initAutoHeight;