@univerjs/sheets-ui 0.6.6-nightly.202503161606 → 0.6.6-nightly.202503171607

package/lib/es/index.js

@@ -3821,48 +3821,49 @@ let zs = class extends de {
     };
   }
   // calc apply data according to copy data and direction
-  _getApplyData(e, t, n, i, o, s = !0) {
-    const l = [], a = Math.floor(n / t), c = n % t, d = this._autoFillService.getRules();
+  _getApplyData(e, t, n, i, o, s = !0, l) {
+    const a = [], c = Math.floor(n / t), d = n % t, u = this._autoFillService.getRules();
     if (!s && o === Ne.ONLY_FORMAT)
       return console.error("ERROR: only format can not be applied when hasStyle is false"), [];
-    const u = {};
-    d.forEach((h) => {
-      u[h.type] = [];
-    }), d.forEach((h) => {
-      const { type: g, applyFunctions: m = {} } = h, f = e[g];
-      f && f.forEach((p) => {
-        const S = CC(p.index, c), v = p.index.length * a + S, C = this._applyFunctions(
-          p,
-          v,
+    const h = {};
+    u.forEach((g) => {
+      h[g.type] = [];
+    }), u.forEach((g) => {
+      const { type: m, applyFunctions: f = {} } = g, p = e[m];
+      p && p.forEach((S) => {
+        const v = CC(S.index, d), C = S.index.length * c + v, w = this._applyFunctions(
+          S,
+          C,
           i,
           o,
-          m,
-          e
-        ), w = bC(t, n, p.index);
-        u[g].push({ data: C, index: w });
+          f,
+          e,
+          l
+        ), R = bC(t, n, S.index);
+        h[m].push({ data: w, index: R });
       });
     });
-    for (let h = 0; h < n; h++)
-      d.forEach((g) => {
-        const { type: m } = g, f = u[m];
-        for (let p = 0; p < f.length; p++)
-          h in f[p].index && l.push(f[p].data[f[p].index[h]]);
+    for (let g = 0; g < n; g++)
+      u.forEach((m) => {
+        const { type: f } = m, p = h[f];
+        for (let S = 0; S < p.length; S++)
+          g in p[S].index && a.push(p[S].data[p[S].index[g]]);
       });
-    return l;
+    return a;
   }
-  _applyFunctions(e, t, n, i, o, s) {
-    const { data: l } = e, a = n === W.UP || n === W.LEFT;
+  _applyFunctions(e, t, n, i, o, s, l) {
+    const { data: a } = e, c = n === W.UP || n === W.LEFT;
     if (i === Ne.COPY) {
-      const c = o == null ? void 0 : o[Ne.COPY];
-      return c ? c(e, t, n, s) : (a && l.reverse(), Tr(l, t));
+      const d = o == null ? void 0 : o[Ne.COPY];
+      return d ? d(e, t, n, s, l) : (c && a.reverse(), Tr(a, t));
     }
     if (i === Ne.SERIES) {
-      const c = o == null ? void 0 : o[Ne.SERIES];
-      return c ? c(e, t, n, s) : (a && l.reverse(), o != null && o[Ne.COPY] ? o[Ne.COPY](e, t, n, s) : Tr(l, t));
+      const d = o == null ? void 0 : o[Ne.SERIES];
+      return d ? d(e, t, n, s) : (c && a.reverse(), o != null && o[Ne.COPY] ? o[Ne.COPY](e, t, n, s, l) : Tr(a, t));
     }
     if (i === Ne.ONLY_FORMAT) {
-      const c = o == null ? void 0 : o[Ne.ONLY_FORMAT];
-      return c ? c(e, t, n, s) : _C(l, t);
+      const d = o == null ? void 0 : o[Ne.ONLY_FORMAT];
+      return d ? d(e, t, n, s) : _C(a, t);
     }
   }
   _getCopyData(e, t) {
@@ -3987,7 +3988,7 @@ let zs = class extends de {
     if (t === W.DOWN || t === W.UP) {
       const O = m.length, H = [];
       g.forEach((F, z) => {
-        const B = S[z], j = this._getApplyData(B, v, O, t, n, s);
+        const B = S[z], j = this._getApplyData(B, v, O, t, n, s, e);
         H.push(j);
       });
       for (let F = 0; F < H[0].length; F++) {
@@ -4002,7 +4003,7 @@ let zs = class extends de {
     } else {
       const O = g.length;
       m.forEach((H, F) => {
-        const z = S[F], B = this._getApplyData(z, v, O, t, n, s), j = [];
+        const z = S[F], B = this._getApplyData(z, v, O, t, n, s, e), j = [];
         for (let Y = 0; Y < B.length; Y++)
           j.push({
             s: null,

package/lib/types/services/auto-fill/type.d.ts

@@ -60,7 +60,7 @@ export interface IRuleConfirmedData {
     cellData: Nullable<ICellData>;
 }
 export type APPLY_FUNCTIONS = {
-    [key in APPLY_TYPE]?: (dataWithIndex: ICopyDataInType, len: number, direction: Direction, copyDataPiece: ICopyDataPiece) => Array<Nullable<ICellData>>;
+    [key in APPLY_TYPE]?: (dataWithIndex: ICopyDataInType, len: number, direction: Direction, copyDataPiece: ICopyDataPiece, location?: IAutoFillLocation) => Array<Nullable<ICellData>>;
 };
 export declare enum APPLY_TYPE {
     COPY = "COPY",