@univerjs/sheets-data-validation-ui 0.5.0-nightly.202411231605 → 0.5.0-nightly.202411251606

package/lib/es/index.js

@@ -1,7 +1,7 @@
 var Bo = Object.defineProperty;
 var $o = (e, t, o) => t in e ? Bo(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o;
 var M = (e, t, o) => $o(e, typeof t != "symbol" ? t + "" : t, o);
-import zt, { useState as H, forwardRef as we, useRef as We, createElement as Re, useMemo as Te, useEffect as Ce } from "react";
+import zt, { useState as W, forwardRef as we, useRef as We, createElement as Re, useMemo as Te, useEffect as Ce } from "react";
 import { Inject as b, LocaleService as J, Disposable as De, DataValidationErrorStyle as ot, useDependency as L, ICommandService as Q, dayjs as Kt, numfmt as Gt, CellValueType as ko, UniverInstanceType as z, toDisposable as Wo, IUniverInstanceService as ge, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Ho, DisposableCollection as Yo, CommandType as qe, BuildTextUtils as Xo, DataValidationRenderMode as de, DataValidationType as Z, IConfigService as dn, UndoCommand as zo, RedoCommand as Ko, isUnitRangesEqual as Go, debounce as Zo, shallowEqual as Vn, Injector as Fe, DataValidationStatus as at, ObjectMatrix as vt, Range as qo, Rectangle as _t, queryObjectMatrix as Zt, Optional as Jo, RxDisposable as cn, InterceptorEffectEnum as Wn, sequenceExecute as Hn, bufferDebounceTime as Qo, isFormulaString as Pe, Tools as qt, ThemeService as ea, VerticalAlign as ue, HorizontalAlign as He, DEFAULT_STYLES as le, WrapStrategy as Se, DocumentDataModel as ta, DEFAULT_EMPTY_DOCUMENT_VALUE as na, BooleanNumber as Je, Plugin as Yn } from "@univerjs/core";
 import { Button as je, DatePanel as oa, Scrollbar as aa, FormLayout as G, RadioGroup as un, Radio as Ae, Checkbox as Mt, Input as xe, Select as Jt, DraggableList as ia } from "@univerjs/design";
 import { DeviceInputEventType as Qt, IRenderManagerService as Ve, fixLineWidthByScale as yn, Transform as ra, Checkbox as sa, CURSOR_TYPE as Ye, FontCache as la, Shape as da, Rect as Xn, getFontStyleString as At, getDocsSkeletonPageSize as Qe, DocumentViewModel as ca, DocumentSkeleton as ua, Documents as ha } from "@univerjs/engine-render";
@@ -146,7 +146,7 @@ const ti = "univer-dv-date-dropdown", ni = "univer-dv-date-dropdown-btns", An =
 };
 function ai(e) {
   var g;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, c = L(Q), u = L(it), p = n.getCell(a, i), d = ie(n.getCellRaw(a, i)), S = oi(d), [m, f] = H(S), R = m && m.isValid() ? m : Kt(), v = L(J), w = L(oe), I = w.getRuleByLocation(r, l, a, i);
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, c = L(Q), u = L(it), p = n.getCell(a, i), d = ie(n.getCellRaw(a, i)), S = oi(d), [m, f] = W(S), R = m && m.isValid() ? m : Kt(), v = L(J), w = L(oe), I = w.getRuleByLocation(r, l, a, i);
   if (!I)
     return null;
   const y = w.getValidator(I.type);
@@ -604,10 +604,10 @@ const Cn = "DataValidationPanel", Ue = {
   ] });
 };
 function Ti(e) {
-  var j, U, W, Y;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = L(Et), [c, u] = H(""), p = L(Q), d = L(J), [S, m] = H(""), f = L(io), R = L(ge), v = Te(() => s.ruleChange$.pipe(_n(16)), []), w = L(oe);
+  var j, U, H, Y;
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = L(Et), [c, u] = W(""), p = L(Q), d = L(J), [S, m] = W(""), f = L(io), R = L(ge), v = Te(() => s.ruleChange$.pipe(_n(16)), []), w = L(oe);
   Ne(v);
-  const I = xa.useContext(), y = ((U = (j = I.current) == null ? void 0 : j.right) != null ? U : 0) - ((Y = (W = I.current) == null ? void 0 : W.left) != null ? Y : 0);
+  const I = xa.useContext(), y = ((U = (j = I.current) == null ? void 0 : j.right) != null ? U : 0) - ((Y = (H = I.current) == null ? void 0 : H.left) != null ? Y : 0);
   if (Ce(() => {
     const k = p.onCommandExecuted((X) => {
       var q, ee;
@@ -691,7 +691,7 @@ const Ai = "univer-data-validation-options-button", xi = "univer-data-validation
 };
 function ji(e) {
   var c;
-  const t = L(J), o = L(bt), { value: n, onChange: a, extraComponent: i } = e, [r, l] = H(!1), s = i ? o.get(i) : null;
+  const t = L(J), o = L(bt), { value: n, onChange: a, extraComponent: i } = e, [r, l] = W(!1), s = i ? o.get(i) : null;
   return /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
     /* @__PURE__ */ h.jsxs("div", { className: jt.dataValidationOptionsButton, onClick: () => l(!r), children: [
       t.t("dataValidation.panel.options"),
@@ -755,7 +755,7 @@ function ki(e, t, o) {
 }
 function Wi() {
   var se;
-  const [e, t] = H(0), o = L(me), n = Ne(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(ye), c = L(ge), u = L(bt), p = L(Q), d = L(Et), S = L(J), [m, f] = H(r), R = s.getValidatorItem(m.type), [v, w] = H(!1), I = s.getValidatorsByScope(Ua.SHEET), [y, _] = H(() => m.ranges.map((P) => ({ unitId: "", sheetId: "", range: P }))), C = Te(() => $i(p), [p]), [g, V] = H(!1), T = We({}), [N, A] = H(!1), E = L(zn);
+  const [e, t] = W(0), o = L(me), n = Ne(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(ye), c = L(ge), u = L(bt), p = L(Q), d = L(Et), S = L(J), [m, f] = W(r), R = s.getValidatorItem(m.type), [v, w] = W(!1), I = s.getValidatorsByScope(Ua.SHEET), [y, _] = W(() => m.ranges.map((P) => ({ unitId: "", sheetId: "", range: P }))), C = Te(() => $i(p), [p]), [g, V] = W(!1), T = We({}), [N, A] = W(!1), E = L(zn);
   if (Ce(() => () => {
     const P = E.getCurrentLastSelection();
     P && E.setSelections([P]);
@@ -770,7 +770,7 @@ function Wi() {
     return null;
   const O = R.operators, x = R.operatorNames, j = m.operator ? Ba.includes(m.operator) : !1, U = () => {
     !m.ranges.length || g || (R.validatorFormula(m, a, i).success ? o.setActiveRule(null) : w(!0));
-  }, W = uo((P) => {
+  }, H = uo((P) => {
     const D = P.split(",").map(Ha).map(($) => {
       const _e = $.sheetName;
       if (_e) {
@@ -878,7 +878,7 @@ function Wi() {
             unitId: a,
             subUnitId: i,
             initValue: te,
-            onChange: W,
+            onChange: H,
             onFocus: () => A(!0),
             isFocus: N,
             actions: T.current,
@@ -965,7 +965,7 @@ const Hi = "univer-data-validation-item-container", Yi = "univer-data-validation
   dataValidationItemContent: Xi,
   dataValidationItemIcon: zi
 }, Ki = (e) => {
-  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = L(ye), l = L(Q), s = L(Va), c = r.getValidatorItem(t.type), u = We(), [p, d] = H(!1), S = (m) => {
+  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = L(ye), l = L(Q), s = L(Va), c = r.getValidatorItem(t.type), u = We(), [p, d] = W(!1), S = (m) => {
     l.executeCommand(eo.id, {
       ruleId: t.uid,
       unitId: n,
@@ -1023,7 +1023,7 @@ function Ji() {
   return t ? /* @__PURE__ */ h.jsx(Qi, { workbook: t }) : null;
 }
 function Qi(e) {
-  const t = L(oe), o = L(ge), n = L(Q), a = L(Fe), i = L(me), r = L(J), [l, s] = H([]), { workbook: c } = e, u = Ne(c.activeSheet$, void 0, !0), p = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  const t = L(oe), o = L(ge), n = L(Q), a = L(Fe), i = L(me), r = L(J), [l, s] = W([]), { workbook: c } = e, u = Ne(c.activeSheet$, void 0, !0), p = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
   Ce(() => {
     s(t.getRules(p, d));
     const w = t.ruleChange$.subscribe((I) => {
@@ -1163,12 +1163,12 @@ var ar = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, rr = (e, t
 }, Ft = (e, t) => (o, n) => t(o, n, e);
 let Xe = class extends De {
   constructor(e, t, o) {
-    super(), this._autoFillService = e, this._dataValidationModel = t, this._injector = o, this._initAutoFill();
+    super(), this._autoFillService = e, this._sheetDataValidationModel = t, this._injector = o, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (a, i) => {
-      const { source: r, target: l, unitId: s, subUnitId: c } = a, u = this._dataValidationModel.getRuleObjectMatrix(s, c).clone(), p = nn([r, l]), [d, S] = p.ranges, { mapFunc: m } = p, f = {
+      const { source: r, target: l, unitId: s, subUnitId: c } = a, u = this._sheetDataValidationModel.getRuleObjectMatrix(s, c).clone(), p = nn([r, l]), [d, S] = p.ranges, { mapFunc: m } = p, f = {
         row: d.startRow,
         col: d.startColumn
       }, R = Oa(d, S), v = new vt(), w = /* @__PURE__ */ new Set();
@@ -1193,24 +1193,21 @@ let Xe = class extends De {
               endRow: E
             },
             N
-          ), { row: j, col: U } = m(x.startRow, x.startColumn), W = this._dataValidationModel.getRuleIdByLocation(s, c, j, U);
-          if (W) {
-            const Y = _t.getPositionRange(
-              {
-                startRow: E,
-                startColumn: O,
-                endColumn: O,
-                endRow: E
-              },
-              A
-            ), { row: k, col: X } = m(Y.startRow, Y.startColumn);
-            v.setValue(k, X, W), w.add(W);
-          }
+          ), { row: j, col: U } = m(x.startRow, x.startColumn), H = this._sheetDataValidationModel.getRuleIdByLocation(s, c, j, U) || "", Y = _t.getPositionRange(
+            {
+              startRow: E,
+              startColumn: O,
+              endColumn: O,
+              endRow: E
+            },
+            A
+          ), { row: k, col: X } = m(Y.startRow, Y.startColumn);
+          v.setValue(k, X, H), w.add(H);
         });
       });
       const I = Array.from(w).map((g) => ({ id: g, ranges: Zt(v, (V) => V === g) }));
       u.addRangeRules(I);
-      const y = u.diff(this._dataValidationModel.getRules(s, c)), { redoMutations: _, undoMutations: C } = tn(s, c, y, this._injector, "patched", i === et.ONLY_FORMAT);
+      const y = u.diff(this._sheetDataValidationModel.getRules(s, c)), { redoMutations: _, undoMutations: C } = tn(s, c, y, this._injector, "patched", i === et.ONLY_FORMAT);
       return {
         undos: C,
         redos: _
@@ -1223,7 +1220,7 @@ let Xe = class extends De {
         const { source: i, unitId: r, subUnitId: l } = a;
         for (const s of i.rows)
           for (const c of i.cols) {
-            const u = this._dataValidationModel.getRuleByLocation(r, l, s, c);
+            const u = this._sheetDataValidationModel.getRuleByLocation(r, l, s, c);
             if (u && o.indexOf(u.type) > -1) {
               this._autoFillService.setDisableApplyType(et.SERIES, !0);
               return;
@@ -1810,7 +1807,7 @@ const wr = "univer-data-validation-formula", Rr = "univer-data-validation-formul
   ) });
 };
 function Lr(e) {
-  const { value: t, onChange: o, showError: n, validResult: a } = e, i = L(J), r = n ? a == null ? void 0 : a.formula1 : "", l = n ? a == null ? void 0 : a.formula2 : "", [s, c] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  const { value: t, onChange: o, showError: n, validResult: a } = e, i = L(J), r = n ? a == null ? void 0 : a.formula1 : "", l = n ? a == null ? void 0 : a.formula2 : "", [s, c] = W(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
   return /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
     /* @__PURE__ */ h.jsx(G, { children: /* @__PURE__ */ h.jsx(
       Mt,
@@ -1858,7 +1855,7 @@ function Lr(e) {
 }
 function Tr(e) {
   var p;
-  const { unitId: t, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = We({}), [c, u] = H(!1);
+  const { unitId: t, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = We({}), [c, u] = W(!1);
   return fn((d) => {
     var m;
     const S = (m = s.current) == null ? void 0 : m.handleOutClick;
@@ -1923,7 +1920,7 @@ const xr = [
   "#9E6DE3",
   "#F248A6"
 ], jr = (e) => {
-  const { value: t, onChange: o, disabled: n } = e, [a, i] = H(!1);
+  const { value: t, onChange: o, disabled: n } = e, [a, i] = W(!1);
   return /* @__PURE__ */ h.jsx(
     Jt,
     {
@@ -1985,7 +1982,7 @@ const xr = [
 };
 function Fr(e) {
   const { value: t, onChange: o = () => {
-  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, u = We(null), [p, d] = H(() => Pe(s) ? "1" : "0"), [S, m] = H(p === "1" ? s : "="), [f, R] = H(p === "1" ? s : "="), v = L(J), w = L(ye), I = L(Et), y = L(_a), [_, C] = H(() => c.split(",")), g = w.getValidatorItem(Z.LIST), [V, T] = H([]), [N, A] = H(""), E = r ? i == null ? void 0 : i.formula1 : "", O = Te(() => I.ruleChange$.pipe(_n(16)), []), x = Ne(O), j = uo(o);
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, u = We(null), [p, d] = W(() => Pe(s) ? "1" : "0"), [S, m] = W(p === "1" ? s : "="), [f, R] = W(p === "1" ? s : "="), v = L(J), w = L(ye), I = L(Et), y = L(_a), [_, C] = W(() => c.split(",")), g = w.getValidatorItem(Z.LIST), [V, T] = W([]), [N, A] = W(""), E = r ? i == null ? void 0 : i.formula1 : "", O = Te(() => I.ruleChange$.pipe(_n(16)), []), x = Ne(O), j = uo(o);
   Ce(() => {
     (async () => {
       await new Promise((B) => {
@@ -2000,7 +1997,7 @@ function Fr(e) {
   }, [I, x, g, l, a, n]), Ce(() => {
     Pe(s) && s !== f && (m(s), R(f));
   }, [f, s]);
-  const [U, W] = H(() => {
+  const [U, H] = W(() => {
     const D = p !== "1" ? qn(s) : [], F = c.split(",");
     return D.map((B, $) => ({
       label: B,
@@ -2010,10 +2007,10 @@ function Fr(e) {
     }));
   }), Y = (D, F, B) => {
     const $ = U.find((_e) => _e.id === D);
-    $ && ($.label = F, $.color = B, W([...U]));
+    $ && ($.label = F, $.color = B, H([...U]));
   }, k = (D) => {
     const F = U.findIndex((B) => B.id === D);
-    F !== -1 && (U.splice(F, 1), W([...U]));
+    F !== -1 && (U.splice(F, 1), H([...U]));
   }, X = c.split(","), q = Te(() => V.map((D, F) => ({
     label: D,
     color: X[F] || Le,
@@ -2026,7 +2023,7 @@ function Fr(e) {
       formula2: $.join(",")
     });
   }, te = () => {
-    W([
+    H([
       ...U,
       {
         label: "",
@@ -2073,7 +2070,7 @@ function Fr(e) {
       }), m("="), A(v.t("dataValidation.validFail.formulaError")));
     },
     [c, j]
-  ), ae = We({}), [se, P] = H(!1);
+  ), ae = We({}), [se, P] = W(!1);
   return fn((D) => {
     var B;
     const F = (B = ae.current) == null ? void 0 : B.handleOutClick;
@@ -2119,7 +2116,7 @@ function Fr(e) {
         ia,
         {
           list: U,
-          onListChange: W,
+          onListChange: H,
           rowHeight: 32,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
@@ -2487,16 +2484,16 @@ let sn = class {
       endY: u.endY - f
     }, _ = y.endX - y.startX, C = y.endY - y.startY, { cl: g } = l || {}, V = (Y = typeof g == "object" ? g == null ? void 0 : g.rgb : g) != null ? Y : "#000", T = At(l != null ? l : void 0), { vt: N, ht: A } = l || {}, E = N != null ? N : ue.MIDDLE, O = (k = ie(s)) != null ? k : "", x = I.parseCellValue(O), j = I.getListWithColorMap(w), U = $t(x, T, _, C);
     this._drawDownIcon(e, y, _, C, E), e.save(), e.translateWithPrecision(y.startX, y.startY), e.beginPath(), e.rect(0, 0, _ - Oe, C), e.clip(), e.translateWithPrecision(rn, yt);
-    let W = 0;
+    let H = 0;
     switch (E) {
       case ue.MIDDLE:
-        W = (U.contentHeight - U.totalHeight) / 2;
+        H = (U.contentHeight - U.totalHeight) / 2;
         break;
       case ue.BOTTOM:
-        W = U.contentHeight - U.totalHeight;
+        H = U.contentHeight - U.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, W), U.lines.forEach((X, q) => {
+    e.translateWithPrecision(0, H), U.lines.forEach((X, q) => {
       e.save();
       const { width: ee, height: te, items: re } = X;
       let ae = 0;
@@ -2739,19 +2736,19 @@ let ln = class {
     }, w = v.endX - v.startX, I = v.endY - v.startY, y = this._ensureMap(s), _ = this._generateKey(a, i), C = p.getListWithColor(u), g = ie(l), V = `${g != null ? g : ""}`, T = C.find((x) => x.label === V);
     let { tb: N, vt: A, ht: E, pd: O } = r || {};
     if (N = N != null ? N : Se.WRAP, A = A != null ? A : ue.BOTTOM, E = E != null ? E : le.ht, O = O != null ? O : le.pd, u.renderMode === de.ARROW) {
-      const { l: x = le.pd.l, t: j = le.pd.t, r: U = le.pd.r, b: W = le.pd.b } = O, Y = w - x - U - he - 4, { documentSkeleton: k, documents: X, docModel: q } = mt(V, this._localeService, r);
+      const { l: x = le.pd.l, t: j = le.pd.t, r: U = le.pd.r, b: H = le.pd.b } = O, Y = w - x - U - he - 4, { documentSkeleton: k, documents: X, docModel: q } = mt(V, this._localeService, r);
       N === Se.WRAP && q.updateDocumentDataPageSize(Math.max(Y, 1)), k.calculate(), k.getActualSize();
-      const ee = Qe(k), { height: te, width: re } = ee, { paddingTop: ae, paddingLeft: se } = Bn(Y, I - j - W, re, te, A, E, !0);
-      this._drawDownIcon(e, v, w, I, te, A, O), e.save(), e.translateWithPrecision(v.startX + x, v.startY + j), e.beginPath(), e.rect(0, 0, w - x - U, I - j - W), e.clip(), e.translateWithPrecision(0, ae), e.save(), e.translateWithPrecision(Ee, 0), e.beginPath(), e.rect(0, 0, Y, te), e.clip(), X.render(e), e.translateWithPrecision(se, 0), e.restore(), e.restore(), y.set(_, {
+      const ee = Qe(k), { height: te, width: re } = ee, { paddingTop: ae, paddingLeft: se } = Bn(Y, I - j - H, re, te, A, E, !0);
+      this._drawDownIcon(e, v, w, I, te, A, O), e.save(), e.translateWithPrecision(v.startX + x, v.startY + j), e.beginPath(), e.rect(0, 0, w - x - U, I - j - H), e.clip(), e.translateWithPrecision(0, ae), e.save(), e.translateWithPrecision(Ee, 0), e.beginPath(), e.rect(0, 0, Y, te), e.clip(), X.render(e), e.translateWithPrecision(se, 0), e.restore(), e.restore(), y.set(_, {
         left: v.endX + x + o.rowHeaderWidth - he,
         top: v.startY + j + o.columnHeaderHeight,
         width: he,
-        height: I - j - W
+        height: I - j - H
       });
     } else {
       e.save(), e.translateWithPrecision(v.startX, v.startY), e.beginPath(), e.rect(0, 0, w, I), e.clip();
-      const x = w - pe * 2 - Ee - he - 4, { documentSkeleton: j, documents: U, docModel: W } = mt(V, this._localeService, r);
-      N === Se.WRAP && W.updateDocumentDataPageSize(Math.max(x, 1)), j.calculate();
+      const x = w - pe * 2 - Ee - he - 4, { documentSkeleton: j, documents: U, docModel: H } = mt(V, this._localeService, r);
+      N === Se.WRAP && H.updateDocumentDataPageSize(Math.max(x, 1)), j.calculate();
       const Y = Qe(j), { height: k, width: X } = Y, { paddingTop: q, paddingLeft: ee } = Bn(x, I, X, k, A, E);
       e.translateWithPrecision(pe, q);
       const te = Math.max(w - pe * 2, 1), re = k;

package/lib/types/controllers/dv-auto-fill.controller.d.ts

@@ -3,8 +3,8 @@ import { SheetDataValidationModel } from '@univerjs/sheets-data-validation';
 import { IAutoFillService } from '@univerjs/sheets-ui';
 export declare class DataValidationAutoFillController extends Disposable {
     private readonly _autoFillService;
-    private readonly _dataValidationModel;
+    private readonly _sheetDataValidationModel;
     private readonly _injector;
-    constructor(_autoFillService: IAutoFillService, _dataValidationModel: SheetDataValidationModel, _injector: Injector);
+    constructor(_autoFillService: IAutoFillService, _sheetDataValidationModel: SheetDataValidationModel, _injector: Injector);
     private _initAutoFill;
 }