@univerjs/sheets-data-validation-ui 0.4.1-nightly.202410241606 → 0.4.1-nightly.202410261605

package/lib/es/index.js

@@ -7,7 +7,7 @@ import { Inject, LocaleService, Disposable, DataValidationErrorStyle, useDepende
 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 { SheetDataValidationModel, getCellValueOrigin, getDataValidationCellValue, deserializeListOptions, serializeListOptions, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, createDefaultNewRule, AddSheetDataValidationCommand, RemoveSheetAllDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, getDataValidationDiffMutations, DataValidationCacheService, DataValidationFormulaController, DataValidationFormulaService, getFormulaResult, isLegalFormulaResult, 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";
@@ -1119,7 +1119,8 @@ function getSheetIdByName(univerInstanceService, unitId, name) {
 }
 __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), 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);
+  var _a18;
+  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]), [isRangeError, setIsRangeError] = useState(!1), rangeSelectorActionsRef = useRef({}), [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(!1), sheetSelectionService = useDependency(SheetsSelectionsService);
   if (useEffect(() => () => {
     const currentSelection = sheetSelectionService.getCurrentLastSelection();
     currentSelection && sheetSelectionService.setSelections([currentSelection]);
@@ -1133,7 +1134,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.includes(localRule.operator) : !1, handleOk = /* @__PURE__ */ __name(() => {
-    localRule.ranges.length && (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
+    !localRule.ranges.length || isRangeError || (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
   }, "handleOk"), handleUpdateRuleRanges = useEvent((rangeText) => {
     const unitRanges = rangeText.split(",").map(deserializeRangeWithSheet).map((unitRange) => {
       const sheetName = unitRange.sheetName;
@@ -1226,8 +1227,8 @@ function DataValidationDetail() {
       }
     ));
   }, "handleUpdateRuleOptions"), handlePanelClick = /* @__PURE__ */ __name((e) => {
-    var _a18;
-    const handleOutClick = (_a18 = rangeSelectorActionsRef.current) == null ? void 0 : _a18.handleOutClick;
+    var _a19;
+    const handleOutClick = (_a19 = rangeSelectorActionsRef.current) == null ? void 0 : _a19.handleOutClick;
     handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
   }, "handlePanelClick");
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$3.dataValidationDetail, onClick: handlePanelClick, children: [
@@ -1235,7 +1236,7 @@ function DataValidationDetail() {
       FormLayout,
       {
         label: localeService.t("dataValidation.panel.range"),
-        error: localRule.ranges.length ? "" : localeService.t("dataValidation.panel.rangeError"),
+        error: !localRule.ranges.length || isRangeError ? localeService.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           RangeSelector,
           {
@@ -1244,7 +1245,8 @@ function DataValidationDetail() {
             initValue: rangeStr,
             onChange: handleUpdateRuleRanges,
             isFocus: isFocusRangeSelector,
-            actions: rangeSelectorActionsRef.current
+            actions: rangeSelectorActionsRef.current,
+            onVerify: /* @__PURE__ */ __name((isValid) => setIsRangeError(!isValid), "onVerify")
           }
         )
       }
@@ -1300,6 +1302,20 @@ function DataValidationDetail() {
       },
       key + localRule.type
     ) : null,
+    /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+      Checkbox,
+      {
+        checked: (_a18 = localRule.allowBlank) != null ? _a18 : !0,
+        onChange: /* @__PURE__ */ __name(() => {
+          var _a19;
+          return handleUpdateRuleSetting({
+            ...baseRule,
+            allowBlank: !((_a19 = localRule.allowBlank) == null || _a19)
+          });
+        }, "onChange"),
+        children: localeService.t("dataValidation.panel.allowBlank")
+      }
+    ) }),
     /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationOptions, { value: options, onChange: handleUpdateRuleOptions, extraComponent: validator.optionsInput }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$3.dataValidationDetailButtons, children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$3.dataValidationDetailButton, onClick: handleDelete, children: localeService.t("dataValidation.panel.removeRule") }),
@@ -2611,11 +2627,12 @@ let CheckboxRender = (_a11 = class {
     return ((_a18 = style == null ? void 0 : style.fs) != null ? _a18 : 10) * 1.6;
   }
   async _parseFormula(rule, unitId, subUnitId) {
-    var _a18, _b;
-    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
+    var _a18, _b, _c;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), formulaResult1 = getFormulaResult((_a18 = results == null ? void 0 : results[0]) == null ? void 0 : _a18.result), formulaResult2 = getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result), isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));
     return {
-      formula1: isFormulaString(formula1) ? getFormulaResult((_a18 = results == null ? void 0 : results[0]) == null ? void 0 : _a18.result) : formula1,
-      formula2: isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2
+      formula1: isFormulaString(formula1) ? getFormulaResult((_c = results == null ? void 0 : results[0]) == null ? void 0 : _c.result) : formula1,
+      formula2: isFormulaString(formula2) ? formulaResult2 : formula2,
+      isFormulaValid
     };
   }
   drawWith(ctx, info) {

package/lib/locale/en-US.json

@@ -34,7 +34,8 @@
       "rejectInput": "Reject input",
       "messageInfo": "Helper message",
       "showInfo": "Show help text for a selected cell",
-      "rangeError": "Ranges are not legal"
+      "rangeError": "Ranges are not legal",
+      "allowBlank": "Allow blank values"
     },
     "operators": {
       "between": "between",
@@ -66,6 +67,10 @@
       "notEqual": "Value must be not equal to {FORMULA1}",
       "notBetween": "Value must be not between {FORMULA1} and {FORMULA2}"
     },
+    "any": {
+      "title": "Any value",
+      "error": "The content of this cell violates the validation rule"
+    },
     "date": {
       "title": "Date",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "Custom formula",
       "error": "This cell's contents violate its validation rule",
-      "validFail": "Please input a valid formula"
+      "validFail": "Please input a valid formula",
+      "ruleName": "Custom formula is {FORMULA1}"
     },
     "alert": {
       "title": "Error",

package/lib/locale/fa-IR.json

@@ -34,7 +34,8 @@
       "rejectInput": "رد ورودی",
       "messageInfo": "پیام راهنما",
       "showInfo": "نمایش متن راهنما برای یک سلول انتخاب شده",
-      "rangeError": "محدوده‌ها نامعتبر هستند"
+      "rangeError": "محدوده‌ها نامعتبر هستند",
+      "allowBlank": "رد سلول خالی"
     },
     "operators": {
       "between": "بین",
@@ -66,6 +67,10 @@
       "notEqual": "مقدار باید برابر نیست با {FORMULA1}",
       "notBetween": "مقدار باید بین {FORMULA1} و {FORMULA2} نباشد"
     },
+    "any": {
+      "title": "هر مقدار",
+      "error": "محتوای این سلول نقض قانون اعتبارسنجی است"
+    },
     "date": {
       "title": "تاریخ",
       "operators": {
@@ -143,9 +148,10 @@
       "unchecked": "مقدار انتخاب نشده"
     },
     "custom": {
-      "title": "فرمول سفارشی",
+      "title": "فرمول سفارشی ",
       "error": "محتوای این سلول با قانون اعتبارسنجی آن نقض می‌شود",
-      "validFail": "لطفا یک فرمول معتبر وارد کنید"
+      "validFail": "لطفا یک فرمول معتبر وارد کنید",
+      "ruleName": "فرمول سفارشی {FORMULA1}"
     },
     "alert": {
       "title": "خطا",

package/lib/locale/ru-RU.json

@@ -34,7 +34,8 @@
       "showWarning": "Показать предупреждение",
       "rejectInput": "Отклонить ввод",
       "messageInfo": "Сообщение помощи",
-      "showInfo": "Показать текст помощи для выбранной ячейки"
+      "showInfo": "Показать текст помощи для выбранной ячейки",
+      "allowBlank": "Игнорировать пустые значения"
     },
     "operators": {
       "between": "между",
@@ -66,6 +67,10 @@
       "notEqual": "Значение должно быть не равно {FORMULA1}",
       "notBetween": "Значение должно быть не между {FORMULA1} и {FORMULA2}"
     },
+    "any": {
+      "title": "Любое значение",
+      "error": "Содержимое этой ячейки нарушает правило проверки"
+    },
     "date": {
       "title": "Дата",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "Пользовательская формула",
       "error": "Содержимое этой ячейки нарушает правило проверки",
-      "validFail": "Пожалуйста, введите допустимую формулу"
+      "validFail": "Пожалуйста, введите допустимую формулу",
+      "ruleName": "Пользовательская формула {FORMULA1}"
     },
     "alert": {
       "title": "Ошибка",

package/lib/locale/vi-VN.json

@@ -34,7 +34,8 @@
       "showWarning": "Hiển thị cảnh báo",
       "rejectInput": "Từ chối đầu vào",
       "messageInfo": "Thông báo",
-      "showInfo": "Hiển thị thông báo cho ô đã chọn"
+      "showInfo": "Hiển thị thông báo cho ô đã chọn",
+      "allowBlank": "Bỏ qua giá trị rỗng"
     },
     "operators": {
       "between": "Giữa",
@@ -66,6 +67,10 @@
       "notEqual": "Giá trị phải không bằng {FORMULA1}",
       "notBetween": "Giá trị phải không nằm giữa {FORMULA1} và {FORMULA2}"
     },
+    "any": {
+      "title": "Bất kỳ giá trị",
+      "error": "Nội dung của ô này vi phạm quy tắc xác thực"
+    },
     "date": {
       "title": "Ngày",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "Công thức tùy chỉnh",
       "error": "Nội dung của ô này vi phạm quy tắc xác thực",
-      "validFail": "Vui lòng nhập một công thức hợp lệ"
+      "validFail": "Vui lòng nhập một công thức hợp lệ",
+      "ruleName": "Công thức tùy chỉnh {FORMULA1}"
     },
     "alert": {
       "title": "Thông báo",

package/lib/locale/zh-CN.json

@@ -34,7 +34,8 @@
       "showWarning": "显示警告",
       "rejectInput": "拒绝输入",
       "messageInfo": "文字提示",
-      "showInfo": "显示所选单元格的提示文字"
+      "showInfo": "显示所选单元格的提示文字",
+      "allowBlank": "忽略空值"
     },
     "operators": {
       "between": "介于",
@@ -66,6 +67,10 @@
       "notEqual": "值必须不等于 {FORMULA1}",
       "notBetween": "值必须在 {FORMULA1} 和 {FORMULA2} 范围之外"
     },
+    "any": {
+      "title": "任意值",
+      "error": "此单元格的内容违反了验证规则"
+    },
     "date": {
       "title": "日期",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "自定义公式",
       "error": "此单元格的内容违反了验证规则",
-      "validFail": "请输入合法的公式"
+      "validFail": "请输入合法的公式",
+      "ruleName": "自定义公式 {FORMULA1}"
     },
     "alert": {
       "title": "提示",

package/lib/locale/zh-TW.json

@@ -34,7 +34,8 @@
       "showWarning": "顯示警告",
       "rejectInput": "拒絕輸入",
       "messageInfo": "文字提示",
-      "showInfo": "顯示所選單元格的提示文字"
+      "showInfo": "顯示所選單元格的提示文字",
+      "allowBlank": "忽略空值"
     },
     "operators": {
       "between": "介於",
@@ -66,6 +67,10 @@
       "notEqual": "值必須不等於 {FORMULA1}",
       "notBetween": "值必須在 {FORMULA1} 和 {FORMULA2} 範圍之外"
     },
+    "any": {
+      "title": "任意值",
+      "error": "此儲存格的內容違反了驗證規則"
+    },
     "date": {
       "title": "日期",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "自訂公式",
       "error": "此儲存格的內容違反了驗證規則",
-      "validFail": "請輸入合法的公式"
+      "validFail": "請輸入合法的公式",
+      "ruleName": "自訂公式 {FORMULA1}"
     },
     "alert": {
       "title": "提示",

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

@@ -50,6 +50,7 @@ declare const locale: {
             rejectInput: string;
             messageInfo: string;
             showInfo: string;
+            allowBlank: string;
         };
         operators: {
             between: string;
@@ -81,6 +82,10 @@ declare const locale: {
             notEqual: string;
             notBetween: string;
         };
+        any: {
+            title: string;
+            error: string;
+        };
         date: {
             title: string;
             operators: {
@@ -161,6 +166,7 @@ declare const locale: {
             title: string;
             error: string;
             validFail: string;
+            ruleName: string;
         };
         alert: {
             title: string;