@univerjs/sheets-data-validation-ui 0.4.0 → 0.4.1-experimental.20241022-507567a

package/lib/es/index.js

@@ -5,14 +5,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "sym
 import React, { useState, forwardRef, useRef, createElement, useMemo, useEffect } from "react";
 import { Inject, LocaleService, Disposable, DataValidationErrorStyle, useDependency, ICommandService, numfmt, CellValueType, UniverInstanceType, toDisposable, IUniverInstanceService, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, CommandType, BuildTextUtils, DataValidationRenderMode, DataValidationType, IConfigService, UndoCommand, RedoCommand, isUnitRangesEqual, debounce, shallowEqual, Injector, DataValidationStatus, ObjectMatrix, Range, Rectangle, queryObjectMatrix, Optional, RxDisposable, InterceptorEffectEnum, sequenceExecute, bufferDebounceTime, createInternalEditorID, isFormulaString, Tools, ThemeService, VerticalAlign, HorizontalAlign, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, DEFAULT_EMPTY_DOCUMENT_VALUE, BooleanNumber, Plugin } from "@univerjs/core";
 import { Button, DatePanel, RectPopup, Scrollbar, FormLayout, RadioGroup, Radio, Checkbox, Input, Select, DraggableList } from "@univerjs/design";
+import { DeviceInputEventType, IRenderManagerService, fixLineWidthByScale, Transform, Checkbox as Checkbox$1, FontCache, Shape, Rect, getFontStyleString, getDocsSkeletonPageSize, DocumentViewModel, DocumentSkeleton, Documents } from "@univerjs/engine-render";
 import { SetRangeValuesCommand, SheetsSelectionsService, getSheetCommandTarget, WorkbookEditablePermission, RangeProtectionPermissionEditPoint, WorksheetEditPermission, checkRangesEditablePermission, WorksheetSetCellStylePermission, SheetInterceptorService, INTERCEPTOR_POINT, InterceptCellContentPriority } from "@univerjs/sheets";
 import { SheetDataValidationModel, getCellValueOrigin, getDataValidationCellValue, deserializeListOptions, serializeListOptions, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, createDefaultNewRule, AddSheetDataValidationCommand, RemoveSheetAllDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, getDataValidationDiffMutations, DataValidationCacheService, DataValidationFormulaController, DataValidationFormulaService, getFormulaResult, transformCheckboxValue, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2 } from "@univerjs/sheets-data-validation";
 import { getPatternType } from "@univerjs/sheets-numfmt";
+import { IEditorBridgeService, SetCellEditVisibleOperation, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController, IMarkSelectionService, HoverManagerService, CellAlertManagerService, CellAlertType, IAutoFillService, APPLY_TYPE, virtualizeDiscreteRanges, getAutoFillRepeatRange, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, getCurrentRangeDisable$, AutoHeightController, SheetSkeletonManagerService } from "@univerjs/sheets-ui";
+import { IDialogService, KeyCode, ISidebarService, useObservable, ComponentManager, IZenZoneService, useEvent, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
 import { DataValidatorRegistryService, DataValidationModel, DataValidatorRegistryScope, TWO_FORMULA_OPERATOR_COUNT, getRuleOptions, getRuleSetting } from "@univerjs/data-validation";
-import { IEditorBridgeService, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController, IMarkSelectionService, HoverManagerService, CellAlertManagerService, CellAlertType, IAutoFillService, APPLY_TYPE, virtualizeDiscreteRanges, getAutoFillRepeatRange, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, getCurrentRangeDisable$, AutoHeightController, SheetSkeletonManagerService } from "@univerjs/sheets-ui";
-import { IDialogService, ISidebarService, useObservable, ComponentManager, IZenZoneService, KeyCode, useEvent, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
 import { RichTextEditingMutation } from "@univerjs/docs";
-import { IRenderManagerService, DeviceInputEventType, fixLineWidthByScale, Transform, Checkbox as Checkbox$1, FontCache, Shape, Rect, getFontStyleString, getDocsSkeletonPageSize, DocumentViewModel, DocumentSkeleton, Documents } from "@univerjs/engine-render";
 import { filter, BehaviorSubject, distinctUntilChanged, Subject, debounceTime, bufferTime } from "rxjs";
 import { deserializeRangeWithSheet, serializeRange } from "@univerjs/engine-formula";
 import { RangeSelector } from "@univerjs/sheets-formula-ui";
@@ -529,7 +529,12 @@ function DateDropdown(props) {
       workbook,
       interceptValue: dateStr.replace("Z", "").replace("T", " "),
       t: CellValueType.NUMBER
-    }, rule) ? (commandService.executeCommand(SetRangeValuesCommand.id, {
+    }, rule) ? (await commandService.executeCommand(SetCellEditVisibleOperation.id, {
+      visible: !1,
+      eventType: DeviceInputEventType.Keyboard,
+      unitId,
+      keycode: KeyCode.ESC
+    }), await commandService.executeCommand(SetRangeValuesCommand.id, {
       unitId,
       subUnitId,
       range: {
@@ -1006,7 +1011,7 @@ function ListDropDown(props) {
       title: multiple ? localeService.t("dataValidation.listMultiple.dropdown") : localeService.t("dataValidation.list.dropdown"),
       value,
       multiple,
-      onChange: /* @__PURE__ */ __name((newValue) => {
+      onChange: /* @__PURE__ */ __name(async (newValue) => {
         const str = serializeListOptions(newValue), params = {
           unitId,
           subUnitId,
@@ -1028,6 +1033,11 @@ function ListDropDown(props) {
           keycode: KeyCode.ESC,
           eventType: DeviceInputEventType.Keyboard,
           unitId
+        }), await commandService.executeCommand(SetCellEditVisibleOperation.id, {
+          visible: !1,
+          eventType: DeviceInputEventType.Keyboard,
+          unitId,
+          keycode: KeyCode.ESC
         }), commandService.executeCommand(SetRangeValuesCommand.id, params), setLocalValue(str), multiple || hideFn();
       }, "onChange"),
       options,
@@ -1675,7 +1685,8 @@ let DataValidationCopyPasteController = (_a6 = class extends Disposable {
         copyInfo.subUnitId,
         ruleMatrix.diffWithAddition(this._sheetDataValidationModel.getRules(copyInfo.unitId, copyInfo.subUnitId), additionRules.values()),
         this._injector,
-        "patched"
+        "patched",
+        !1
       );
       return {
         redos: redoMutations,
@@ -1705,7 +1716,8 @@ let DataValidationCopyPasteController = (_a6 = class extends Disposable {
         subUnitId,
         ruleMatrix.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId)),
         this._injector,
-        "patched"
+        "patched",
+        !1
       );
       return {
         redos: redoMutations,
@@ -2901,6 +2913,7 @@ const _ListMultipleValidatorView = class _ListMultipleValidatorView extends Base
     super(...arguments);
     __publicField(this, "id", DataValidationType.LIST_MULTIPLE);
     __publicField(this, "canvasRender", this.injector.createInstance(DropdownMultipleWidget));
+    __publicField(this, "dropdown", LIST_DROPDOWN_KEY);
   }
 };
 __name(_ListMultipleValidatorView, "ListMultipleValidatorView");

package/lib/types/views/validator-views/list-multiple-view.d.ts

@@ -4,4 +4,5 @@ import { BaseSheetDataValidatorView } from './sheet-validator-view';
 export declare class ListMultipleValidatorView extends BaseSheetDataValidatorView {
     id: DataValidationType;
     canvasRender: DropdownMultipleWidget;
+    dropdown: string | undefined;
 }