@univerjs/sheets-data-validation 0.2.6 → 0.2.7

package/lib/es/index.js

@@ -354,25 +354,26 @@ var __defProp$i = Object.defineProperty, __getOwnPropDesc$i = Object.getOwnPrope
   return kind && result && __defProp$i(target, key, result), result;
 }, "__decorateClass$i"), __decorateParam$i = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$i"), _a3;
 let DataValidationFormulaService = (_a3 = class extends Disposable {
-  constructor(_registerOtherFormulaService, _dataValidationCacheService, _dataValidationModel) {
+  constructor(_instanceService, _registerOtherFormulaService, _dataValidationCacheService, _dataValidationModel) {
     super();
     __publicField(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
-    this._registerOtherFormulaService = _registerOtherFormulaService, this._dataValidationCacheService = _dataValidationCacheService, this._dataValidationModel = _dataValidationModel, this._initFormulaResultHandler();
+    this._instanceService = _instanceService, this._registerOtherFormulaService = _registerOtherFormulaService, this._dataValidationCacheService = _dataValidationCacheService, this._dataValidationModel = _dataValidationModel, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((resultMap) => {
       for (const unitId in resultMap) {
         const unitMap = resultMap[unitId];
-        for (const subUnitId in unitMap) {
-          const results = unitMap[subUnitId], formulaMap = this._ensureRuleFormulaMap(unitId, subUnitId), manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
-          results.forEach((result) => {
-            var _a23, _b;
-            if (formulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId)) {
-              const rule = manager.getRuleById((_b = result.extra) == null ? void 0 : _b.ruleId);
-              rule && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges);
-            }
-          });
-        }
+        if (this._instanceService.getUnitType(unitId) === UniverInstanceType.UNIVER_SHEET)
+          for (const subUnitId in unitMap) {
+            const results = unitMap[subUnitId], formulaMap = this._ensureRuleFormulaMap(unitId, subUnitId), manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
+            results.forEach((result) => {
+              var _a23, _b;
+              if (formulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId)) {
+                const rule = manager.getRuleById((_b = result.extra) == null ? void 0 : _b.ruleId);
+                rule && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges);
+              }
+            });
+          }
       }
     }));
   }
@@ -453,9 +454,10 @@ let DataValidationFormulaService = (_a3 = class extends Disposable {
   }
 }, __name(_a3, "DataValidationFormulaService"), _a3);
 DataValidationFormulaService = __decorateClass$i([
-  __decorateParam$i(0, Inject(RegisterOtherFormulaService)),
-  __decorateParam$i(1, Inject(DataValidationCacheService)),
-  __decorateParam$i(2, Inject(DataValidationModel))
+  __decorateParam$i(0, IUniverInstanceService),
+  __decorateParam$i(1, Inject(RegisterOtherFormulaService)),
+  __decorateParam$i(2, Inject(DataValidationCacheService)),
+  __decorateParam$i(3, Inject(DataValidationModel))
 ], DataValidationFormulaService);
 function getFormulaResult(result) {
   var _a23, _b;
@@ -1275,7 +1277,7 @@ function DataValidationDetail() {
   }, [commandService, dataValidationModel, ruleId, subUnitId, unitId]), !validator)
     return null;
   const operators = validator.operators, operatorNames = validator.operatorNames, isTwoFormula = localRule.operator ? TWO_FORMULA_OPERATOR_COUNT$1.includes(localRule.operator) : !1, handleOk = /* @__PURE__ */ __name(() => {
-    validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0);
+    localRule.ranges.length && (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
   }, "handleOk"), handleUpdateRuleRanges = useEvent((unitRanges) => {
     if (isUnitRangesEqual(unitRanges, localRanges))
       return;
@@ -1358,20 +1360,27 @@ function DataValidationDetail() {
     ));
   }, "handleUpdateRuleOptions");
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.panel.range"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-      RangeSelector,
+    /* @__PURE__ */ jsxRuntimeExports.jsx(
+      FormLayout,
       {
-        className: styles$4.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
-    ) }),
+        label: localeService.t("dataValidation.panel.range"),
+        error: localRule.ranges.length ? "" : localeService.t("dataValidation.panel.rangeError"),
+        children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+          RangeSelector,
+          {
+            className: styles$4.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
+        )
+      }
+    ),
     /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.panel.type"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       Select,
       {
@@ -3027,8 +3036,9 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((visible) => {
+      var _a23;
       if (!visible.visible) {
-        this._dropdownManagerService.hideDropdown();
+        ((_a23 = this._dropdownManagerService.activeDropdown) == null ? void 0 : _a23.trigger) === "editor-bridge" && this._dropdownManagerService.hideDropdown();
         return;
       }
       const state = this._editorBridgeService.getEditCellState();
@@ -3059,7 +3069,8 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
             },
             componentKey: validator.dropdown,
             onHide: /* @__PURE__ */ __name(() => {
-            }, "onHide")
+            }, "onHide"),
+            trigger: "editor-bridge"
           },
           !1
         );
@@ -3410,7 +3421,7 @@ var __defProp$b = Object.defineProperty, __getOwnPropDesc$b = Object.getOwnPrope
   return kind && result && __defProp$b(target, key, result), result;
 }, "__decorateClass$b"), __decorateParam$b = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$b"), _a11;
 let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
-  constructor(_registerOtherFormulaService, _lexerTreeBuilder, _dataValidationModel, _dataValidationCacheService) {
+  constructor(_instanceSrv, _registerOtherFormulaService, _lexerTreeBuilder, _dataValidationModel, _dataValidationCacheService) {
     super();
     __publicField(this, "_formulaMap", /* @__PURE__ */ new Map());
     /**
@@ -3421,20 +3432,21 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
      * reflect of formulaId to cell, only store transformable formula
      */
     __publicField(this, "_formulaCellMap", /* @__PURE__ */ new Map());
-    this._registerOtherFormulaService = _registerOtherFormulaService, this._lexerTreeBuilder = _lexerTreeBuilder, this._dataValidationModel = _dataValidationModel, this._dataValidationCacheService = _dataValidationCacheService, this._initFormulaResultHandler();
+    this._instanceSrv = _instanceSrv, this._registerOtherFormulaService = _registerOtherFormulaService, this._lexerTreeBuilder = _lexerTreeBuilder, this._dataValidationModel = _dataValidationModel, this._dataValidationCacheService = _dataValidationCacheService, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((resultMap) => {
       for (const unitId in resultMap) {
         const unitMap = resultMap[unitId];
-        for (const subUnitId in unitMap) {
-          const results = unitMap[subUnitId], { formulaCellMap, ruleFormulaMap } = this._ensureMaps(unitId, subUnitId), manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
-          results.forEach((result) => {
-            var _a23, _b;
-            const ruleInfo = ruleFormulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = manager.getRuleById((_b = result.extra) == null ? void 0 : _b.ruleId);
-            rule && ruleInfo && !ruleInfo.isTransformable && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges), cellInfo && this._dataValidationCacheService.markCellDirty(unitId, subUnitId, cellInfo.row, cellInfo.column);
-          });
-        }
+        if (this._instanceSrv.getUnitType(unitId) === UniverInstanceType.UNIVER_SHEET)
+          for (const subUnitId in unitMap) {
+            const results = unitMap[subUnitId], { formulaCellMap, ruleFormulaMap } = this._ensureMaps(unitId, subUnitId), manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
+            results.forEach((result) => {
+              var _a23, _b;
+              const ruleInfo = ruleFormulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = manager.getRuleById((_b = result.extra) == null ? void 0 : _b.ruleId);
+              rule && ruleInfo && !ruleInfo.isTransformable && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges), cellInfo && this._dataValidationCacheService.markCellDirty(unitId, subUnitId, cellInfo.row, cellInfo.column);
+            });
+          }
       }
     }));
   }
@@ -3563,10 +3575,11 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
   }
 }, __name(_a11, "DataValidationCustomFormulaService"), _a11);
 DataValidationCustomFormulaService = __decorateClass$b([
-  __decorateParam$b(0, Inject(RegisterOtherFormulaService)),
-  __decorateParam$b(1, Inject(LexerTreeBuilder)),
-  __decorateParam$b(2, Inject(DataValidationModel)),
-  __decorateParam$b(3, Inject(DataValidationCacheService))
+  __decorateParam$b(0, IUniverInstanceService),
+  __decorateParam$b(1, Inject(RegisterOtherFormulaService)),
+  __decorateParam$b(2, Inject(LexerTreeBuilder)),
+  __decorateParam$b(3, Inject(DataValidationModel)),
+  __decorateParam$b(4, Inject(DataValidationCacheService))
 ], DataValidationCustomFormulaService);
 const _CustomFormulaValidator = class _CustomFormulaValidator extends BaseDataValidator {
   constructor() {
@@ -4206,7 +4219,7 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
   }
 }, __name(_a15, "DataValidationRefRangeController"), _a15);
 DataValidationRefRangeController = __decorateClass$7([
-  OnLifecycle(LifecycleStages.Ready, DataValidationRefRangeController),
+  OnLifecycle(LifecycleStages.Starting, DataValidationRefRangeController),
   __decorateParam$7(0, Inject(DataValidationModel)),
   __decorateParam$7(1, Inject(Injector)),
   __decorateParam$7(2, Inject(RefRangeService)),

package/lib/locale/en-US.json

@@ -33,7 +33,8 @@
       "showWarning": "Show warning",
       "rejectInput": "Reject input",
       "messageInfo": "Helper message",
-      "showInfo": "Show help text for a selected cell"
+      "showInfo": "Show help text for a selected cell",
+      "rangeError": "Ranges are not legal"
     },
     "operators": {
       "between": "between",

package/lib/locale/ru-RU.json

@@ -21,6 +21,7 @@
       "removeAll": "Удалить все",
       "add": "добавить правило",
       "range": "Диапазоны",
+      "rangeError": "Диапазоны не являются законными",
       "type": "Тип",
       "options": "Дополнительные параметры",
       "operator": "Оператор",

package/lib/locale/vi-VN.json

@@ -21,6 +21,7 @@
       "removeAll": "Xóa tất cả",
       "add": "Tạo quy tắc mới",
       "range": "Phạm vi áp dụng",
+      "rangeError": "Phạm vi không hợp pháp",
       "type": "Loại điều kiện",
       "options": "Cài đặt nâng cao",
       "operator": "Dữ liệu",

package/lib/locale/zh-CN.json

@@ -21,6 +21,7 @@
       "removeAll": "全部删除",
       "add": "新建规则",
       "range": "应用范围",
+      "rangeError": "请输入合法的应用范围",
       "type": "条件类型",
       "options": "高级设置",
       "operator": "数据",

package/lib/locale/zh-TW.json

@@ -21,6 +21,7 @@
       "removeAll": "全部刪除",
       "add": "新建規則",
       "range": "應用範圍",
+      "rangeError": "應用範圍不合法",
       "type": "條件型別",
       "options": "進階設定",
       "operator": "資料",

package/lib/types/locale/zh-CN.d.ts

@@ -36,6 +36,7 @@ declare const locale: {
             removeAll: string;
             add: string;
             range: string;
+            rangeError: string;
             type: string;
             options: string;
             operator: string;

package/lib/types/services/dropdown-manager.service.d.ts

@@ -9,6 +9,7 @@ export interface IDropdownParam {
     location: ISheetLocation;
     onHide?: () => void;
     componentKey: string;
+    trigger?: 'editor-bridge';
 }
 export interface IDropdownComponentProps {
     componentKey: string;

package/lib/types/services/dv-custom-formula.service.d.ts

@@ -1,4 +1,4 @@
-import { IRange, ISheetDataValidationRule, Disposable } from '@univerjs/core';
+import { IRange, ISheetDataValidationRule, Disposable, IUniverInstanceService } from '@univerjs/core';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { DataValidationModel } from '@univerjs/data-validation';
 import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
@@ -12,6 +12,7 @@ interface IFormulaData {
     formulaId?: string;
 }
 export declare class DataValidationCustomFormulaService extends Disposable {
+    private readonly _instanceSrv;
     private _registerOtherFormulaService;
     private _lexerTreeBuilder;
     private readonly _dataValidationModel;
@@ -25,7 +26,7 @@ export declare class DataValidationCustomFormulaService extends Disposable {
      * reflect of formulaId to cell, only store transformable formula
      */
     private _formulaCellMap;
-    constructor(_registerOtherFormulaService: RegisterOtherFormulaService, _lexerTreeBuilder: LexerTreeBuilder, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService);
+    constructor(_instanceSrv: IUniverInstanceService, _registerOtherFormulaService: RegisterOtherFormulaService, _lexerTreeBuilder: LexerTreeBuilder, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService);
     private _initFormulaResultHandler;
     private _ensureMaps;
     private _registerFormula;

package/lib/types/services/dv-formula.service.d.ts

@@ -1,14 +1,15 @@
-import { Nullable, Disposable } from '@univerjs/core';
+import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
 import { DataValidationModel } from '@univerjs/data-validation';
 import { IFormulaInfo, IOtherFormulaResult, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import { DataValidationCacheService } from './dv-cache.service';
 
 export declare class DataValidationFormulaService extends Disposable {
+    private readonly _instanceService;
     private _registerOtherFormulaService;
     private readonly _dataValidationCacheService;
     private readonly _dataValidationModel;
     private _formulaRuleMap;
-    constructor(_registerOtherFormulaService: RegisterOtherFormulaService, _dataValidationCacheService: DataValidationCacheService, _dataValidationModel: DataValidationModel);
+    constructor(_instanceService: IUniverInstanceService, _registerOtherFormulaService: RegisterOtherFormulaService, _dataValidationCacheService: DataValidationCacheService, _dataValidationModel: DataValidationModel);
     private _initFormulaResultHandler;
     private _ensureRuleFormulaMap;
     addRule(unitId: string, subUnitId: string, ruleId: string, formula1: string | undefined, formula2: string | undefined): void;