tor-univer-sheet 1.1.5 → 1.1.7

package/dist/tor-univer-sheet.es.js

@@ -1,7 +1,7 @@
-import Y from "dayjs";
-import { CellValueType as k } from "@univerjs/presets";
-import $ from "decimal.js";
-const ft = (t, r) => {
+import m from "dayjs";
+import { CellValueType as I } from "@univerjs/presets";
+import F from "decimal.js";
+const ct = (t, r) => {
   for (const o of r)
     t[o] = null;
 }, _ = () => {
@@ -22,7 +22,7 @@ const ft = (t, r) => {
     return t > 0 ? (e = (t + e) % 16 | 0, t = Math.floor(t / 16)) : (e = (r + e) % 16 | 0, r = Math.floor(r / 16)), (o === "x" ? e : e & 3 | 8).toString(16);
   });
 };
-function ct(t) {
+function ft(t) {
   return {
     ...t?.workbookData,
     id: t?.id || _(),
@@ -34,7 +34,7 @@ const K = Object.prototype.toString, J = (t, r) => K.call(t) === `[object ${r}]`
 class rt {
   value;
   constructor(r) {
-    this.value = new $(r);
+    this.value = new F(r);
   }
   /**
    * 加法运算
@@ -67,7 +67,7 @@ class rt {
    * @throws 当除数为0时抛出错误
    */
   divide(r) {
-    const o = new $(r);
+    const o = new F(r);
     if (o.isZero())
       throw new Error("除数是0");
     return this.value = this.value.div(o), this;
@@ -79,7 +79,7 @@ class rt {
    * @returns DecimalChain 实例，支持链式调用
    */
   toFixed(r, o) {
-    return this.value = new $(this.value.toFixed(r, o)), this;
+    return this.value = new F(this.value.toFixed(r, o)), this;
   }
   /**
    * 返回当前值
@@ -103,7 +103,7 @@ class rt {
     return this.value.toNumber();
   }
 }
-function I(t = 0) {
+function R(t = 0) {
   return new rt(t);
 }
 var ot = /* @__PURE__ */ ((t) => (t.无 = "no", t.年 = "year", t.月 = "month", t.周 = "week", t.天 = "day", t.班组 = "shift", t.小时 = "hour", t.半小时 = "half_hour", t))(ot || {}), nt = /* @__PURE__ */ ((t) => (t.view = "view", t.edit = "edit", t))(nt || {});
@@ -113,23 +113,23 @@ async function mt(t, r) {
     case "year":
       if (q(r))
         return Promise.resolve(r);
-      const o = Y(r);
+      const o = m(r);
       if (!o.isValid())
         return Promise.reject("无效的日期格式");
-      const e = o.year(), c = `${e}-01`, s = `${e}-12`;
-      return Promise.resolve([c, s]);
+      const e = o.year(), c = `${e}-01`, n = `${e}-12`;
+      return Promise.resolve([c, n]);
     case "month":
       if (q(r))
         return Promise.resolve(r);
-      const i = Y(r);
+      const i = m(r);
       if (!i.isValid())
         return Promise.reject("无效的日期格式");
-      const x = i.startOf("month").format("YYYY-MM-DD"), a = i.endOf("month").format("YYYY-MM-DD");
-      return Promise.resolve([x, a]);
+      const x = i.startOf("month").format("YYYY-MM-DD"), s = i.endOf("month").format("YYYY-MM-DD");
+      return Promise.resolve([x, s]);
     case "day":
       if (q(r))
         return Promise.resolve(r);
-      const w = Y(r);
+      const w = m(r);
       if (!w.isValid())
         return Promise.reject("无效的日期格式");
       const l = w.startOf("day").format("YYYY-MM-DD HH:mm:ss"), H = w.endOf("day").format("YYYY-MM-DD HH:mm:ss");
@@ -146,9 +146,9 @@ function S(t, r, o) {
     day: "YYYY-MM-DD",
     hour: "HH:mm:ss"
   }[o];
-  return ["day", "hour"].includes(o) ? Y(r, e).diff(Y(t, e), o) + 1 : Y(r, e).diff(Y(t, e), o);
+  return ["day", "hour"].includes(o) ? m(r, e).diff(m(t, e), o) + 1 : m(r, e).diff(m(t, e), o);
 }
-function F(t, r, o) {
+function B(t, r, o) {
   if (!o)
     throw new Error("日期类型不能为空");
   const e = {
@@ -157,19 +157,16 @@ function F(t, r, o) {
     day: "YYYY-MM-DD",
     hour: "HH:mm:ss"
   }[o];
-  return Y(t).subtract(r, o).format(e);
+  return m(t).subtract(r, o).format(e);
 }
 function v(t, r, o, e) {
-  const c = "YYYY-MM-DD HH:mm:ss", s = U(t, r, o, e), i = Y(s);
+  const c = "YYYY-MM-DD HH:mm:ss", n = U(t, r, o, e), i = m(n);
   if (r === "month") {
-    const a = i.month();
-    return a === 0 ? [i.startOf("month").format(c), i.date(25).endOf("day").format(c)] : a === 11 ? [i.subtract(1, "month").date(26).startOf("day").format(c), i.endOf("month").format(c)] : [i.subtract(1, "month").date(26).startOf("day").format(c), i.date(25).endOf("day").format(c)];
+    const s = i.month();
+    return s === 0 ? [i.startOf("month").format(c), i.date(25).endOf("day").format(c)] : s === 11 ? [i.subtract(1, "month").date(26).startOf("day").format(c), i.endOf("month").format(c)] : [i.subtract(1, "month").date(26).startOf("day").format(c), i.date(25).endOf("day").format(c)];
   }
   const x = { year: "year", day: "day", hour: "hour" };
-  return [
-    i.startOf(x[r]).format(c),
-    i.endOf(x[r]).format(c)
-  ];
+  return [i.startOf(x[r]).format(c), i.endOf(x[r]).format(c)];
 }
 function U(t, r, o, e) {
   const c = {
@@ -178,7 +175,7 @@ function U(t, r, o, e) {
     day: "YYYY-MM-DD",
     hour: "YYYY-MM-DD HH:mm:ss"
   }[r];
-  return Y(t, c).add(o * e, r).format(c);
+  return m(t, c).add(o * e, r).format(c);
 }
 function M(t, r, o) {
   return t[r] || (t[r] = {}), t[r][o] || (t[r][o] = {}), t[r][o];
@@ -187,20 +184,20 @@ async function lt(t) {
   if (!t)
     throw new Error("cellData is required");
   const r = Object.entries(t).reduce((o, e) => {
-    const [c, s] = e;
-    for (const [i, x] of Object.entries(s)) {
-      const { custom: a, v: w, t: l, s: H } = x;
-      if (!a) continue;
-      const { cellType: d } = a;
+    const [c, n] = e;
+    for (const [i, x] of Object.entries(n)) {
+      const { custom: s, v: w, t: l, s: H } = x;
+      if (!s) continue;
+      const { cellType: d } = s;
       if (d === "indicator") {
         const P = M(o, c, i);
         P.custom = {
-          ...a,
-          required: G(a?.required) ? !1 : a?.required,
-          defaultShift: G(a?.defaultShift) ? !1 : a?.defaultShift,
-          forwardPush: G(a?.forwardPush) ? !1 : a?.forwardPush,
-          forwardPushTimes: G(a?.useDefaultEndDate) ? 0 : a?.forwardPushTimes,
-          useDefaultEndDate: G(a?.useDefaultEndDate) ? !1 : a?.useDefaultEndDate
+          ...s,
+          required: G(s?.required) ? !1 : s?.required,
+          defaultShift: G(s?.defaultShift) ? !1 : s?.defaultShift,
+          forwardPush: G(s?.forwardPush) ? !1 : s?.forwardPush,
+          forwardPushTimes: G(s?.useDefaultEndDate) ? 0 : s?.forwardPushTimes,
+          useDefaultEndDate: G(s?.useDefaultEndDate) ? !1 : s?.useDefaultEndDate
         }, P.s = H, P.t = l, P.v = w;
       }
     }
@@ -209,7 +206,14 @@ async function lt(t) {
   return !r || G(r) ? Promise.reject(new Error("No data found")) : Promise.resolve(r);
 }
 function E(t, r) {
-  return t.replace(/\$\{(\w+)\}/g, (o, e) => r[e] !== void 0 ? r[e] : o);
+  return t.replace(/\$\{([^}]+)\}/g, (o, e) => {
+    try {
+      const c = Object.keys(r), n = Object.values(r);
+      return new Function(...c, `return ${e};`)(...n);
+    } catch (c) {
+      return console.error(`表达式执行失败: ${e}`, c), o;
+    }
+  });
 }
 function st({
   acc: t,
@@ -218,116 +222,126 @@ function st({
   initColNum: e,
   cellData: c
 }) {
-  const { rangeData: s, currentDay: i, extraArgs: x } = r;
+  const { rangeData: n, currentDay: i, extraArgs: x } = r;
   x?.teamData;
-  const { cycleType: a, timeIncrement: w, forwardPush: l, forwardPushTimes: H, copyType: d, copyInterval: P, defaultShift: V, templateStr: T, useDefaultEndDate: C } = c.custom;
-  let b = 0;
-  switch (a) {
+  const { cycleType: s, timeIncrement: w, forwardPush: l, forwardPushTimes: H, copyType: d, copyInterval: P, defaultShift: V, templateStr: T, useDefaultEndDate: C } = c.custom;
+  let g = 0;
+  switch (s) {
     case "day": {
-      let n = "";
-      if (l && (n = F(
-        s[0],
+      let a = "";
+      if (l && (a = B(
+        n[0],
         H,
         "day"
         /* day */
       )), !d) {
         let u = "";
-        l ? u = n : u = s[0];
-        const g = M(t, o, e);
-        g.v = T ? E(T, { v: u }) : u, g.t = k.STRING;
+        l ? u = a : u = n[0];
+        const b = M(t, o, e);
+        b.v = T ? E(T, { businessDate: u, dayjs: m }) : m(u).format("YYYY-MM-DD"), b.t = I.STRING;
         break;
       }
-      l ? b = S(
-        n,
-        s[0],
+      l ? g = S(
+        a,
+        n[0],
         "day"
         /* day */
-      ) : b = S(
-        s[0],
-        s[1],
+      ) : g = S(
+        n[0],
+        n[1],
         "day"
         /* day */
       );
-      for (let u = 0; u <= Math.abs(b === 0 ? 1 : b); u++) {
-        const g = u * (P + 1);
+      for (let u = 0; u <= Math.abs(g === 0 ? 1 : g); u++) {
+        const b = u * (P + 1);
         let p = "";
-        l ? p = U(n, "day", u, w) : p = U(s[0], "day", u, w);
-        const h = d === "right" ? o : o + g, D = d === "right" ? e + g : e, f = M(t, h, D);
-        f.v = T ? E(T, { v: p }) : p, f.t = k.STRING;
+        l ? p = U(a, "day", u, w) : p = U(n[0], "day", u, w);
+        const h = d === "right" ? o : o + b, y = d === "right" ? e + b : e, f = M(t, h, y);
+        f.v = T ? E(T, { businessDate: p, dayjs: m }) : m(p).format("YYYY-MM-DD"), f.t = I.STRING;
       }
       break;
     }
     case "month": {
       if (!d) {
-        const n = M(t, o, e);
-        n.v = s[0], n.t = k.STRING;
+        const [a, u] = v(n[1], "month", 0, 1), b = M(t, o, e);
+        b.v = m(u).format("YYYY-MM"), b.t = I.STRING;
         break;
       }
-      b = S(
-        s[0],
-        s[1],
+      g = S(
+        n[0],
+        n[1],
         "month"
         /* month */
       );
-      for (let n = 0; n <= Math.abs(b === 0 ? 1 : b); n++) {
-        const u = n * (P + 1), g = d === "right" ? o : o + u, p = d === "right" ? e + u : e, h = M(t, g, p);
-        h.v = U(s[0], "month", n, w), h.t = k.STRING;
+      for (let a = 0; a <= Math.abs(g === 0 ? 1 : g); a++) {
+        const u = a * (P + 1), b = d === "right" ? o : o + u, p = d === "right" ? e + u : e, h = M(t, b, p);
+        h.v = U(n[0], "month", a, w), h.t = I.STRING;
       }
       break;
     }
     case "year": {
-      let n = "";
-      if (l && (n = F(
-        s[0],
+      let a = "";
+      if (l && (a = B(
+        n[0],
         H || 0,
         "year"
         /* year */
       )), !d) {
-        const u = l ? n : s[0], [g, p] = v(u, "year", 0, 1), h = M(t, o, e), [, D] = v(s[1], "month", 0, 1);
-        h.v = T ? E(T, { startTime: Y(g).format("YYYY"), endTime: Y(p).format("YYYY"), endFormat: Y(D).format("YYYY-MM") }) : u, h.t = k.STRING;
+        const u = l ? a : n[0], [b, p] = v(u, "year", 0, 1), h = M(t, o, e), [, y] = v(n[1], "month", 0, 1);
+        h.v = T ? E(T, {
+          startTime: b,
+          endTime: p,
+          rangeData: n,
+          dayjs: m
+        }) : u, h.t = I.STRING;
         break;
       }
-      l ? b = S(
-        n,
-        s[0],
+      l ? g = S(
+        a,
+        n[0],
         "year"
         /* year */
-      ) : b = S(
-        s[0],
-        s[1],
+      ) : g = S(
+        n[0],
+        n[1],
         "year"
         /* year */
       );
-      for (let u = 0; u <= Math.abs(b === 0 ? 1 : b); u++) {
-        const g = u * (P + 1), p = d === "right" ? o : o + g, h = d === "right" ? e + g : e, [D, f] = v(s[0], "year", u, w), m = M(t, p, h), y = U(s[0], "year", u, w);
-        m.v = T ? E(T, { startTime: Y(D).format("YYYY"), endTime: Y(f).format("YYYY"), endFormat: Y(s[1]).format("YYYY-MM") }) : y, m.t = k.STRING;
+      for (let u = 0; u <= Math.abs(g === 0 ? 1 : g); u++) {
+        const b = u * (P + 1), p = d === "right" ? o : o + b, h = d === "right" ? e + b : e, [y, f] = v(n[0], "year", u, w), D = M(t, p, h), Y = U(n[0], "year", u, w);
+        D.v = T ? E(T, {
+          startTime: y,
+          endTime: f,
+          rangeData: n,
+          dayjs: m
+        }) : Y, D.t = I.STRING;
       }
       break;
     }
     case "hour": {
       if (!d) {
-        const n = M(t, o, e);
-        if (n.t = k.STRING, V) {
-          n.v = Y(s[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
+        const a = M(t, o, e);
+        if (a.t = I.STRING, V) {
+          a.v = m(n[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
           break;
         }
-        n.v = Y(i).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
+        a.v = m(i).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
         break;
       }
-      b = S(
-        s[0],
-        s[1],
+      g = S(
+        n[0],
+        n[1],
         "hour"
         /* hour */
       );
-      for (let n = 0; n < Math.abs(b === 0 ? 1 : b); n++) {
-        const u = n * (P + 1), g = d === "right" ? o : o + u, p = d === "right" ? e + u : e, h = M(t, g, p);
-        if (h.t = k.STRING, V) {
-          const D = Y(s[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
-          h.v = U(D, "hour", n, w);
+      for (let a = 0; a < Math.abs(g === 0 ? 1 : g); a++) {
+        const u = a * (P + 1), b = d === "right" ? o : o + u, p = d === "right" ? e + u : e, h = M(t, b, p);
+        if (h.t = I.STRING, V) {
+          const y = m(n[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
+          h.v = U(y, "hour", a, w);
           continue;
         }
-        h.v = U(Y(i).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), "hour", n, w);
+        h.v = U(m(i).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), "hour", a, w);
       }
     }
   }
@@ -339,14 +353,14 @@ async function dt(t, r) {
   if (!e.length)
     return Promise.reject("处理时间范围失败, rangeData不能为空");
   o?.teamData;
-  const c = r?.currentDay || Y().format("YYYY-MM-DD"), s = Object.entries(t).reduce((i, x) => {
-    const [a, w] = x;
+  const c = r?.currentDay || m().format("YYYY-MM-DD"), n = Object.entries(t).reduce((i, x) => {
+    const [s, w] = x;
     for (const [l, H] of Object.entries(w)) {
       const { custom: d } = H;
       if (!d) continue;
-      const { cellType: P, cycleType: V, timeIncrement: T, forwardPush: C, forwardPushTimes: b, copyType: n, copyInterval: u, defaultShift: g, useDefaultEndDate: p } = d;
+      const { cellType: P, cycleType: V, timeIncrement: T, forwardPush: C, forwardPushTimes: g, copyType: a, copyInterval: u, defaultShift: b, useDefaultEndDate: p } = d;
       if (P === "time") {
-        st({ acc: i, params: r, initRowNum: Number(a), initColNum: Number(l), cellData: H });
+        st({ acc: i, params: r, initRowNum: Number(s), initColNum: Number(l), cellData: H });
         continue;
       }
       const h = {
@@ -360,38 +374,38 @@ async function dt(t, r) {
         cellType: d.cellType,
         defaultShift: d?.defaultShift || !1
       };
-      let D = 0;
+      let y = 0;
       switch (V) {
         case "day": {
           let f = "";
-          if (C && (f = F(
+          if (C && (f = B(
             e[0],
-            b || 0,
+            g || 0,
             "day"
             /* day */
-          )), !n) {
-            const m = C ? f : e[0], [y, N] = v(m, "day", 0, 1), O = M(i, a, l);
+          )), !a) {
+            const D = C ? f : e[0], [Y, N] = v(D, "day", 0, 1), O = M(i, s, l);
             O.custom = {
               ...h,
-              startTime: y,
+              startTime: Y,
               endTime: N
             };
             break;
           }
-          C ? D = S(
+          C ? y = S(
             f,
             e[0],
             "day"
             /* day */
-          ) : D = S(
+          ) : y = S(
             e[0],
             e[1],
             "day"
             /* day */
           );
-          for (let m = 0; m < Math.abs(D === 0 ? 1 : D); m++) {
-            const y = m * (u + 1), N = C ? f : e[0], [O, j] = v(N, "day", m, T), R = n === "right" ? a : I(a).add(y).toNumber(), A = n === "right" ? I(l).add(y).toNumber() : l, B = M(i, R, A);
-            B.custom = {
+          for (let D = 0; D < Math.abs(y === 0 ? 1 : y); D++) {
+            const Y = D * (u + 1), N = C ? f : e[0], [O, j] = v(N, "day", D, T), k = a === "right" ? s : R(s).add(Y).toNumber(), $ = a === "right" ? R(l).add(Y).toNumber() : l, A = M(i, k, $);
+            A.custom = {
               ...h,
               startTime: O,
               endTime: j
@@ -400,24 +414,24 @@ async function dt(t, r) {
           break;
         }
         case "month": {
-          if (!n) {
-            const [f, m] = v(e[0], "month", 0, 1), y = M(i, a, l);
-            y.custom = {
+          if (!a) {
+            const [f, D] = v(e[1], "month", 0, 1), Y = M(i, s, l);
+            Y.custom = {
               ...h,
               startTime: f,
-              endTime: m
+              endTime: D
             };
             break;
           }
-          D = S(
+          y = S(
             e[0],
             e[1],
             "month"
             /* month */
           );
-          for (let f = 0; f <= Math.abs(D === 0 ? 1 : D); f++) {
-            const m = f * (u + 1), y = n === "right" ? a : I(a).add(m).toNumber(), N = n === "right" ? I(l).add(m).toNumber() : l, [O, j] = v(e[0], "month", f, T), R = M(i, y, N);
-            R.custom = {
+          for (let f = 0; f <= Math.abs(y === 0 ? 1 : y); f++) {
+            const D = f * (u + 1), Y = a === "right" ? s : R(s).add(D).toNumber(), N = a === "right" ? R(l).add(D).toNumber() : l, [O, j] = v(e[0], "month", f, T), k = M(i, Y, N);
+            k.custom = {
               ...h,
               startTime: O,
               endTime: j
@@ -426,62 +440,67 @@ async function dt(t, r) {
           break;
         }
         case "year": {
-          let f = "";
-          if (C && (f = F(
-            e[0],
-            b || 0,
-            "year"
-            /* year */
-          )), !n) {
-            const m = C ? f : e[0], [y, N] = v(m, "year", 0, 1), O = M(i, a, l), [, j] = v(e[1], "month", 0, 1);
-            O.custom = {
+          let f = "", D = "";
+          if (C) {
+            f = B(
+              e[0],
+              g || 0,
+              "year"
+              /* year */
+            );
+            const Y = m(e[1]).format("MM");
+            D = m(`${f}-${Y + 1}`).format("YYYY-MM");
+          }
+          if (!a) {
+            const Y = C ? f : e[0], [N, O] = v(Y, "year", 0, 1), j = M(i, s, l), [, k] = v(D, "month", 0, 1);
+            j.custom = {
               ...h,
-              startTime: y,
-              endTime: p ? j : N
+              startTime: N,
+              endTime: p ? k : O
             };
             break;
           }
-          C ? D = S(
+          C ? y = S(
             f,
             e[0],
             "year"
             /* year */
-          ) : D = S(
+          ) : y = S(
             e[0],
             e[1],
             "year"
             /* year */
           );
-          for (let m = 0; m < Math.abs(D === 0 ? 1 : D); m++) {
-            const y = m * (u + 1), N = n === "right" ? a : I(a).add(y).toNumber(), O = n === "right" ? I(l).add(y).toNumber() : l, [j, R] = v(e[0], "year", m, T), A = M(i, N, O);
+          for (let Y = 0; Y < Math.abs(y === 0 ? 1 : y); Y++) {
+            const N = Y * (u + 1), O = a === "right" ? s : R(s).add(N).toNumber(), j = a === "right" ? R(l).add(N).toNumber() : l, [k, $] = v(e[0], "year", Y, T), A = M(i, O, j);
             A.custom = {
               ...h,
-              startTime: j,
-              endTime: R
+              startTime: k,
+              endTime: $
             };
           }
           break;
         }
         case "hour": {
-          if (!n) {
-            const f = g ? e[0] : e[0] ?? c, [m, y] = v(f, "hour", 1, 1), N = M(i, a, l);
+          if (!a) {
+            const f = b ? e[0] : e[0] ?? c, [D, Y] = v(f, "hour", 1, 1), N = M(i, s, l);
             N.custom = {
               ...h,
-              startTime: m,
-              endTime: y
+              startTime: D,
+              endTime: Y
             };
             break;
           }
-          D = S(
+          y = S(
             e[0],
             e[1],
             "hour"
             /* hour */
           );
-          for (let f = 0; f < Math.abs(D === 0 ? 1 : D); f++) {
-            const m = f * (u + 1), y = n === "right" ? a : I(a).add(m).toNumber(), N = n === "right" ? I(l).add(m).toNumber() : l, O = M(i, y, N);
-            if (g) {
-              const B = Y(e[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [z, Z] = v(B, "hour", f, T);
+          for (let f = 0; f < Math.abs(y === 0 ? 1 : y); f++) {
+            const D = f * (u + 1), Y = a === "right" ? s : R(s).add(D).toNumber(), N = a === "right" ? R(l).add(D).toNumber() : l, O = M(i, Y, N);
+            if (b) {
+              const A = m(e[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [z, Z] = v(A, "hour", f, T);
               O.custom = {
                 ...h,
                 startTime: z,
@@ -489,11 +508,11 @@ async function dt(t, r) {
               };
               continue;
             }
-            const j = Y(c).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [R, A] = v(j, "hour", f, T);
+            const j = m(c).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [k, $] = v(j, "hour", f, T);
             O.custom = {
               ...h,
-              startTime: R,
-              endTime: A
+              startTime: k,
+              endTime: $
             };
           }
           break;
@@ -502,28 +521,28 @@ async function dt(t, r) {
     }
     return i;
   }, {});
-  return Promise.resolve(s);
+  return Promise.resolve(n);
 }
 function ht(t) {
   return Object.entries(t).reduce((o, [e, c]) => {
-    const s = Math.max(...Object.keys(c).map(Number));
-    return s > o ? o = Number(s) : o = Number(o) || 0, o;
+    const n = Math.max(...Object.keys(c).map(Number));
+    return n > o ? o = Number(n) : o = Number(o) || 0, o;
   }, 0);
 }
 function Yt(t, r) {
   const o = JSON.parse(JSON.stringify(t || {}));
   for (const [e, c] of Object.entries(r)) {
     o[e] || (o[e] = {});
-    for (const [s, i] of Object.entries(c)) {
-      const x = i, a = o[e]?.[s];
-      a ? o[e][s] = {
-        ...a,
+    for (const [n, i] of Object.entries(c)) {
+      const x = i, s = o[e]?.[n];
+      s ? o[e][n] = {
+        ...s,
         ...x,
         custom: {
-          ...a.custom,
+          ...s.custom,
           ...x.custom || {}
         }
-      } : o[e][s] = x;
+      } : o[e][n] = x;
     }
   }
   return o;
@@ -532,14 +551,14 @@ const Dt = "./style.css";
 export {
   ot as CycleTypeEnum,
   nt as ModeEnum,
-  I as decimal,
+  R as decimal,
   lt as filterIndicatorsCell,
   dt as generateIndicatorsCells,
   _ as generateUUID,
   ht as getNumColumns,
-  ft as handleClearInput,
+  ct as handleClearInput,
   mt as initDateRange,
   Yt as mergeCellData,
   Dt as stylePath,
-  ct as useData
+  ft as useData
 };

package/dist/tor-univer-sheet.umd.js

@@ -1 +1 @@
-(function(g,c){typeof exports=="object"&&typeof module<"u"?c(exports,require("dayjs"),require("@univerjs/presets"),require("decimal.js")):typeof define=="function"&&define.amd?define(["exports","dayjs","@univerjs/presets","decimal.js"],c):(g=typeof globalThis<"u"?globalThis:g||self,c(g.TorUniverSheet={},g.dayjs,g.presets,g.Decimal))})(this,(function(g,c,V,$){"use strict";const L=(e,r)=>{for(const n of r)e[n]=null},z=()=>{if(typeof crypto=="object"){if(typeof crypto.randomUUID=="function")return crypto.randomUUID();if(typeof crypto.getRandomValues=="function"&&typeof Uint8Array=="function"){const n=t=>{const m=Number(t);return(m^crypto.getRandomValues(new Uint8Array(1))[0]&15>>m/4).toString(16)};return"10000000-1000-4000-8000-100000000000".replace(/[018]/g,n)}}let e=new Date().getTime(),r=typeof performance<"u"&&performance.now&&performance.now()*1e3||0;return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=Math.random()*16;return e>0?(t=(e+t)%16|0,e=Math.floor(e/16)):(t=(r+t)%16|0,r=Math.floor(r/16)),(n==="x"?t:t&3|8).toString(16)})};function Q(e){return{...e?.workbookData,id:e?.id||z(),name:e?.name||"未命名",appVersion:e?.appVersion||"1.0.0"}}const W=Object.prototype.toString,Z=(e,r)=>W.call(e)===`[object ${r}]`,X=e=>typeof e<"u",ee=e=>!X(e),te=e=>e!==null&&Z(e,"Object"),q=e=>e==null||typeof e>"u"?!0:A(e)||oe(e)?e.length===0:e instanceof Map||e instanceof Set?e.size===0:te(e)?Object.keys(e).length===0:!1,re=e=>e===null,ne=e=>ee(e)||re(e),oe=e=>Z(e,"String"),A=e=>e&&Array.isArray(e);class se{value;constructor(r){this.value=new $(r)}add(r){return this.value=this.value.add(r||0),this}subtract(r){return this.value=this.value.sub(r||0),this}multiply(r){return this.value=this.value.mul(r||0),this}divide(r){const n=new $(r);if(n.isZero())throw new Error("除数是0");return this.value=this.value.div(n),this}toFixed(r,n){return this.value=new $(this.value.toFixed(r,n)),this}valueOf(){return this.value}toString(){return this.value.toString()}toNumber(){return this.value.toNumber()}}function H(e=0){return new se(e)}var _=(e=>(e.无="no",e.年="year",e.月="month",e.周="week",e.天="day",e.班组="shift",e.小时="hour",e.半小时="half_hour",e))(_||{}),K=(e=>(e.view="view",e.edit="edit",e))(K||{});async function ae(e,r){if(!r)return Promise.reject("日期不能为空");switch(e){case"year":if(A(r))return Promise.resolve(r);const n=c(r);if(!n.isValid())return Promise.reject("无效的日期格式");const t=n.year(),m=`${t}-01`,s=`${t}-12`;return Promise.resolve([m,s]);case"month":if(A(r))return Promise.resolve(r);const i=c(r);if(!i.isValid())return Promise.reject("无效的日期格式");const v=i.startOf("month").format("YYYY-MM-DD"),a=i.endOf("month").format("YYYY-MM-DD");return Promise.resolve([v,a]);case"day":if(A(r))return Promise.resolve(r);const w=c(r);if(!w.isValid())return Promise.reject("无效的日期格式");const d=w.startOf("day").format("YYYY-MM-DD HH:mm:ss"),I=w.endOf("day").format("YYYY-MM-DD HH:mm:ss");return Promise.resolve([d,I]);default:return Promise.reject("不支持的周期类型")}}function O(e,r,n){if(!n)return 0;const t={year:"YYYY",month:"YYYY-MM",day:"YYYY-MM-DD",hour:"HH:mm:ss"}[n];return["day","hour"].includes(n)?c(r,t).diff(c(e,t),n)+1:c(r,t).diff(c(e,t),n)}function F(e,r,n){if(!n)throw new Error("日期类型不能为空");const t={year:"YYYY",month:"YYYY-MM",day:"YYYY-MM-DD",hour:"HH:mm:ss"}[n];return c(e).subtract(r,n).format(t)}function p(e,r,n,t){const m="YYYY-MM-DD HH:mm:ss",s=R(e,r,n,t),i=c(s);if(r==="month"){const a=i.month();return a===0?[i.startOf("month").format(m),i.date(25).endOf("day").format(m)]:a===11?[i.subtract(1,"month").date(26).startOf("day").format(m),i.endOf("month").format(m)]:[i.subtract(1,"month").date(26).startOf("day").format(m),i.date(25).endOf("day").format(m)]}const v={year:"year",day:"day",hour:"hour"};return[i.startOf(v[r]).format(m),i.endOf(v[r]).format(m)]}function R(e,r,n,t){const m={year:"YYYY",month:"YYYY-MM",day:"YYYY-MM-DD",hour:"YYYY-MM-DD HH:mm:ss"}[r];return c(e,m).add(n*t,r).format(m)}function b(e,r,n){return e[r]||(e[r]={}),e[r][n]||(e[r][n]={}),e[r][n]}async function ie(e){if(!e)throw new Error("cellData is required");const r=Object.entries(e).reduce((n,t)=>{const[m,s]=t;for(const[i,v]of Object.entries(s)){const{custom:a,v:w,t:d,s:I}=v;if(!a)continue;const{cellType:h}=a;if(h==="indicator"){const P=b(n,m,i);P.custom={...a,required:q(a?.required)?!1:a?.required,defaultShift:q(a?.defaultShift)?!1:a?.defaultShift,forwardPush:q(a?.forwardPush)?!1:a?.forwardPush,forwardPushTimes:q(a?.useDefaultEndDate)?0:a?.forwardPushTimes,useDefaultEndDate:q(a?.useDefaultEndDate)?!1:a?.useDefaultEndDate},P.s=I,P.t=d,P.v=w}}return n},{});return!r||q(r)?Promise.reject(new Error("No data found")):Promise.resolve(r)}function B(e,r){return e.replace(/\$\{(\w+)\}/g,(n,t)=>r[t]!==void 0?r[t]:n)}function ue({acc:e,params:r,initRowNum:n,initColNum:t,cellData:m}){const{rangeData:s,currentDay:i,extraArgs:v}=r;v?.teamData;const{cycleType:a,timeIncrement:w,forwardPush:d,forwardPushTimes:I,copyType:h,copyInterval:P,defaultShift:E,templateStr:x,useDefaultEndDate:U}=m.custom;let M=0;switch(a){case"day":{let o="";if(d&&(o=F(s[0],I,"day")),!h){let u="";d?u=o:u=s[0];const T=b(e,n,t);T.v=x?B(x,{v:u}):u,T.t=V.CellValueType.STRING;break}d?M=O(o,s[0],"day"):M=O(s[0],s[1],"day");for(let u=0;u<=Math.abs(M===0?1:M);u++){const T=u*(P+1);let N="";d?N=R(o,"day",u,w):N=R(s[0],"day",u,w);const Y=h==="right"?n:n+T,D=h==="right"?t+T:t,f=b(e,Y,D);f.v=x?B(x,{v:N}):N,f.t=V.CellValueType.STRING}break}case"month":{if(!h){const o=b(e,n,t);o.v=s[0],o.t=V.CellValueType.STRING;break}M=O(s[0],s[1],"month");for(let o=0;o<=Math.abs(M===0?1:M);o++){const u=o*(P+1),T=h==="right"?n:n+u,N=h==="right"?t+u:t,Y=b(e,T,N);Y.v=R(s[0],"month",o,w),Y.t=V.CellValueType.STRING}break}case"year":{let o="";if(d&&(o=F(s[0],I||0,"year")),!h){const u=d?o:s[0],[T,N]=p(u,"year",0,1),Y=b(e,n,t),[,D]=p(s[1],"month",0,1);Y.v=x?B(x,{startTime:c(T).format("YYYY"),endTime:c(N).format("YYYY"),endFormat:c(D).format("YYYY-MM")}):u,Y.t=V.CellValueType.STRING;break}d?M=O(o,s[0],"year"):M=O(s[0],s[1],"year");for(let u=0;u<=Math.abs(M===0?1:M);u++){const T=u*(P+1),N=h==="right"?n:n+T,Y=h==="right"?t+T:t,[D,f]=p(s[0],"year",u,w),l=b(e,N,Y),y=R(s[0],"year",u,w);l.v=x?B(x,{startTime:c(D).format("YYYY"),endTime:c(f).format("YYYY"),endFormat:c(s[1]).format("YYYY-MM")}):y,l.t=V.CellValueType.STRING}break}case"hour":{if(!h){const o=b(e,n,t);if(o.t=V.CellValueType.STRING,E){o.v=c(s[0]).add(1,"hour").format("YYYY-MM-DD HH:mm:ss");break}o.v=c(i).add(1,"hour").format("YYYY-MM-DD HH:mm:ss");break}M=O(s[0],s[1],"hour");for(let o=0;o<Math.abs(M===0?1:M);o++){const u=o*(P+1),T=h==="right"?n:n+u,N=h==="right"?t+u:t,Y=b(e,T,N);if(Y.t=V.CellValueType.STRING,E){const D=c(s[0]).add(1,"hour").format("YYYY-MM-DD HH:mm:ss");Y.v=R(D,"hour",o,w);continue}Y.v=R(c(i).add(1,"hour").format("YYYY-MM-DD HH:mm:ss"),"hour",o,w)}}}}async function fe(e,r){if(!e)return Promise.reject("没有可用的单元格数据");const{extraArgs:n,rangeData:t}=r;if(!t.length)return Promise.reject("处理时间范围失败, rangeData不能为空");n?.teamData;const m=r?.currentDay||c().format("YYYY-MM-DD"),s=Object.entries(e).reduce((i,v)=>{const[a,w]=v;for(const[d,I]of Object.entries(w)){const{custom:h}=I;if(!h)continue;const{cellType:P,cycleType:E,timeIncrement:x,forwardPush:U,forwardPushTimes:M,copyType:o,copyInterval:u,defaultShift:T,useDefaultEndDate:N}=h;if(P==="time"){ue({acc:i,params:r,initRowNum:Number(a),initColNum:Number(d),cellData:I});continue}const Y={cycleType:E,indicatorName:h.indicatorName,indicatorCode:h.indicatorCode,indicatorId:h.indicatorId,indicatorDimensionName:h.indicatorDimensionName,indicatorDimensionConfig:h.indicatorDimensionConfig,required:ne(h?.required)??!1,cellType:h.cellType,defaultShift:h?.defaultShift||!1};let D=0;switch(E){case"day":{let f="";if(U&&(f=F(t[0],M||0,"day")),!o){const l=U?f:t[0],[y,C]=p(l,"day",0,1),S=b(i,a,d);S.custom={...Y,startTime:y,endTime:C};break}U?D=O(f,t[0],"day"):D=O(t[0],t[1],"day");for(let l=0;l<Math.abs(D===0?1:D);l++){const y=l*(u+1),C=U?f:t[0],[S,k]=p(C,"day",l,x),j=o==="right"?a:H(a).add(y).toNumber(),G=o==="right"?H(d).add(y).toNumber():d,J=b(i,j,G);J.custom={...Y,startTime:S,endTime:k}}break}case"month":{if(!o){const[f,l]=p(t[0],"month",0,1),y=b(i,a,d);y.custom={...Y,startTime:f,endTime:l};break}D=O(t[0],t[1],"month");for(let f=0;f<=Math.abs(D===0?1:D);f++){const l=f*(u+1),y=o==="right"?a:H(a).add(l).toNumber(),C=o==="right"?H(d).add(l).toNumber():d,[S,k]=p(t[0],"month",f,x),j=b(i,y,C);j.custom={...Y,startTime:S,endTime:k}}break}case"year":{let f="";if(U&&(f=F(t[0],M||0,"year")),!o){const l=U?f:t[0],[y,C]=p(l,"year",0,1),S=b(i,a,d),[,k]=p(t[1],"month",0,1);S.custom={...Y,startTime:y,endTime:N?k:C};break}U?D=O(f,t[0],"year"):D=O(t[0],t[1],"year");for(let l=0;l<Math.abs(D===0?1:D);l++){const y=l*(u+1),C=o==="right"?a:H(a).add(y).toNumber(),S=o==="right"?H(d).add(y).toNumber():d,[k,j]=p(t[0],"year",l,x),G=b(i,C,S);G.custom={...Y,startTime:k,endTime:j}}break}case"hour":{if(!o){const f=T?t[0]:t[0]??m,[l,y]=p(f,"hour",1,1),C=b(i,a,d);C.custom={...Y,startTime:l,endTime:y};break}D=O(t[0],t[1],"hour");for(let f=0;f<Math.abs(D===0?1:D);f++){const l=f*(u+1),y=o==="right"?a:H(a).add(l).toNumber(),C=o==="right"?H(d).add(l).toNumber():d,S=b(i,y,C);if(T){const J=c(t[0]).add(1,"hour").format("YYYY-MM-DD HH:mm:ss"),[de,he]=p(J,"hour",f,x);S.custom={...Y,startTime:de,endTime:he};continue}const k=c(m).add(1,"hour").format("YYYY-MM-DD HH:mm:ss"),[j,G]=p(k,"hour",f,x);S.custom={...Y,startTime:j,endTime:G}}break}}}return i},{});return Promise.resolve(s)}function ce(e){return Object.entries(e).reduce((n,[t,m])=>{const s=Math.max(...Object.keys(m).map(Number));return s>n?n=Number(s):n=Number(n)||0,n},0)}function me(e,r){const n=JSON.parse(JSON.stringify(e||{}));for(const[t,m]of Object.entries(r)){n[t]||(n[t]={});for(const[s,i]of Object.entries(m)){const v=i,a=n[t]?.[s];a?n[t][s]={...a,...v,custom:{...a.custom,...v.custom||{}}}:n[t][s]=v}}return n}const le="./style.css";g.CycleTypeEnum=_,g.ModeEnum=K,g.decimal=H,g.filterIndicatorsCell=ie,g.generateIndicatorsCells=fe,g.generateUUID=z,g.getNumColumns=ce,g.handleClearInput=L,g.initDateRange=ae,g.mergeCellData=me,g.stylePath=le,g.useData=Q,Object.defineProperty(g,Symbol.toStringTag,{value:"Module"})}));
+(function(b,f){typeof exports=="object"&&typeof module<"u"?f(exports,require("dayjs"),require("@univerjs/presets"),require("decimal.js")):typeof define=="function"&&define.amd?define(["exports","dayjs","@univerjs/presets","decimal.js"],f):(b=typeof globalThis<"u"?globalThis:b||self,f(b.TorUniverSheet={},b.dayjs,b.presets,b.Decimal))})(this,(function(b,f,U,J){"use strict";const L=(e,r)=>{for(const n of r)e[n]=null},z=()=>{if(typeof crypto=="object"){if(typeof crypto.randomUUID=="function")return crypto.randomUUID();if(typeof crypto.getRandomValues=="function"&&typeof Uint8Array=="function"){const n=t=>{const c=Number(t);return(c^crypto.getRandomValues(new Uint8Array(1))[0]&15>>c/4).toString(16)};return"10000000-1000-4000-8000-100000000000".replace(/[018]/g,n)}}let e=new Date().getTime(),r=typeof performance<"u"&&performance.now&&performance.now()*1e3||0;return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=Math.random()*16;return e>0?(t=(e+t)%16|0,e=Math.floor(e/16)):(t=(r+t)%16|0,r=Math.floor(r/16)),(n==="x"?t:t&3|8).toString(16)})};function Q(e){return{...e?.workbookData,id:e?.id||z(),name:e?.name||"未命名",appVersion:e?.appVersion||"1.0.0"}}const W=Object.prototype.toString,Z=(e,r)=>W.call(e)===`[object ${r}]`,X=e=>typeof e<"u",ee=e=>!X(e),te=e=>e!==null&&Z(e,"Object"),E=e=>e==null||typeof e>"u"?!0:A(e)||oe(e)?e.length===0:e instanceof Map||e instanceof Set?e.size===0:te(e)?Object.keys(e).length===0:!1,re=e=>e===null,ne=e=>ee(e)||re(e),oe=e=>Z(e,"String"),A=e=>e&&Array.isArray(e);class se{value;constructor(r){this.value=new J(r)}add(r){return this.value=this.value.add(r||0),this}subtract(r){return this.value=this.value.sub(r||0),this}multiply(r){return this.value=this.value.mul(r||0),this}divide(r){const n=new J(r);if(n.isZero())throw new Error("除数是0");return this.value=this.value.div(n),this}toFixed(r,n){return this.value=new J(this.value.toFixed(r,n)),this}valueOf(){return this.value}toString(){return this.value.toString()}toNumber(){return this.value.toNumber()}}function H(e=0){return new se(e)}var _=(e=>(e.无="no",e.年="year",e.月="month",e.周="week",e.天="day",e.班组="shift",e.小时="hour",e.半小时="half_hour",e))(_||{}),K=(e=>(e.view="view",e.edit="edit",e))(K||{});async function ae(e,r){if(!r)return Promise.reject("日期不能为空");switch(e){case"year":if(A(r))return Promise.resolve(r);const n=f(r);if(!n.isValid())return Promise.reject("无效的日期格式");const t=n.year(),c=`${t}-01`,o=`${t}-12`;return Promise.resolve([c,o]);case"month":if(A(r))return Promise.resolve(r);const i=f(r);if(!i.isValid())return Promise.reject("无效的日期格式");const N=i.startOf("month").format("YYYY-MM-DD"),s=i.endOf("month").format("YYYY-MM-DD");return Promise.resolve([N,s]);case"day":if(A(r))return Promise.resolve(r);const w=f(r);if(!w.isValid())return Promise.reject("无效的日期格式");const m=w.startOf("day").format("YYYY-MM-DD HH:mm:ss"),k=w.endOf("day").format("YYYY-MM-DD HH:mm:ss");return Promise.resolve([m,k]);default:return Promise.reject("不支持的周期类型")}}function O(e,r,n){if(!n)return 0;const t={year:"YYYY",month:"YYYY-MM",day:"YYYY-MM-DD",hour:"HH:mm:ss"}[n];return["day","hour"].includes(n)?f(r,t).diff(f(e,t),n)+1:f(r,t).diff(f(e,t),n)}function B(e,r,n){if(!n)throw new Error("日期类型不能为空");const t={year:"YYYY",month:"YYYY-MM",day:"YYYY-MM-DD",hour:"HH:mm:ss"}[n];return f(e).subtract(r,n).format(t)}function v(e,r,n,t){const c="YYYY-MM-DD HH:mm:ss",o=q(e,r,n,t),i=f(o);if(r==="month"){const s=i.month();return s===0?[i.startOf("month").format(c),i.date(25).endOf("day").format(c)]:s===11?[i.subtract(1,"month").date(26).startOf("day").format(c),i.endOf("month").format(c)]:[i.subtract(1,"month").date(26).startOf("day").format(c),i.date(25).endOf("day").format(c)]}const N={year:"year",day:"day",hour:"hour"};return[i.startOf(N[r]).format(c),i.endOf(N[r]).format(c)]}function q(e,r,n,t){const c={year:"YYYY",month:"YYYY-MM",day:"YYYY-MM-DD",hour:"YYYY-MM-DD HH:mm:ss"}[r];return f(e,c).add(n*t,r).format(c)}function M(e,r,n){return e[r]||(e[r]={}),e[r][n]||(e[r][n]={}),e[r][n]}async function ie(e){if(!e)throw new Error("cellData is required");const r=Object.entries(e).reduce((n,t)=>{const[c,o]=t;for(const[i,N]of Object.entries(o)){const{custom:s,v:w,t:m,s:k}=N;if(!s)continue;const{cellType:d}=s;if(d==="indicator"){const P=M(n,c,i);P.custom={...s,required:E(s?.required)?!1:s?.required,defaultShift:E(s?.defaultShift)?!1:s?.defaultShift,forwardPush:E(s?.forwardPush)?!1:s?.forwardPush,forwardPushTimes:E(s?.useDefaultEndDate)?0:s?.forwardPushTimes,useDefaultEndDate:E(s?.useDefaultEndDate)?!1:s?.useDefaultEndDate},P.s=k,P.t=m,P.v=w}}return n},{});return!r||E(r)?Promise.reject(new Error("No data found")):Promise.resolve(r)}function F(e,r){return e.replace(/\$\{([^}]+)\}/g,(n,t)=>{try{const c=Object.keys(r),o=Object.values(r);return new Function(...c,`return ${t};`)(...o)}catch(c){return console.error(`表达式执行失败: ${t}`,c),n}})}function ue({acc:e,params:r,initRowNum:n,initColNum:t,cellData:c}){const{rangeData:o,currentDay:i,extraArgs:N}=r;N?.teamData;const{cycleType:s,timeIncrement:w,forwardPush:m,forwardPushTimes:k,copyType:d,copyInterval:P,defaultShift:j,templateStr:C,useDefaultEndDate:R}=c.custom;let T=0;switch(s){case"day":{let a="";if(m&&(a=B(o[0],k,"day")),!d){let u="";m?u=a:u=o[0];const g=M(e,n,t);g.v=C?F(C,{businessDate:u,dayjs:f}):f(u).format("YYYY-MM-DD"),g.t=U.CellValueType.STRING;break}m?T=O(a,o[0],"day"):T=O(o[0],o[1],"day");for(let u=0;u<=Math.abs(T===0?1:T);u++){const g=u*(P+1);let p="";m?p=q(a,"day",u,w):p=q(o[0],"day",u,w);const h=d==="right"?n:n+g,y=d==="right"?t+g:t,l=M(e,h,y);l.v=C?F(C,{businessDate:p,dayjs:f}):f(p).format("YYYY-MM-DD"),l.t=U.CellValueType.STRING}break}case"month":{if(!d){const[a,u]=v(o[1],"month",0,1),g=M(e,n,t);g.v=f(u).format("YYYY-MM"),g.t=U.CellValueType.STRING;break}T=O(o[0],o[1],"month");for(let a=0;a<=Math.abs(T===0?1:T);a++){const u=a*(P+1),g=d==="right"?n:n+u,p=d==="right"?t+u:t,h=M(e,g,p);h.v=q(o[0],"month",a,w),h.t=U.CellValueType.STRING}break}case"year":{let a="";if(m&&(a=B(o[0],k||0,"year")),!d){const u=m?a:o[0],[g,p]=v(u,"year",0,1),h=M(e,n,t),[,y]=v(o[1],"month",0,1);h.v=C?F(C,{startTime:g,endTime:p,rangeData:o,dayjs:f}):u,h.t=U.CellValueType.STRING;break}m?T=O(a,o[0],"year"):T=O(o[0],o[1],"year");for(let u=0;u<=Math.abs(T===0?1:T);u++){const g=u*(P+1),p=d==="right"?n:n+g,h=d==="right"?t+g:t,[y,l]=v(o[0],"year",u,w),D=M(e,p,h),Y=q(o[0],"year",u,w);D.v=C?F(C,{startTime:y,endTime:l,rangeData:o,dayjs:f}):Y,D.t=U.CellValueType.STRING}break}case"hour":{if(!d){const a=M(e,n,t);if(a.t=U.CellValueType.STRING,j){a.v=f(o[0]).add(1,"hour").format("YYYY-MM-DD HH:mm:ss");break}a.v=f(i).add(1,"hour").format("YYYY-MM-DD HH:mm:ss");break}T=O(o[0],o[1],"hour");for(let a=0;a<Math.abs(T===0?1:T);a++){const u=a*(P+1),g=d==="right"?n:n+u,p=d==="right"?t+u:t,h=M(e,g,p);if(h.t=U.CellValueType.STRING,j){const y=f(o[0]).add(1,"hour").format("YYYY-MM-DD HH:mm:ss");h.v=q(y,"hour",a,w);continue}h.v=q(f(i).add(1,"hour").format("YYYY-MM-DD HH:mm:ss"),"hour",a,w)}}}}async function ce(e,r){if(!e)return Promise.reject("没有可用的单元格数据");const{extraArgs:n,rangeData:t}=r;if(!t.length)return Promise.reject("处理时间范围失败, rangeData不能为空");n?.teamData;const c=r?.currentDay||f().format("YYYY-MM-DD"),o=Object.entries(e).reduce((i,N)=>{const[s,w]=N;for(const[m,k]of Object.entries(w)){const{custom:d}=k;if(!d)continue;const{cellType:P,cycleType:j,timeIncrement:C,forwardPush:R,forwardPushTimes:T,copyType:a,copyInterval:u,defaultShift:g,useDefaultEndDate:p}=d;if(P==="time"){ue({acc:i,params:r,initRowNum:Number(s),initColNum:Number(m),cellData:k});continue}const h={cycleType:j,indicatorName:d.indicatorName,indicatorCode:d.indicatorCode,indicatorId:d.indicatorId,indicatorDimensionName:d.indicatorDimensionName,indicatorDimensionConfig:d.indicatorDimensionConfig,required:ne(d?.required)??!1,cellType:d.cellType,defaultShift:d?.defaultShift||!1};let y=0;switch(j){case"day":{let l="";if(R&&(l=B(t[0],T||0,"day")),!a){const D=R?l:t[0],[Y,x]=v(D,"day",0,1),S=M(i,s,m);S.custom={...h,startTime:Y,endTime:x};break}R?y=O(l,t[0],"day"):y=O(t[0],t[1],"day");for(let D=0;D<Math.abs(y===0?1:y);D++){const Y=D*(u+1),x=R?l:t[0],[S,I]=v(x,"day",D,C),V=a==="right"?s:H(s).add(Y).toNumber(),G=a==="right"?H(m).add(Y).toNumber():m,$=M(i,V,G);$.custom={...h,startTime:S,endTime:I}}break}case"month":{if(!a){const[l,D]=v(t[1],"month",0,1),Y=M(i,s,m);Y.custom={...h,startTime:l,endTime:D};break}y=O(t[0],t[1],"month");for(let l=0;l<=Math.abs(y===0?1:y);l++){const D=l*(u+1),Y=a==="right"?s:H(s).add(D).toNumber(),x=a==="right"?H(m).add(D).toNumber():m,[S,I]=v(t[0],"month",l,C),V=M(i,Y,x);V.custom={...h,startTime:S,endTime:I}}break}case"year":{let l="",D="";if(R){l=B(t[0],T||0,"year");const Y=f(t[1]).format("MM");D=f(`${l}-${Y+1}`).format("YYYY-MM")}if(!a){const Y=R?l:t[0],[x,S]=v(Y,"year",0,1),I=M(i,s,m),[,V]=v(D,"month",0,1);I.custom={...h,startTime:x,endTime:p?V:S};break}R?y=O(l,t[0],"year"):y=O(t[0],t[1],"year");for(let Y=0;Y<Math.abs(y===0?1:y);Y++){const x=Y*(u+1),S=a==="right"?s:H(s).add(x).toNumber(),I=a==="right"?H(m).add(x).toNumber():m,[V,G]=v(t[0],"year",Y,C),$=M(i,S,I);$.custom={...h,startTime:V,endTime:G}}break}case"hour":{if(!a){const l=g?t[0]:t[0]??c,[D,Y]=v(l,"hour",1,1),x=M(i,s,m);x.custom={...h,startTime:D,endTime:Y};break}y=O(t[0],t[1],"hour");for(let l=0;l<Math.abs(y===0?1:y);l++){const D=l*(u+1),Y=a==="right"?s:H(s).add(D).toNumber(),x=a==="right"?H(m).add(D).toNumber():m,S=M(i,Y,x);if(g){const $=f(t[0]).add(1,"hour").format("YYYY-MM-DD HH:mm:ss"),[de,he]=v($,"hour",l,C);S.custom={...h,startTime:de,endTime:he};continue}const I=f(c).add(1,"hour").format("YYYY-MM-DD HH:mm:ss"),[V,G]=v(I,"hour",l,C);S.custom={...h,startTime:V,endTime:G}}break}}}return i},{});return Promise.resolve(o)}function fe(e){return Object.entries(e).reduce((n,[t,c])=>{const o=Math.max(...Object.keys(c).map(Number));return o>n?n=Number(o):n=Number(n)||0,n},0)}function le(e,r){const n=JSON.parse(JSON.stringify(e||{}));for(const[t,c]of Object.entries(r)){n[t]||(n[t]={});for(const[o,i]of Object.entries(c)){const N=i,s=n[t]?.[o];s?n[t][o]={...s,...N,custom:{...s.custom,...N.custom||{}}}:n[t][o]=N}}return n}const me="./style.css";b.CycleTypeEnum=_,b.ModeEnum=K,b.decimal=H,b.filterIndicatorsCell=ie,b.generateIndicatorsCells=ce,b.generateUUID=z,b.getNumColumns=fe,b.handleClearInput=L,b.initDateRange=ae,b.mergeCellData=le,b.stylePath=me,b.useData=Q,Object.defineProperty(b,Symbol.toStringTag,{value:"Module"})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-univer-sheet",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "style": "./dist/style.css",
   "description": "基于 Univer 的 Vue3 电子表格组件",
   "author": "tortormore",