tor-univer-sheet 1.1.16 → 1.1.18

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

@@ -1,25 +1,25 @@
-import l from "dayjs";
+import d from "dayjs";
 import { CellValueType as $ } from "@univerjs/presets";
-import K from "decimal.js";
-const dt = (t, o) => {
-  for (const r of o)
-    t[r] = null;
+import Z from "decimal.js";
+const dt = (t, r) => {
+  for (const o of r)
+    t[o] = null;
 }, W = () => {
   if (typeof crypto == "object") {
     if (typeof crypto.randomUUID == "function")
       return crypto.randomUUID();
     if (typeof crypto.getRandomValues == "function" && typeof Uint8Array == "function") {
-      const r = (e) => {
-        const f = Number(e);
-        return (f ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> f / 4).toString(16);
+      const o = (e) => {
+        const i = Number(e);
+        return (i ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> i / 4).toString(16);
       };
-      return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, r);
+      return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, o);
     }
   }
-  let t = (/* @__PURE__ */ new Date()).getTime(), o = typeof performance < "u" && performance.now && performance.now() * 1e3 || 0;
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (r) => {
+  let t = (/* @__PURE__ */ new Date()).getTime(), r = typeof performance < "u" && performance.now && performance.now() * 1e3 || 0;
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (o) => {
     let e = Math.random() * 16;
-    return t > 0 ? (e = (t + e) % 16 | 0, t = Math.floor(t / 16)) : (e = (o + e) % 16 | 0, o = Math.floor(o / 16)), (r === "x" ? e : e & 3 | 8).toString(16);
+    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 ht(t) {
@@ -30,35 +30,35 @@ function ht(t) {
     appVersion: t?.appVersion || "1.0.0"
   };
 }
-const X = Object.prototype.toString, L = (t, o) => X.call(t) === `[object ${o}]`, tt = (t) => typeof t < "u", et = (t) => !tt(t), rt = (t) => t !== null && L(t, "Object"), E = (t) => t == null || typeof t > "u" ? !0 : J(t) || st(t) ? t.length === 0 : t instanceof Map || t instanceof Set ? t.size === 0 : rt(t) ? Object.keys(t).length === 0 : !1, ot = (t) => t === null, nt = (t) => et(t) || ot(t), st = (t) => L(t, "String"), J = (t) => t && Array.isArray(t);
+const X = Object.prototype.toString, _ = (t, r) => X.call(t) === `[object ${r}]`, tt = (t) => typeof t < "u", et = (t) => !tt(t), rt = (t) => t !== null && _(t, "Object"), E = (t) => t == null || typeof t > "u" ? !0 : J(t) || st(t) ? t.length === 0 : t instanceof Map || t instanceof Set ? t.size === 0 : rt(t) ? Object.keys(t).length === 0 : !1, ot = (t) => t === null, nt = (t) => et(t) || ot(t), st = (t) => _(t, "String"), J = (t) => t && Array.isArray(t);
 class at {
   value;
-  constructor(o) {
-    this.value = new K(o);
+  constructor(r) {
+    this.value = new Z(r);
   }
   /**
    * 加法运算
    * @param num 要加的数
    * @returns DecimalChain 实例，支持链式调用
    */
-  add(o) {
-    return this.value = this.value.add(o || 0), this;
+  add(r) {
+    return this.value = this.value.add(r || 0), this;
   }
   /**
    * 减法运算
    * @param num 要减的数
    * @returns DecimalChain 实例，支持链式调用
    */
-  subtract(o) {
-    return this.value = this.value.sub(o || 0), this;
+  subtract(r) {
+    return this.value = this.value.sub(r || 0), this;
   }
   /**
    * 乘法运算
    * @param num 要乘的数
    * @returns DecimalChain 实例，支持链式调用
    */
-  multiply(o) {
-    return this.value = this.value.mul(o || 0), this;
+  multiply(r) {
+    return this.value = this.value.mul(r || 0), this;
   }
   /**
    * 除法运算
@@ -66,11 +66,11 @@ class at {
    * @returns DecimalChain 实例，支持链式调用
    * @throws 当除数为0时抛出错误
    */
-  divide(o) {
-    const r = new K(o);
-    if (r.isZero())
+  divide(r) {
+    const o = new Z(r);
+    if (o.isZero())
       throw new Error("除数是0");
-    return this.value = this.value.div(r), this;
+    return this.value = this.value.div(o), this;
   }
   /**
    * 保留小数位数
@@ -78,8 +78,8 @@ class at {
    * @param rounding 舍入模式，默认为四舍五入
    * @returns DecimalChain 实例，支持链式调用
    */
-  toFixed(o, r) {
-    return this.value = new K(this.value.toFixed(o, r)), this;
+  toFixed(r, o) {
+    return this.value = new Z(this.value.toFixed(r, o)), this;
   }
   /**
    * 返回当前值
@@ -103,298 +103,291 @@ class at {
     return this.value.toNumber();
   }
 }
-function C(t = 0) {
+function j(t = 0) {
   return new at(t);
 }
 var it = /* @__PURE__ */ ((t) => (t.无 = "no", t.年 = "year", t.月 = "month", t.周 = "week", t.天 = "day", t.班组 = "shift", t.小时 = "hour", t.半小时 = "half_hour", t))(it || {}), ct = /* @__PURE__ */ ((t) => (t.view = "view", t.edit = "edit", t))(ct || {});
-async function Yt(t, o) {
-  if (!o) return Promise.reject("日期不能为空");
+async function Yt(t, r) {
+  if (!r) return Promise.reject("日期不能为空");
   switch (t) {
     case "year":
-      if (J(o))
-        return Promise.resolve(o);
-      const r = l(o);
-      if (!r.isValid())
+      if (J(r))
+        return Promise.resolve(r);
+      const o = d(r);
+      if (!o.isValid())
         return Promise.reject("无效的日期格式");
-      const e = r.year(), f = `${e}-01`, n = `${e}-12`;
-      return Promise.resolve([f, n]);
+      const e = o.year(), i = `${e}-01`, n = `${e}-12`;
+      return Promise.resolve([i, n]);
     case "month":
-      if (J(o))
-        return Promise.resolve(o);
-      const h = l(o);
+      if (J(r))
+        return Promise.resolve(r);
+      const h = d(r);
       if (!h.isValid())
         return Promise.reject("无效的日期格式");
-      const k = h.startOf("month").format("YYYY-MM-DD"), c = h.endOf("month").format("YYYY-MM-DD");
-      return Promise.resolve([k, c]);
+      const M = h.startOf("month").format("YYYY-MM-DD"), a = h.endOf("month").format("YYYY-MM-DD");
+      return Promise.resolve([M, a]);
     case "day":
-      if (J(o))
-        return Promise.resolve(o);
-      const Y = l(o);
+      if (J(r))
+        return Promise.resolve(r);
+      const Y = d(r);
       if (!Y.isValid())
         return Promise.reject("无效的日期格式");
-      const p = Y.startOf("day").format("YYYY-MM-DD HH:mm:ss"), d = Y.endOf("day").format("YYYY-MM-DD HH:mm:ss");
-      return Promise.resolve([p, d]);
+      const D = Y.startOf("day").format("YYYY-MM-DD HH:mm:ss"), m = Y.endOf("day").format("YYYY-MM-DD HH:mm:ss");
+      return Promise.resolve([D, m]);
     default:
       return Promise.reject("不支持的周期类型");
   }
 }
-function H(t, o, r) {
-  if (!r) return 0;
-  const e = {
-    year: "YYYY",
-    month: "YYYY-MM",
-    day: "YYYY-MM-DD",
-    hour: "HH:mm:ss"
-  }[r];
-  return ["day", "hour"].includes(r) ? l(o, e).diff(l(t, e), r) : l(o, e).diff(l(t, e), r);
+function H(t, r, o) {
+  return o ? d(r).diff(d(t), o) : 0;
 }
-function z(t, o, r) {
-  if (!r)
+function K(t, r, o) {
+  if (!o)
     throw new Error("日期类型不能为空");
   const e = {
     year: "YYYY",
     month: "YYYY-MM",
     day: "YYYY-MM-DD",
     hour: "HH:mm:ss"
-  }[r];
-  return l(t).subtract(o, r).format(e);
+  }[o];
+  return d(t).subtract(r, o).format(e);
 }
-function S(t, o, r, e) {
-  const f = "YYYY-MM-DD HH:mm:ss", n = A(t, o, r, e), h = l(n);
-  if (o === "month") {
-    const c = h.month();
-    return c === 0 ? [h.startOf("month").format(f), h.date(25).endOf("day").format(f)] : c === 11 ? [h.subtract(1, "month").date(26).startOf("day").format(f), h.endOf("month").format(f)] : [h.subtract(1, "month").date(26).startOf("day").format(f), h.date(25).endOf("day").format(f)];
+function S(t, r, o, e) {
+  const i = "YYYY-MM-DD HH:mm:ss", n = A(t, r, o, e), h = d(n);
+  if (r === "month") {
+    const a = h.month();
+    return a === 0 ? [h.startOf("month").format(i), h.date(25).endOf("day").format(i)] : a === 11 ? [h.subtract(1, "month").date(26).startOf("day").format(i), h.endOf("month").format(i)] : [h.subtract(1, "month").date(26).startOf("day").format(i), h.date(25).endOf("day").format(i)];
   }
-  const k = { year: "year", day: "day", hour: "hour" };
-  return [h.startOf(k[o]).format(f), h.endOf(k[o]).format(f)];
+  const M = { year: "year", day: "day", hour: "hour" };
+  return [h.startOf(M[r]).format(i), h.endOf(M[r]).format(i)];
 }
-function A(t, o, r, e) {
-  const f = {
+function A(t, r, o, e) {
+  const i = {
     year: "YYYY",
     month: "YYYY-MM",
     day: "YYYY-MM-DD",
     hour: "YYYY-MM-DD HH:mm:ss"
-  }[o];
-  return l(t, f).add(r * e, o).format(f);
+  }[r];
+  return d(t, i).add(o * e, r).format(i);
 }
-function g(t, o, r) {
-  return t[o] || (t[o] = {}), t[o][r] || (t[o][r] = {}), t[o][r];
+function w(t, r, o) {
+  return t[r] || (t[r] = {}), t[r][o] || (t[r][o] = {}), t[r][o];
 }
 async function Dt(t) {
   if (!t)
     throw new Error("cellData is required");
-  const o = Object.entries(t).reduce((r, e) => {
-    const [f, n] = e;
-    for (const [h, k] of Object.entries(n)) {
-      const { custom: c, v: Y, t: p, s: d } = k;
-      if (!c) continue;
-      const { cellType: q } = c, i = !c.hasOwnProperty("writeBack") || E(c?.writeBack) ? !0 : c.writeBack;
+  const r = Object.entries(t).reduce((o, e) => {
+    const [i, n] = e;
+    for (const [h, M] of Object.entries(n)) {
+      const { custom: a, v: Y, t: D, s: m } = M;
+      if (!a) continue;
+      const { cellType: q } = a, u = !a.hasOwnProperty("writeBack") || E(a?.writeBack) ? !0 : a.writeBack;
       if (q === "indicator") {
-        const j = g(r, f, h);
-        j.custom = {
-          ...c,
-          required: E(c?.required) ? !1 : c?.required,
-          defaultShift: E(c?.defaultShift) ? !1 : c?.defaultShift,
-          forwardPush: E(c?.forwardPush) ? !1 : c?.forwardPush,
-          forwardPushTimes: E(c?.useDefaultEndDate) ? 0 : c?.forwardPushTimes,
-          useDefaultEndDate: E(c?.useDefaultEndDate) ? !1 : c?.useDefaultEndDate,
-          copyType: E(c?.copyType) ? "" : c?.copyType,
-          writeBack: i
-        }, j.s = d, j.t = p, j.v = Y;
+        const P = w(o, i, h);
+        P.custom = {
+          ...a,
+          required: E(a?.required) ? !1 : a?.required,
+          defaultShift: E(a?.defaultShift) ? !1 : a?.defaultShift,
+          forwardPush: E(a?.forwardPush) ? !1 : a?.forwardPush,
+          forwardPushTimes: E(a?.useDefaultEndDate) ? 0 : a?.forwardPushTimes,
+          useDefaultEndDate: E(a?.useDefaultEndDate) ? !1 : a?.useDefaultEndDate,
+          copyType: E(a?.copyType) ? "" : a?.copyType,
+          writeBack: u
+        }, P.s = m, P.t = D, P.v = Y || "";
       }
     }
-    return r;
+    return o;
   }, {});
-  return !o || E(o) ? Promise.reject(new Error("No data found")) : Promise.resolve(o);
+  return !r || E(r) ? Promise.reject(new Error("No data found")) : Promise.resolve(r);
 }
-function F(t, o) {
-  return t.replace(/\$\{([^}]+)\}/g, (r, e) => {
+function F(t, r) {
+  return t.replace(/\$\{([^}]+)\}/g, (o, e) => {
     try {
-      const f = Object.keys(o), n = Object.values(o);
-      return new Function(...f, `return ${e};`)(...n);
-    } catch (f) {
-      return console.error(`表达式执行失败: ${e}`, f), r;
+      const i = Object.keys(r), n = Object.values(r);
+      return new Function(...i, `return ${e};`)(...n);
+    } catch (i) {
+      return console.error(`表达式执行失败: ${e}`, i), o;
     }
   });
 }
 function ut({
   acc: t,
-  params: o,
-  initRowNum: r,
+  params: r,
+  initRowNum: o,
   initColNum: e,
-  cellData: f
+  cellData: i
 }) {
-  const { rangeData: n, currentDay: h, extraArgs: k } = o, c = k?.teamData || {}, { cycleType: Y, timeIncrement: p, forwardPush: d, forwardPushTimes: q, copyType: i, copyInterval: j, defaultShift: O, templateStr: P, useDefaultEndDate: Z } = f.custom;
-  let y = 0;
+  const { rangeData: n, currentDay: h, extraArgs: M } = r, a = M?.teamData || {}, { cycleType: Y, timeIncrement: D, forwardPush: m, forwardPushTimes: q, copyType: u, copyInterval: P, defaultShift: O, templateStr: C, useDefaultEndDate: L } = i.custom;
+  let g = 0;
   switch (Y) {
     case "day": {
       let s = "";
-      if (d && (s = z(
+      if (m && (s = K(
         n[0],
         q,
         "day"
         /* day */
-      )), !i) {
-        let u = "";
-        d ? u = s : u = n[0];
-        const a = g(t, r, e);
-        a.v = P ? F(P, { businessDate: u, dayjs: l }) : l(u).format("YYYY-MM-DD"), a.t = $.STRING;
+      )), !u) {
+        let f = "";
+        m ? f = s : f = n[0];
+        const c = w(t, o, e);
+        c.v = C ? F(C, { businessDate: f, dayjs: d }) : d(f).format("YYYY-MM-DD"), c.t = $.STRING;
         break;
       }
-      d ? y = H(
+      m ? g = H(
         s,
         n[0],
         "day"
         /* day */
-      ) : (y = H(
+      ) : (g = H(
         n[0],
         n[1],
         "day"
         /* day */
-      ), console.log("copyNum", y));
-      for (let u = 0; u <= Math.abs(y === 0 ? 1 : y); u++) {
-        const a = u * (j + 1);
-        let M = "";
-        d ? M = A(s, "day", u, p) : M = A(n[0], "day", u, p);
-        const w = i === "right" ? r : r + a, R = i === "right" ? e + a : e, G = g(t, w, R);
-        G.v = P ? F(P, { businessDate: M, dayjs: l }) : l(M).format("YYYY-MM-DD"), G.t = $.STRING;
+      ), console.log("copyNum", g));
+      for (let f = 0; f <= Math.abs(g === 0 ? 1 : g); f++) {
+        const c = f * (P + 1);
+        let T = "";
+        m ? T = A(s, "day", f, D) : T = A(n[0], "day", f, D);
+        const p = u === "right" ? o : o + c, B = u === "right" ? e + c : e, G = w(t, p, B);
+        G.v = C ? F(C, { businessDate: T, dayjs: d }) : d(T).format("YYYY-MM-DD"), G.t = $.STRING;
       }
       break;
     }
     case "month": {
-      if (!i) {
-        const [s, u] = S(n[1], "month", 0, 1), a = g(t, r, e);
-        a.v = l(u).format("YYYY-MM"), a.t = $.STRING;
+      if (!u) {
+        const [s, f] = S(n[1], "month", 0, 1), c = w(t, o, e);
+        c.v = d(f).format("YYYY-MM"), c.t = $.STRING;
         break;
       }
-      y = H(
+      g = H(
         n[0],
         n[1],
         "month"
         /* month */
       );
-      for (let s = 0; s <= Math.abs(y === 0 ? 1 : y); s++) {
-        const u = s * (j + 1), a = i === "right" ? r : r + u, M = i === "right" ? e + u : e, w = g(t, a, M);
-        w.v = A(n[0], "month", s, p), w.t = $.STRING;
+      for (let s = 0; s <= Math.abs(g === 0 ? 1 : g); s++) {
+        const f = s * (P + 1), c = u === "right" ? o : o + f, T = u === "right" ? e + f : e, p = w(t, c, T);
+        p.v = A(n[0], "month", s, D), p.t = $.STRING;
       }
       break;
     }
     case "year": {
       let s = "";
-      if (d && (s = z(
+      if (m && (s = K(
         n[0],
         q || 0,
         "year"
         /* year */
-      )), !i) {
-        const u = d ? s : n[0], [a, M] = S(u, "year", 0, 1), w = g(t, r, e), [, R] = S(n[1], "month", 0, 1);
-        w.v = P ? F(P, {
-          startTime: a,
-          endTime: M,
+      )), !u) {
+        const f = m ? s : n[0], [c, T] = S(f, "year", 0, 1), p = w(t, o, e), [, B] = S(n[1], "month", 0, 1);
+        p.v = C ? F(C, {
+          startTime: c,
+          endTime: T,
           rangeData: n,
-          dayjs: l
-        }) : u, w.t = $.STRING;
+          dayjs: d
+        }) : f, p.t = $.STRING;
         break;
       }
-      d ? y = H(
+      m ? g = H(
         s,
         n[0],
         "year"
         /* year */
-      ) : y = H(
+      ) : g = H(
         n[0],
         n[1],
         "year"
         /* year */
       );
-      for (let u = 0; u <= Math.abs(y === 0 ? 1 : y); u++) {
-        const a = u * (j + 1), M = i === "right" ? r : r + a, w = i === "right" ? e + a : e, [R, G] = S(n[0], "year", u, p), x = g(t, M, w), N = A(n[0], "year", u, p);
-        x.v = P ? F(P, {
-          startTime: R,
+      for (let f = 0; f <= Math.abs(g === 0 ? 1 : g); f++) {
+        const c = f * (P + 1), T = u === "right" ? o : o + c, p = u === "right" ? e + c : e, [B, G] = S(n[0], "year", f, D), N = w(t, T, p), v = A(n[0], "year", f, D);
+        N.v = C ? F(C, {
+          startTime: B,
           endTime: G,
           rangeData: n,
-          dayjs: l
-        }) : N, x.t = $.STRING;
+          dayjs: d
+        }) : v, N.t = $.STRING;
       }
       break;
     }
     case "hour": {
-      if (!i) {
-        const s = g(t, r, e);
+      if (!u) {
+        const s = w(t, o, e);
         if (s.t = $.STRING, O) {
-          s.v = l(n[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
+          s.v = d(n[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
           break;
         }
-        s.v = l(h).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
+        s.v = d(h).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
         break;
       }
-      y = H(
+      g = H(
         n[0],
         n[1],
         "hour"
         /* hour */
       );
-      for (let s = 0; s <= Math.abs(y === 0 ? 1 : y); s++) {
-        const u = s * (j + 1), a = i === "right" ? r : r + u, M = i === "right" ? e + u : e, w = g(t, a, M);
-        if (w.t = $.STRING, O) {
-          const R = l(n[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
-          w.v = A(R, "hour", s, p);
+      for (let s = 0; s <= Math.abs(g === 0 ? 1 : g); s++) {
+        const f = s * (P + 1), c = u === "right" ? o : o + f, T = u === "right" ? e + f : e, p = w(t, c, T);
+        if (p.t = $.STRING, O) {
+          const B = d(n[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss");
+          p.v = A(B, "hour", s, D);
           continue;
         }
-        w.v = A(l(h).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), "hour", s, p);
+        p.v = A(d(h).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), "hour", s, D);
       }
       break;
     }
     case "shift": {
-      if (!i) {
-        const s = g(t, r, e);
-        s.t = $.STRING, s.v = P ? F(P, {
+      if (!u) {
+        const s = w(t, o, e);
+        s.t = $.STRING, s.v = C ? F(C, {
           rangeData: n,
-          dayjs: l
+          dayjs: d
         }) : n[0];
         break;
       }
-      if (!c.length)
+      if (!a.length)
         throw new Error("没有获取到当班数据");
-      for (let s = 0; s < c.length; s++) {
-        const u = c[s], { startDatetime: a, endDatetime: M } = u, w = s * (j + 1), R = i === "right" ? r : C(r).add(w).toNumber(), G = i === "right" ? C(e).add(w).toNumber() : e, x = g(t, R, G);
-        x.v = P ? F(P, {
-          team: u
-        }) : a;
+      for (let s = 0; s < a.length; s++) {
+        const f = a[s], { startDatetime: c, endDatetime: T } = f, p = s * (P + 1), B = u === "right" ? o : j(o).add(p).toNumber(), G = u === "right" ? j(e).add(p).toNumber() : e, N = w(t, B, G);
+        N.v = C ? F(C, {
+          team: f
+        }) : c;
       }
       break;
     }
   }
 }
-async function yt(t, o) {
+async function yt(t, r) {
   if (!t)
     return Promise.reject("没有可用的单元格数据");
-  const { extraArgs: r, rangeData: e } = o;
+  const { extraArgs: o, rangeData: e } = r;
   if (!e.length)
     return Promise.reject("处理时间范围失败, rangeData不能为空");
-  const f = r?.teamData || [], { periodicityTime: n } = o, h = o?.currentDay || l().format("YYYY-MM-DD"), k = (Y, p) => n ? parseInt(n.split(":")[0], 10) < 12 ? [l(Y).format("YYYY-MM-DD") + " " + n, l(p).add(1, "day").format("YYYY-MM-DD") + " " + n] : [l(Y).subtract(1, "day").format("YYYY-MM-DD") + " " + n, l(p).format("YYYY-MM-DD") + " " + n] : [Y, p], c = Object.entries(t).reduce((Y, p) => {
-    const [d, q] = p;
-    for (const [i, j] of Object.entries(q)) {
-      const { custom: O } = j;
+  const i = o?.teamData || [], { periodicityTime: n } = r, h = r?.currentDay || d().format("YYYY-MM-DD"), M = (Y, D) => n ? parseInt(n.split(":")[0], 10) < 12 ? [d(Y).format("YYYY-MM-DD") + " " + n, d(D).add(1, "day").format("YYYY-MM-DD") + " " + n] : [d(Y).subtract(1, "day").format("YYYY-MM-DD") + " " + n, d(D).format("YYYY-MM-DD") + " " + n] : [Y, D], a = Object.entries(t).reduce((Y, D) => {
+    const [m, q] = D;
+    for (const [u, P] of Object.entries(q)) {
+      const { custom: O } = P;
       if (!O) continue;
       const {
-        cellType: P,
-        cycleType: Z,
-        timeIncrement: y,
+        cellType: C,
+        cycleType: L,
+        timeIncrement: g,
         forwardPush: s,
-        forwardPushTimes: u,
-        copyType: a,
-        copyInterval: M,
-        defaultShift: w,
-        useDefaultStartDate: R,
+        forwardPushTimes: f,
+        copyType: c,
+        copyInterval: T,
+        defaultShift: p,
+        useDefaultStartDate: B,
         useDefaultEndDate: G
       } = O;
-      if (P === "time") {
-        ut({ acc: Y, params: o, initRowNum: Number(d), initColNum: Number(i), cellData: j });
+      if (C === "time") {
+        ut({ acc: Y, params: r, initRowNum: Number(m), initColNum: Number(u), cellData: P });
         continue;
       }
-      const x = {
-        cycleType: Z,
+      const N = {
+        cycleType: L,
         indicatorName: O.indicatorName,
         indicatorCode: O.indicatorCode,
         indicatorId: O.indicatorId,
@@ -405,107 +398,107 @@ async function yt(t, o) {
         defaultShift: O?.defaultShift || !1,
         writeBack: E(O?.writeBack) ? !0 : O.writeBack
       };
-      let N = 0;
-      switch (Z) {
+      let v = 0;
+      switch (L) {
         case "day": {
-          let m = "";
-          if (s && (m = z(
+          let l = "";
+          if (s && (l = K(
             e[0],
-            u || 0,
+            f || 0,
             "day"
             /* day */
-          )), !a) {
-            const D = s ? m : e[0], [T, b] = k(...S(D, "day", 0, 1)), v = g(Y, d, i);
-            v.custom = {
-              ...x,
-              startTime: T,
+          )), !c) {
+            const y = s ? l : e[0], [x, b] = M(...S(y, "day", 0, 1)), k = w(Y, m, u);
+            k.custom = {
+              ...N,
+              startTime: x,
               endTime: b
             };
             break;
           }
-          s ? N = H(
-            m,
+          s ? v = H(
+            l,
             e[0],
             "day"
             /* day */
-          ) : N = H(
+          ) : v = H(
             e[0],
             e[1],
             "day"
             /* day */
           );
-          for (let D = 0; D <= Math.abs(N === 0 ? 1 : N); D++) {
-            const T = D * (M + 1), b = s ? m : e[0], [v, I] = k(...S(b, "day", D, y)), B = a === "right" ? d : C(d).add(T).toNumber(), U = a === "right" ? C(i).add(T).toNumber() : i, V = g(Y, B, U);
+          for (let y = 0; y <= Math.abs(v === 0 ? 1 : v); y++) {
+            const x = y * (T + 1), b = s ? l : e[0], [k, I] = M(...S(b, "day", y, g)), R = c === "right" ? m : j(m).add(x).toNumber(), U = c === "right" ? j(u).add(x).toNumber() : u, V = w(Y, R, U);
             V.custom = {
-              ...x,
-              startTime: v,
+              ...N,
+              startTime: k,
               endTime: I
             };
           }
           break;
         }
         case "month": {
-          if (!a) {
-            const [m, D] = S(e[1], "month", 0, 1), T = g(Y, d, i);
-            T.custom = {
-              ...x,
-              startTime: m,
-              endTime: D
+          if (!c) {
+            const [l, y] = S(e[1], "month", 0, 1), x = w(Y, m, u);
+            x.custom = {
+              ...N,
+              startTime: l,
+              endTime: y
             };
             break;
           }
-          N = H(
+          v = H(
             e[0],
             e[1],
             "month"
             /* month */
           );
-          for (let m = 0; m <= Math.abs(N === 0 ? 1 : N); m++) {
-            const D = m * (M + 1), T = a === "right" ? d : C(d).add(D).toNumber(), b = a === "right" ? C(i).add(D).toNumber() : i, [v, I] = S(e[0], "month", m, y), B = g(Y, T, b);
-            B.custom = {
-              ...x,
-              startTime: v,
+          for (let l = 0; l <= Math.abs(v === 0 ? 1 : v); l++) {
+            const y = l * (T + 1), x = c === "right" ? m : j(m).add(y).toNumber(), b = c === "right" ? j(u).add(y).toNumber() : u, [k, I] = S(e[0], "month", l, g), R = w(Y, x, b);
+            R.custom = {
+              ...N,
+              startTime: k,
               endTime: I
             };
           }
           break;
         }
         case "year": {
-          let m = "", D = "", T = "";
+          let l = "", y = "", x = "";
           if (s) {
-            m = z(
+            l = K(
               e[0],
-              u || 0,
+              f || 0,
               "year"
               /* year */
             );
-            const b = l(e[1]).format("MM");
-            D = l(`${m}-${b + 1}`).format("YYYY-MM"), T = l(`${m}-${b + 2}`).format("YYYY-MM");
+            const b = d(e[1]).format("MM");
+            y = d(`${l}-${b + 1}`).format("YYYY-MM"), x = d(`${l}-${b + 2}`).format("YYYY-MM");
           }
-          if (!a) {
-            const b = s ? m : e[0], [v, I] = S(b, "year", 0, 1), B = g(Y, d, i), [, U] = S(D, "month", 0, 1), [V] = S(T, "month", 0, 1);
-            B.custom = {
-              ...x,
-              startTime: R ? V : v,
+          if (!c) {
+            const b = s ? l : e[0], [k, I] = S(b, "year", 0, 1), R = w(Y, m, u), [, U] = S(y, "month", 0, 1), [V] = S(x, "month", 0, 1);
+            R.custom = {
+              ...N,
+              startTime: B ? V : k,
               endTime: G ? U : I
             };
             break;
           }
-          s ? N = H(
-            m,
+          s ? v = H(
+            l,
             e[0],
             "year"
             /* year */
-          ) : N = H(
+          ) : v = H(
             e[0],
             e[1],
             "year"
             /* year */
           );
-          for (let b = 0; b <= Math.abs(N === 0 ? 1 : N); b++) {
-            const v = b * (M + 1), I = a === "right" ? d : C(d).add(v).toNumber(), B = a === "right" ? C(i).add(v).toNumber() : i, [U, V] = S(e[0], "year", b, y), _ = g(Y, I, B);
-            _.custom = {
-              ...x,
+          for (let b = 0; b <= Math.abs(v === 0 ? 1 : v); b++) {
+            const k = b * (T + 1), I = c === "right" ? m : j(m).add(k).toNumber(), R = c === "right" ? j(u).add(k).toNumber() : u, [U, V] = S(e[0], "year", b, g), z = w(Y, I, R);
+            z.custom = {
+              ...N,
               startTime: U,
               endTime: V
             };
@@ -513,58 +506,58 @@ async function yt(t, o) {
           break;
         }
         case "hour": {
-          if (!a) {
-            const m = w ? e[0] : e[0] ?? h, [D, T] = S(m, "hour", 1, 1), b = g(Y, d, i);
+          if (!c) {
+            const l = p ? e[0] : e[0] ?? h, [y, x] = S(l, "hour", 1, 1), b = w(Y, m, u);
             b.custom = {
-              ...x,
-              startTime: D,
-              endTime: T
+              ...N,
+              startTime: y,
+              endTime: x
             };
             break;
           }
-          N = H(
+          v = H(
             e[0],
             e[1],
             "hour"
             /* hour */
           );
-          for (let m = 0; m <= Math.abs(N === 0 ? 1 : N); m++) {
-            const D = m * (M + 1), T = a === "right" ? d : C(d).add(D).toNumber(), b = a === "right" ? C(i).add(D).toNumber() : i, v = g(Y, T, b);
-            if (w) {
-              const V = l(e[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [_, Q] = S(V, "hour", m, y);
-              v.custom = {
-                ...x,
-                startTime: _,
+          for (let l = 0; l <= Math.abs(v === 0 ? 1 : v); l++) {
+            const y = l * (T + 1), x = c === "right" ? m : j(m).add(y).toNumber(), b = c === "right" ? j(u).add(y).toNumber() : u, k = w(Y, x, b);
+            if (p) {
+              const V = d(e[0]).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [z, Q] = S(V, "hour", l, g);
+              k.custom = {
+                ...N,
+                startTime: z,
                 endTime: Q
               };
               continue;
             }
-            const I = l(h).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [B, U] = S(I, "hour", m, y);
-            v.custom = {
-              ...x,
-              startTime: B,
+            const I = d(h).add(1, "hour").format("YYYY-MM-DD HH:mm:ss"), [R, U] = S(I, "hour", l, g);
+            k.custom = {
+              ...N,
+              startTime: R,
               endTime: U
             };
           }
           break;
         }
         case "shift": {
-          if (!a) {
-            const [m, D] = e, T = g(Y, d, i);
-            T.custom = {
-              ...x,
-              startTime: m,
-              endTime: D
+          if (!c) {
+            const [l, y] = e, x = w(Y, m, u);
+            x.custom = {
+              ...N,
+              startTime: l,
+              endTime: y
             };
             break;
           }
-          if (!f.length)
+          if (!i.length)
             throw new Error("没有获取到当班数据");
-          for (let m = 0; m < f.length; m++) {
-            const D = f[m], { startDatetime: T, endDatetime: b } = D, v = m * (M + 1), I = a === "right" ? d : C(d).add(v).toNumber(), B = a === "right" ? C(i).add(v).toNumber() : i, U = g(Y, I, B);
+          for (let l = 0; l < i.length; l++) {
+            const y = i[l], { startDatetime: x, endDatetime: b } = y, k = l * (T + 1), I = c === "right" ? m : j(m).add(k).toNumber(), R = c === "right" ? j(u).add(k).toNumber() : u, U = w(Y, I, R);
             U.custom = {
-              ...x,
-              startTime: T,
+              ...N,
+              startTime: x,
               endTime: b
             };
           }
@@ -574,44 +567,66 @@ async function yt(t, o) {
     }
     return Y;
   }, {});
-  return Promise.resolve(c);
+  return Promise.resolve(a);
 }
-function bt(t) {
-  return Object.entries(t).reduce((r, [e, f]) => {
-    const n = Math.max(...Object.keys(f).map(Number));
-    return n > r ? r = Number(n) : r = Number(r) || 0, r;
+function gt(t) {
+  return Object.entries(t).reduce((o, [e, i]) => {
+    const n = Math.max(...Object.keys(i).map(Number));
+    return n > o ? o = Number(n) : o = Number(o) || 0, o;
   }, 0);
 }
-function gt(t, o) {
-  const r = JSON.parse(JSON.stringify(t || {}));
-  for (const [e, f] of Object.entries(o)) {
-    r[e] || (r[e] = {});
-    for (const [n, h] of Object.entries(f)) {
-      const k = h, c = r[e]?.[n];
-      c ? r[e][n] = {
-        ...c,
-        ...k,
+function bt(t, r) {
+  const o = JSON.parse(JSON.stringify(t || {}));
+  for (const [e, i] of Object.entries(r)) {
+    o[e] || (o[e] = {});
+    for (const [n, h] of Object.entries(i)) {
+      const M = h, a = o[e]?.[n];
+      a ? o[e][n] = {
+        ...a,
+        ...M,
         custom: {
-          ...c.custom,
-          ...k.custom
+          ...a.custom,
+          ...M.custom
         }
-      } : r[e][n] = k;
+      } : o[e][n] = M;
+    }
+  }
+  return o;
+}
+function wt(t, r) {
+  if (!r?.length || !t) return t;
+  const o = {};
+  for (const e in t) {
+    const i = t[e];
+    for (const n in i) {
+      const h = i[n];
+      if (h?.custom?.cellType === "indicator") {
+        const M = Number(e), a = Number(n);
+        if (r.some(
+          (D) => M >= D.startRow && M <= D.endRow && a >= D.startColumn && a <= D.endColumn
+        ) && !r.some(
+          (m) => M === m.startRow && a === m.startColumn
+        ))
+          continue;
+      }
+      o[e] || (o[e] = {}), o[e][n] = h;
     }
   }
-  return r;
+  return o;
 }
 const Mt = "./style.css";
 export {
   it as CycleTypeEnum,
   ct as ModeEnum,
-  C as decimal,
+  j as decimal,
   Dt as filterIndicatorsCell,
+  wt as filterMergedIndicatorCells,
   yt as generateIndicatorsCells,
   W as generateUUID,
-  bt as getNumColumns,
+  gt as getNumColumns,
   dt as handleClearInput,
   Yt as initDateRange,
-  gt as mergeCellData,
+  bt as mergeCellData,
   Mt as stylePath,
   ht as useData
 };

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

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

package/dist/types/index.d.ts

@@ -78,6 +78,8 @@ declare class DecimalChain {
  */
 export declare function filterIndicatorsCell(cellData: IObjectMatrixPrimitiveType<ICellData>): Promise<{}>;
 
+export declare function filterMergedIndicatorCells(cellData: any, mergeData: any[]): any;
+
 export declare function generateIndicatorsCells(cells: IObjectMatrixPrimitiveType<ICellData>, params: IGenerateIndicatorsCellsParams): Promise<ICellData>;
 
 export declare const generateUUID: () => string;

package/package.json

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