@univerjs/sheets-data-validation-ui 0.4.0-nightly.202410131605 → 0.4.0-nightly.202410141606

package/lib/es/index.js

@@ -3,7 +3,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
 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, createInternalEditorID, isValidRange, debounce, shallowEqual, Injector, DataValidationStatus, ObjectMatrix, Range, Rectangle, queryObjectMatrix, Optional, RxDisposable, InterceptorEffectEnum, sequenceExecute, isFormulaString, Tools, ThemeService, VerticalAlign, HorizontalAlign, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, DEFAULT_EMPTY_DOCUMENT_VALUE, BooleanNumber, Plugin } from "@univerjs/core";
+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, 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 { 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, DataValidationFormulaController, DataValidationFormulaService, getFormulaResult, transformCheckboxValue, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2 } from "@univerjs/sheets-data-validation";
@@ -14,8 +14,9 @@ import { IDialogService, ISidebarService, useObservable, ComponentManager, IZenZ
 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 { RangeSelector, TextEditor } from "@univerjs/docs-ui";
-import { serializeRange } from "@univerjs/engine-formula";
+import { deserializeRangeWithSheet, serializeRange } from "@univerjs/engine-formula";
+import { RangeSelector } from "@univerjs/sheets-formula-ui";
+import { TextEditor } from "@univerjs/docs-ui";
 var commonjsGlobal = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x.default : x;
@@ -692,7 +693,11 @@ let DataValidationPanelService = (_a2 = class extends Disposable {
       this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(filter((sheet) => !sheet)).subscribe(() => {
         this.close();
       })
-    );
+    ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((info) => {
+      info.id === DATA_VALIDATION_PANEL && (info.visible || setTimeout(() => {
+        this._sidebarService.sidebarOptions$.next({ visible: !1 });
+      }));
+    }));
   }
   get activeRule() {
     return this._activeRule;
@@ -1098,8 +1103,13 @@ const dataValidationDetail = "univer-data-validation-detail", dataValidationDeta
   },
   1e3
 ), "debounceExecuteFactory");
+function getSheetIdByName(univerInstanceService, unitId, name) {
+  var _a17, _b, _c, _d;
+  return unitId ? ((_b = (_a17 = univerInstanceService.getUnit(unitId)) == null ? void 0 : _a17.getSheetBySheetName(name)) == null ? void 0 : _b.getSheetId()) || "" : ((_d = (_c = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _c.getSheetBySheetName(name)) == null ? void 0 : _d.getSheetId()) || "";
+}
+__name(getSheetIdByName, "getSheetIdByName");
 function DataValidationDetail() {
-  const [key, setKey] = useState(0), dataValidationPanelService = useDependency(DataValidationPanelService), activeRuleInfo = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule), { unitId, subUnitId, rule } = activeRuleInfo || {}, ruleId = rule.uid, validatorService = useDependency(DataValidatorRegistryService), componentManager = useDependency(ComponentManager), commandService = useDependency(ICommandService), dataValidationModel = useDependency(DataValidationModel), localeService = useDependency(LocaleService), [localRule, setLocalRule] = useState(rule), validator = validatorService.getValidatorItem(localRule.type), [showError, setShowError] = useState(!1), validators = validatorService.getValidatorsByScope(DataValidatorRegistryScope.SHEET), [localRanges, setLocalRanges] = useState(() => localRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))), debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]), sheetSelectionService = useDependency(SheetsSelectionsService);
+  const [key, setKey] = useState(0), dataValidationPanelService = useDependency(DataValidationPanelService), activeRuleInfo = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule), { unitId, subUnitId, rule } = activeRuleInfo || {}, ruleId = rule.uid, validatorService = useDependency(DataValidatorRegistryService), univerInstanceService = useDependency(IUniverInstanceService), componentManager = useDependency(ComponentManager), commandService = useDependency(ICommandService), dataValidationModel = useDependency(DataValidationModel), localeService = useDependency(LocaleService), [localRule, setLocalRule] = useState(rule), validator = validatorService.getValidatorItem(localRule.type), [showError, setShowError] = useState(!1), validators = validatorService.getValidatorsByScope(DataValidatorRegistryScope.SHEET), [localRanges, setLocalRanges] = useState(() => localRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))), debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]), rangeSelectorActionsRef = useRef({}), [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(!1), sheetSelectionService = useDependency(SheetsSelectionsService);
   if (useEffect(() => () => {
     const currentSelection = sheetSelectionService.getCurrentLastSelection();
     currentSelection && sheetSelectionService.setSelections([currentSelection]);
@@ -1114,7 +1124,18 @@ function DataValidationDetail() {
     return null;
   const operators = validator.operators, operatorNames = validator.operatorNames, isTwoFormula = localRule.operator ? TWO_FORMULA_OPERATOR_COUNT.includes(localRule.operator) : !1, handleOk = /* @__PURE__ */ __name(() => {
     localRule.ranges.length && (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
-  }, "handleOk"), handleUpdateRuleRanges = useEvent((unitRanges) => {
+  }, "handleOk"), handleUpdateRuleRanges = useEvent((rangeText) => {
+    const unitRanges = rangeText.split(",").map(deserializeRangeWithSheet).map((unitRange) => {
+      const sheetName = unitRange.sheetName;
+      if (sheetName) {
+        const sheetId = getSheetIdByName(univerInstanceService, unitRange.unitId, sheetName);
+        return { ...unitRange, sheetId };
+      }
+      return {
+        ...unitRange,
+        sheetId: ""
+      };
+    });
     if (isUnitRangesEqual(unitRanges, localRanges))
       return;
     setLocalRanges(unitRanges);
@@ -1194,8 +1215,12 @@ function DataValidationDetail() {
         options: newOptions
       }
     ));
-  }, "handleUpdateRuleOptions");
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$3.dataValidationDetail, children: [
+  }, "handleUpdateRuleOptions"), handlePanelClick = /* @__PURE__ */ __name((e) => {
+    var _a17;
+    const handleOutClick = (_a17 = rangeSelectorActionsRef.current) == null ? void 0 : _a17.handleOutClick;
+    handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
+  }, "handlePanelClick");
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$3.dataValidationDetail, onClick: handlePanelClick, children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx(
       FormLayout,
       {
@@ -1204,16 +1229,13 @@ function DataValidationDetail() {
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           RangeSelector,
           {
-            className: styles$3.dataValidationDetailFormItem,
-            value: rangeStr,
-            id: createInternalEditorID("data-validation-detail"),
-            openForSheetUnitId: unitId,
-            openForSheetSubUnitId: subUnitId,
-            onChange: /* @__PURE__ */ __name((newRange) => {
-              newRange.some((i) => !isValidRange(i.range) || i.range.endColumn < i.range.startColumn || i.range.endRow < i.range.startRow) || handleUpdateRuleRanges(newRange);
-            }, "onChange")
-          },
-          key
+            unitId,
+            subUnitId,
+            initValue: rangeStr,
+            onChange: handleUpdateRuleRanges,
+            isFocus: isFocusRangeSelector,
+            actions: rangeSelectorActionsRef.current
+          }
         )
       }
     ),
@@ -1414,7 +1436,7 @@ const DataValidationPanel = /* @__PURE__ */ __name(() => {
 }, "DataValidationPanel"), LIST_DROPDOWN_KEY = "data-validation.list.dropdown", DATE_DROPDOWN_KEY = "data-validation.date.dropdown", AddSheetDataValidationAndOpenCommand = {
   type: CommandType.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
-  async handler(accessor) {
+  handler(accessor) {
     const univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService);
     if (!target) return !1;
     const { workbook, worksheet } = target, rule = createDefaultNewRule(accessor), commandService = accessor.get(ICommandService), unitId = workbook.getUnitId(), subUnitId = worksheet.getSheetId(), addParams = {
@@ -1422,7 +1444,7 @@ const DataValidationPanel = /* @__PURE__ */ __name(() => {
       unitId,
       subUnitId
     };
-    return await commandService.executeCommand(AddSheetDataValidationCommand.id, addParams) ? (commandService.executeCommand(OpenValidationPanelOperation.id, {
+    return commandService.syncExecuteCommand(AddSheetDataValidationCommand.id, addParams) ? (commandService.syncExecuteCommand(OpenValidationPanelOperation.id, {
       ruleId: rule.uid,
       isAdd: !0
     }), !0) : !1;