@univerjs/sheets-data-validation 0.2.9 → 0.2.10

package/lib/es/index.js

@@ -2,9 +2,9 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { DEFAULT_EMPTY_DOCUMENT_VALUE, useDependency, Inject, Disposable, UniverInstanceType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, IUniverInstanceService, toDisposable, CommandType, ICommandService, ObjectMatrix, Range, isFormulaString, ThemeService, VerticalAlign, HorizontalAlign, createInternalEditorID, LocaleService, OnLifecycle, LifecycleStages, IPermissionService, DataValidationType, Tools, DataValidationOperator, DataValidationErrorStyle, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, debounce, shallowEqual, Injector, DataValidationRenderMode, numfmt, CellValueType, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, BooleanNumber, Rectangle, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, Optional, RxDisposable, DataValidationStatus, ILogService, isRangesEqual, queryObjectMatrix, IResourceManagerService, DependentOn, Plugin } from "@univerjs/core";
+import { DEFAULT_EMPTY_DOCUMENT_VALUE, useDependency, Inject, Disposable, UniverInstanceType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, IUniverInstanceService, toDisposable, CommandType, ICommandService, ObjectMatrix, Range, isFormulaString, ThemeService, VerticalAlign, HorizontalAlign, createInternalEditorID, LocaleService, OnLifecycle, LifecycleStages, IPermissionService, DataValidationType, Tools, DataValidationOperator, DataValidationErrorStyle, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, debounce, shallowEqual, Injector, DataValidationRenderMode, UNIVER_INTERNAL, numfmt, CellValueType, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, BooleanNumber, Rectangle, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, Optional, RxDisposable, DataValidationStatus, ILogService, isRangesEqual, queryObjectMatrix, IResourceManagerService, DependentOn, Plugin } from "@univerjs/core";
 import { DataValidatorRegistryService, DataValidationModel, BaseDataValidator, DataValidatorRegistryScope, TWO_FORMULA_OPERATOR_COUNT as TWO_FORMULA_OPERATOR_COUNT$1, getRuleOptions, getRuleSetting, RemoveDataValidationCommand, createDefaultNewRule, RemoveAllDataValidationCommand, TextLengthErrorTitleMap, AddDataValidationMutation, RemoveDataValidationMutation, UpdateRuleType, UpdateDataValidationMutation, removeDataValidationUndoFactory, DataValidationManager, AddDataValidationCommand, UniverDataValidationPlugin } from "@univerjs/data-validation";
-import { DataValidationModel as DataValidationModel2, RemoveDataValidationCommand as RemoveDataValidationCommand2 } from "@univerjs/data-validation";
+import { DataValidationModel as DataValidationModel2, RemoveAllDataValidationCommand as RemoveAllDataValidationCommand2, RemoveDataValidationCommand as RemoveDataValidationCommand2 } from "@univerjs/data-validation";
 import { SheetsSelectionsService, getSheetCommandTarget, SetRangeValuesCommand, WorksheetViewPermission, checkRangesEditablePermission, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, WorkbookEditablePermission, WorksheetSetCellStylePermission, WorksheetEditPermission, RangeProtectionPermissionEditPoint, SheetInterceptorService, INTERCEPTOR_POINT, InterceptCellContentPriority, ClearSelectionAllCommand, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, UniverSheetsPlugin } from "@univerjs/sheets";
 import { SheetCanvasPopManagerService, IMarkSelectionService, IEditorBridgeService, getCurrentRangeDisable$, AutoHeightController, SheetSkeletonManagerService, HoverManagerService, CellAlertManagerService, CellAlertType, IAutoFillService, APPLY_TYPE, virtualizeDiscreteRanges, getAutoFillRepeatRange, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, SheetPermissionInterceptorBaseController, UniverSheetsUIPlugin } from "@univerjs/sheets-ui";
 import { useObservable, ComponentManager, IZenZoneService, ISidebarService, TextEditor, useEvent, RangeSelector, KeyCode, IDialogService, MenuItemType, MenuPosition, MenuGroup, getMenuHiddenObservable, IMenuService } from "@univerjs/ui";
@@ -801,7 +801,7 @@ function getDataValidationCellValue(cellData) {
 }
 __name(getDataValidationCellValue, "getDataValidationCellValue");
 const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", DROP_DOWN_DEFAULT_COLOR = "#ECECEC";
-var L = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(L || {}), __defProp$f = Object.defineProperty, __getOwnPropDesc$f = Object.getOwnPropertyDescriptor, __decorateClass$f = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+var P = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(P || {}), __defProp$f = Object.defineProperty, __getOwnPropDesc$f = Object.getOwnPropertyDescriptor, __decorateClass$f = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$f(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp$f(target, key, result), result;
@@ -834,7 +834,7 @@ let DataValidationFormulaController = (_a5 = class extends Disposable {
       for (let i2 = startRow; i2 <= endRow; i2++)
         for (let j = startColumn; j <= endColumn; j++) {
           const permission = (_b = (_a22 = targetSheet.getCell(i2, j)) == null ? void 0 : _a22.selectionProtection) == null ? void 0 : _b[0];
-          if ((permission == null ? void 0 : permission[L.View]) === !1)
+          if ((permission == null ? void 0 : permission[P.View]) === !1)
             return !1;
         }
     }
@@ -1792,6 +1792,7 @@ let DataValidationRejectInputController = (_a6 = class extends Disposable {
       this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT_ASYNC,
       {
         handler: /* @__PURE__ */ __name(async (cellPromise, context, next) => {
+          var _a22, _b, _c;
           const cell = await cellPromise, { worksheet, row, col, unitId, subUnitId, workbook } = context, manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleId = manager.getRuleIdByLocation(row, col), rule = ruleId ? manager.getRuleById(ruleId) : void 0;
           if (!rule || rule.errorStyle !== DataValidationErrorStyle.STOP)
             return next(Promise.resolve(cell));
@@ -1799,7 +1800,7 @@ let DataValidationRejectInputController = (_a6 = class extends Disposable {
           if (!validator || await validator.validator(
             {
               value: getCellValueOrigin(cell),
-              interceptValue: getCellValueOrigin(cell),
+              interceptValue: getCellValueOrigin((_c = (_b = (_a22 = cell == null ? void 0 : cell.custom) == null ? void 0 : _a22[UNIVER_INTERNAL]) == null ? void 0 : _b.origin) != null ? _c : cell),
               row,
               column: col,
               unitId,
@@ -1882,7 +1883,7 @@ const transformDate = /* @__PURE__ */ __name((value) => {
   if (value == null || typeof value == "boolean")
     return;
   if (typeof value == "number" || !Number.isNaN(+value))
-    return dayjs(numfmt.format("yyyy-MM-dd HH:mm:ss", value));
+    return dayjs(numfmt.format("yyyy-MM-dd HH:mm:ss", Number(value)));
   const date = dayjs(value);
   if (date.isValid())
     return date;
@@ -2048,8 +2049,8 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
     };
   }
   async isValidType(info) {
-    const { interceptValue } = info;
-    return typeof interceptValue == "string" ? !!numfmt.parseDate(interceptValue) : !1;
+    const { interceptValue, value } = info;
+    return typeof value == "number" && typeof interceptValue == "string" ? !0 : typeof interceptValue == "string" ? !!numfmt.parseDate(interceptValue) : !1;
   }
   _validatorSingleFormula(formula) {
     return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) || !!formula && dayjs(formula).isValid());
@@ -3017,7 +3018,18 @@ const UpdateSheetDataValidationRangeCommand = {
   type: CommandType.COMMAND,
   id: "sheets.command.clear-range-data-validation",
   handler(accessor, params) {
-    return params ? (accessor.get(ICommandService), !0) : !1;
+    if (!params)
+      return !1;
+    const { unitId, subUnitId, ranges } = params, commandService = accessor.get(ICommandService), univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, { unitId, subUnitId }), dataValidationModel = accessor.get(DataValidationModel);
+    if (!target) return !1;
+    const undoRedoService = accessor.get(IUndoRedoService), manager = dataValidationModel.ensureManager(unitId, subUnitId), matrix = manager.getRuleObjectMatrix().clone();
+    matrix.removeRange(ranges);
+    const diffs = matrix.diff(manager.getDataValidations()), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor);
+    return undoRedoService.pushUndoRedo({
+      unitID: unitId,
+      redoMutations,
+      undoMutations
+    }), sequenceExecute(redoMutations, commandService).result;
   }
 }, DataValidationIcon = "data-validation-single", DATA_VALIDATION_MENU_ID = "sheet.menu.data-validation";
 function dataValidationMenuFactory(accessor) {
@@ -3144,7 +3156,7 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
           priority: InterceptCellContentPriority.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: /* @__PURE__ */ __name((cell, pos, next) => {
-            var _a22, _b, _c, _d, _e, _f;
+            var _a22, _b, _c, _d, _e, _f, _g;
             const { row, col, unitId, subUnitId, workbook, worksheet } = pos, manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
             if (!manager)
               return next(cell);
@@ -3202,13 +3214,14 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
               fontRenderExtension: {
                 // @ts-ignore
                 ...cell == null ? void 0 : cell.fontRenderExtension,
-                isSkip: validator == null ? void 0 : validator.skipDefaultFontRender(rule, cellValue, pos)
+                // @ts-ignore
+                isSkip: ((_f = cell == null ? void 0 : cell.fontRenderExtension) == null ? void 0 : _f.isSkip) || (validator == null ? void 0 : validator.skipDefaultFontRender(rule, cellValue, pos))
               },
               interceptorStyle: {
                 ...cell == null ? void 0 : cell.interceptorStyle,
                 ...extra.interceptorStyle
               },
-              get interceptorAutoHeight() {
+              interceptorAutoHeight: /* @__PURE__ */ __name(() => {
                 var _a23, _b2, _c2, _d2;
                 const mergeCell = skeleton.mergeData.find((range) => {
                   const { startColumn, startRow, endColumn, endRow } = range;
@@ -3233,8 +3246,8 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
                   worksheet
                 };
                 return (_d2 = (_c2 = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _c2.calcCellAutoHeight) == null ? void 0 : _d2.call(_c2, info);
-              },
-              coverable: ((_f = cell == null ? void 0 : cell.coverable) != null ? _f : !0) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE)
+              }, "interceptorAutoHeight"),
+              coverable: ((_g = cell == null ? void 0 : cell.coverable) != null ? _g : !0) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE)
             });
           }, "handler")
         }
@@ -3364,7 +3377,7 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
                 ...cell == null ? void 0 : cell.interceptorStyle,
                 ...extra.interceptorStyle
               },
-              get interceptorAutoHeight() {
+              interceptorAutoHeight: /* @__PURE__ */ __name(() => {
                 var _a23, _b2, _c2, _d2;
                 const mergeCell = skeleton.mergeData.find((range) => {
                   const { startColumn, startRow, endColumn, endRow } = range;
@@ -3389,7 +3402,7 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
                   workbook
                 };
                 return (_d2 = (_c2 = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _c2.calcCellAutoHeight) == null ? void 0 : _d2.call(_c2, info);
-              }
+              }, "interceptorAutoHeight")
             });
           }, "handler")
         }
@@ -4869,6 +4882,7 @@ export {
   DataValidationModel2 as DataValidationModel,
   HideDataValidationDropdown,
   OpenValidationPanelOperation,
+  RemoveAllDataValidationCommand2 as RemoveSheetAllDataValidationCommand,
   RemoveDataValidationCommand2 as RemoveSheetDataValidationCommand,
   SheetDataValidationManager,
   SheetsDataValidationValidatorService,

package/lib/types/index.d.ts

@@ -21,7 +21,7 @@ export { DataValidationFormulaService } from './services/dv-formula.service';
 export { DataValidationCustomFormulaService } from './services/dv-custom-formula.service';
 export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';
 export { SheetsDataValidationValidatorService } from './services/dv-validator-service';
-export { DataValidationModel } from '@univerjs/data-validation';
+export { DataValidationModel, RemoveAllDataValidationCommand as RemoveSheetAllDataValidationCommand, type IRemoveAllDataValidationCommandParams as IRemoveSheetAllDataValidationCommandParams, } from '@univerjs/data-validation';
 export { SheetDataValidationManager } from './models/sheet-data-validation-manager';
 export { RemoveDataValidationCommand as RemoveSheetDataValidationCommand, type IRemoveDataValidationCommandParams as IRemoveSheetDataValidationCommandParams, } from '@univerjs/data-validation';
 export { UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationSettingCommand, AddSheetDataValidationCommand, AddSheetDataValidationAndOpenCommand, ClearRangeDataValidationCommand, type IAddSheetDataValidationCommandParams, type IUpdateSheetDataValidationRangeCommandParams, type IUpdateSheetDataValidationOptionsCommandParams, type IUpdateSheetDataValidationSettingCommandParams, type IClearRangeDataValidationCommandParams, } from './commands/commands/data-validation.command';

package/lib/types/validators/date-validator.d.ts

@@ -11,8 +11,8 @@ export declare class DateValidator extends BaseDataValidator<number> {
     private _formulaService;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<number | undefined>>;
     parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string): {
-        formula1: any;
-        formula2: any;
+        formula1: number | undefined;
+        formula2: number | undefined;
     };
     isValidType(info: IValidatorCellInfo): Promise<boolean>;
     private _validatorSingleFormula;