@skyfox2000/webui 1.3.9 → 1.3.11

package/lib/assets/modules/{file-upload-Bkrnsn-c.js → file-upload-CwyUkWwi.js}

@@ -2,7 +2,7 @@ var m = Object.defineProperty;
 var E = (e, r, o) => r in e ? m(e, r, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[r] = o;
 var d = (e, r, o) => E(e, typeof r != "symbol" ? r + "" : r, o);
 import { hostUrl as v } from "@skyfox2000/fapi";
-import { ae as S, ad as w, u as g } from "./uploadList-D80ld89N.js";
+import { ae as S, ad as w, u as g } from "./uploadList-B4wb8I9a.js";
 import { mainAppApis as a } from "@skyfox2000/microbase";
 import y from "dayjs";
 import p from "vue-m-message";

package/lib/assets/modules/{index-DpVh0k1G.js → index-BRWQ6SRp.js}

@@ -1,6 +1,6 @@
 import { defineComponent as d, useAttrs as f, createElementBlock as u, openBlock as x, createVNode as e, withCtx as n, unref as o, mergeProps as r, renderSlot as p } from "vue";
 import { Button as _ } from "ant-design-vue";
-import { a as P, _ as k } from "./toolIcon-jkoAB1WI.js";
+import { a as P, _ as k } from "./toolIcon-BSjgzw0G.js";
 const C = /* @__PURE__ */ d({
   inheritAttrs: !1,
   __name: "index",

package/lib/assets/modules/{index-BOBTPmiP.js → index-DHWlaZL2.js}

@@ -1,8 +1,8 @@
 import { defineComponent as F, provide as _, ref as w, watch as p, onMounted as B, createBlock as n, openBlock as r, unref as a, withCtx as i, createElementVNode as N, renderSlot as b, createVNode as V, createCommentVNode as d, createTextVNode as u, toDisplayString as v } from "vue";
-import { _ as m } from "./index-DpVh0k1G.js";
+import { _ as m } from "./index-BRWQ6SRp.js";
 import { Modal as D, Space as E } from "ant-design-vue";
 import "@skyfox2000/fapi";
-import { P as M, d as P, o as $, b as K } from "./uploadList-D80ld89N.js";
+import { P as M, d as P, o as $, b as K } from "./uploadList-B4wb8I9a.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";

package/lib/assets/modules/{index-D9o5XTiu.js → index-Dd8HdGOL.js}

@@ -1,11 +1,11 @@
-import V from "async-validator";
-import { httpPost as j, ResStatus as M } from "@skyfox2000/fapi";
-import { i as T, ag as $ } from "./uploadList-D80ld89N.js";
+import S from "async-validator";
+import { httpPost as M, ResStatus as V } from "@skyfox2000/fapi";
+import { i as T, ag as $ } from "./uploadList-B4wb8I9a.js";
 import m from "vue-m-message";
-import { defineComponent as R, useAttrs as U, createElementBlock as z, openBlock as b, createVNode as B, unref as v, mergeProps as D, computed as E, createBlock as _, withCtx as A, normalizeStyle as O } from "vue";
+import { defineComponent as R, useAttrs as U, createElementBlock as z, openBlock as b, createVNode as B, unref as v, mergeProps as D, computed as E, createBlock as _, withCtx as O, normalizeStyle as A } from "vue";
 import { Spin as N, Alert as L } from "ant-design-vue";
-import { _ as K } from "./toolIcon-jkoAB1WI.js";
-const H = (i) => {
+import { _ as K } from "./toolIcon-BSjgzw0G.js";
+const j = (i) => {
   const e = i.split(`
 `).filter((c) => c.trim() !== "");
   if (e.length === 0)
@@ -17,7 +17,7 @@ const H = (i) => {
     return isNaN(t) ? o : t;
   })), n = s[0].map((c) => String(c || "")), a = s.slice(1);
   return { headers: n, rows: a };
-}, S = async (i) => {
+}, H = async (i) => {
   try {
     const e = await import("exceljs"), s = new e.default.Workbook();
     await s.xlsx.load(i);
@@ -33,7 +33,7 @@ const H = (i) => {
         const t = [];
         a.forEach((u, l) => {
           const f = r.getCell(l + 1).value;
-          f != null ? typeof f == "object" ? "richText" in f && Array.isArray(f.richText) ? t.push(f.richText.map((d) => d.text || "").join("")) : "text" in f && typeof f.text == "string" ? t.push(f.text) : (f instanceof Date, t.push(f)) : t.push(f) : t.push(null);
+          f != null ? typeof f == "object" ? "richText" in f && Array.isArray(f.richText) ? t.push(f.richText.map((h) => h.text || "").join("")) : "text" in f && typeof f.text == "string" ? t.push(f.text) : (f instanceof Date, t.push(f)) : t.push(f) : t.push(null);
         }), c.push(t);
       }
     }), { headers: a, rows: c };
@@ -46,31 +46,31 @@ const H = (i) => {
     if (r.length === 0)
       throw new Error("数据为空");
     const t = /* @__PURE__ */ new Map();
-    s != null && s.markCells && s.markCells.forEach(({ row: d, col: w, color: p }) => {
-      const y = `${d}-${w}`;
-      t.set(y, p || "FFFF0000");
+    s != null && s.markCells && s.markCells.forEach(({ row: h, col: w, color: d }) => {
+      const y = `${h}-${w}`;
+      t.set(y, d || "FFFF0000");
     });
     const u = c.getRow(1);
-    r.forEach((d, w) => {
-      const p = u.getCell(w + 1);
-      p.value = d, p.font = { bold: !0 }, p.fill = {
+    r.forEach((h, w) => {
+      const d = u.getCell(w + 1);
+      d.value = h, d.font = { bold: !0 }, d.fill = {
         type: "pattern",
         pattern: "solid",
         fgColor: { argb: "FFE0E0E0" }
-      }, s != null && s.markHeaders && s.markHeaders.includes(d) && (p.fill = {
+      }, s != null && s.markHeaders && s.markHeaders.includes(h) && (d.fill = {
         type: "pattern",
         pattern: "solid",
         fgColor: { argb: "FFFF0000" }
-      }, p.font = {
+      }, d.font = {
         name: "Arial",
         size: 10,
         bold: !0,
         color: { argb: "FFFFFFFF" }
       });
-    }), o.forEach((d, w) => {
-      const p = c.getRow(w + 2);
-      d.forEach((y, k) => {
-        const F = p.getCell(k + 1);
+    }), o.forEach((h, w) => {
+      const d = c.getRow(w + 2);
+      h.forEach((y, k) => {
+        const F = d.getCell(k + 1);
         F.value = y;
         const C = `${w + 2}-${k + 1}`;
         t.has(C) && (F.fill = {
@@ -79,15 +79,15 @@ const H = (i) => {
           fgColor: { argb: t.get(C) }
         });
       });
-    }), c.columns.forEach((d) => {
-      d.width = 15;
+    }), c.columns.forEach((h) => {
+      h.width = 15;
     });
-    const l = await a.xlsx.writeBuffer(), h = new Blob([l], {
+    const l = await a.xlsx.writeBuffer(), p = new Blob([l], {
       type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     });
     return {
       success: !0,
-      blobUrl: URL.createObjectURL(h),
+      blobUrl: URL.createObjectURL(p),
       fileName: e.replace(/\.(csv|xlsx?)$/i, ".xlsx")
     };
   } catch (n) {
@@ -98,7 +98,7 @@ const H = (i) => {
   }
 }, P = async (i, e) => {
   try {
-    const s = H(i);
+    const s = j(i);
     return await g(s, e);
   } catch (s) {
     return {
@@ -125,13 +125,13 @@ const H = (i) => {
 }, q = async (i, e) => await g(i, e), ae = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   csvToExcelView: P,
-  csvToNormalized: H,
+  csvToNormalized: j,
   excelToExcelView: W,
-  excelToNormalized: S,
+  excelToNormalized: H,
   normalizedToExcelView: q,
   toExcel: g
 }, Symbol.toStringTag, { value: "Module" })), x = async (i) => {
-  const e = await S(i);
+  const e = await H(i);
   if (e.headers.length === 0)
     return m.error("Excel文件不包含工作表"), null;
   const s = [];
@@ -170,7 +170,7 @@ const H = (i) => {
     n.includes(t) || c.push(t);
   }), n.length === 0 || a.length === 0)
     return m.error("Excel文件不包含足够的数据"), { hasError: !0 };
-  const r = new V({});
+  const r = new S({});
   r.messages($.messages()), r.define(e);
   const o = await Q(n, a, r);
   return o.length > 0 || c.length > 0 ? {
@@ -194,7 +194,7 @@ const H = (i) => {
         const o = [];
         r.forEach((t) => {
           const u = i.indexOf(t.field);
-          u >= 0 && (o.some((h) => h.row === a && h.col === u) || o.push({
+          u >= 0 && (o.some((p) => p.row === a && p.col === u) || o.push({
             row: a,
             col: u,
             header: t.field,
@@ -218,29 +218,29 @@ const H = (i) => {
   }), r.length > 0)
     return m.error(`表头缺少重复检测所需字段: ${r.join(", ")}`), { hasError: !0 };
   const o = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Set(), u = new Array();
-  if (c.forEach((l, h) => {
-    const f = e.map((p) => l[p]), d = f.join("|");
-    u.push(d);
-    const w = f.some((p) => p != null && p !== "");
-    w && o.has(d) ? (t.add(h), t.add(o.get(d))) : w && o.set(d, h);
+  if (c.forEach((l, p) => {
+    const f = e.map((d) => l[d]), h = f.join("|");
+    u.push(h);
+    const w = f.some((d) => d != null && d !== "");
+    w && o.has(h) ? (t.add(p), t.add(o.get(h))) : w && o.set(h, p);
   }), s) {
-    const l = await j(s, {
+    const l = await M(s, {
       Data: u
     });
-    if (l != null && l.data && l.data.forEach((h) => {
-      t.add(h);
-    }), (l == null ? void 0 : l.status) === M.ERROR)
+    if (l != null && l.data && l.data.forEach((p) => {
+      t.add(p);
+    }), (l == null ? void 0 : l.status) === V.ERROR)
       throw new Error(l.msg);
   }
   if (t.size > 0) {
     const l = [];
-    return t.forEach((h) => {
+    return t.forEach((p) => {
       e.forEach((f) => {
-        const d = a.indexOf(f);
-        d >= 0 && l.push({
-          row: h + 2,
+        const h = a.indexOf(f);
+        h >= 0 && l.push({
+          row: p + 2,
           // Excel行号 = 数组索引 + 2（表头和1-based索引）
-          col: d + 1,
+          col: h + 1,
           // Excel列号 = 数组索引 + 1（1-based索引）
           color: "FFA500"
           // 黄橙色
@@ -255,19 +255,19 @@ const H = (i) => {
   return { hasError: !1 };
 }, ne = async (i, e, s, n) => {
   const a = [], c = [];
-  let r = !1, o = !1, t = "数据验证成功", u = "数据验证通过";
+  let r = !1, o = !1, t = "数据验证成功", u = "待验证重复数据";
   const l = await G(i, e);
-  if (l.hasError && (r = !0, t = "数据验证失败", l.markCells && a.push(...l.markCells), l.markHeaders && c.push(...l.markHeaders)), s && s.length > 0) {
-    const h = await X(i, s, n);
-    h.hasError && (o = !0, u = "检测到重复数据", h.markCells && h.markCells.forEach((f) => {
-      const d = a.find(
-        (w) => w.row === f.row && w.col === f.col
+  if (l.hasError ? (r = !0, t = "数据验证失败", l.markCells && a.push(...l.markCells), l.markHeaders && c.push(...l.markHeaders)) : e && Object.keys(e).length > 0 && (t = "数据验证通过"), s && s.length > 0) {
+    const f = await X(i, s, n);
+    f.hasError ? (o = !0, u = "检测到重复数据", f.markCells && f.markCells.forEach((h) => {
+      const w = a.find(
+        (d) => d.row === h.row && d.col === h.col
       );
-      d ? d.color = "8B0000" : a.push(f);
-    }), h.markHeaders && c.push(...h.markHeaders));
+      w ? w.color = "8B0000" : a.push(h);
+    }), f.markHeaders && c.push(...f.markHeaders)) : u = "重复性检验通过";
   }
   if (r || o) {
-    const h = await J(
+    const f = await J(
       i,
       {
         markCells: a,
@@ -275,21 +275,24 @@ const H = (i) => {
       },
       "validation_errors.xlsx"
     );
-    return h.success && h.blobUrl ? {
-      hasError: !0,
-      errBlob: await (await fetch(h.blobUrl)).blob(),
+    return f.success && f.blobUrl ? {
+      errBlob: await (await fetch(f.blobUrl)).blob(),
       validationMsg: t,
-      duplicateMsg: u
+      duplicateMsg: u,
+      hasFormatError: r,
+      hasDuplicateError: o
     } : {
-      hasError: !0,
       validationMsg: t,
-      duplicateMsg: u
+      duplicateMsg: u,
+      hasFormatError: r,
+      hasDuplicateError: o
     };
   }
   return {
-    hasError: !1,
     validationMsg: t,
-    duplicateMsg: u
+    duplicateMsg: u,
+    hasFormatError: !1,
+    hasDuplicateError: !1
   };
 }, ce = async (i, e, s) => {
   const n = i.originFileObj;
@@ -347,10 +350,10 @@ const H = (i) => {
       type: u.type,
       message: u.message
     }, u.$attrs), {
-      icon: A(() => [
+      icon: O(() => [
         (b(), _(K, {
           icon: r.value,
-          style: O({ color: c.value }),
+          style: A({ color: c.value }),
           key: t.value
         }, null, 8, ["icon", "style"]))
       ]),
@@ -364,8 +367,8 @@ export {
   ce as b,
   P as c,
   J as d,
-  H as e,
-  S as f,
+  j as e,
+  H as f,
   W as g,
   le as h,
   ne as i,

package/lib/assets/modules/{menuTabs-D0MJJye5.js → menuTabs-NoNLt_B5.js}

@@ -1,6 +1,6 @@
 import { defineComponent as x, createBlock as h, createCommentVNode as I, openBlock as u, unref as t, mergeProps as C, useAttrs as q, computed as j, ref as y, watch as k, withCtx as d, createElementBlock as g, normalizeStyle as T, createElementVNode as m, inject as J, onMounted as N, createVNode as l, toDisplayString as $, Fragment as L, createTextVNode as K, reactive as W, nextTick as Y, renderList as G, withModifiers as Q } from "vue";
-import { a as w, _ as b } from "./toolIcon-jkoAB1WI.js";
-import { c as D, S as E, af as P, V as U, U as M, u as F, a as V, T as X, r as H, ad as z } from "./uploadList-D80ld89N.js";
+import { a as w, _ as b } from "./toolIcon-BSjgzw0G.js";
+import { c as D, S as E, af as P, V as U, U as M, u as F, a as V, T as X, r as H, ad as z } from "./uploadList-B4wb8I9a.js";
 import { _ as Z } from "./_plugin-vue_export-helper-CHgC5LLL.js";
 import { theme as O, Breadcrumb as ee, Modal as te, Flex as ne, LayoutHeader as oe, Space as se, Menu as ie, Tabs as ce, TabPane as ae } from "ant-design-vue";
 import { mainAppApis as R } from "@skyfox2000/microbase";

package/lib/assets/modules/{toolIcon-jkoAB1WI.js → toolIcon-BSjgzw0G.js}

@@ -1,7 +1,7 @@
 import { defineComponent as i, createBlock as s, openBlock as l, unref as a, withCtx as p, renderSlot as f, createCommentVNode as u, mergeProps as d } from "vue";
 import { Tooltip as I } from "ant-design-vue";
 import { SERVER_HOST as r } from "@skyfox2000/fapi";
-import { c as S } from "./uploadList-D80ld89N.js";
+import { c as S } from "./uploadList-B4wb8I9a.js";
 const T = /* @__PURE__ */ i({
   __name: "index",
   props: {

package/lib/assets/modules/{uploadList-Bwj7G7OA.js → uploadList-1Zmhwr0q.js}

@@ -1,9 +1,9 @@
 import { defineComponent as X, ref as P, computed as M, watch as $, resolveDirective as Y, createElementBlock as v, openBlock as m, normalizeClass as O, unref as n, createElementVNode as f, withDirectives as x, createBlock as Z, mergeProps as ee, withCtx as y, createVNode as u, createTextVNode as F, toDisplayString as A, Fragment as te, renderList as oe, createCommentVNode as b } from "vue";
-import { _ as ne } from "./index-DpVh0k1G.js";
-import { a as z, _ as L } from "./toolIcon-jkoAB1WI.js";
+import { _ as ne } from "./index-BRWQ6SRp.js";
+import { a as z, _ as L } from "./toolIcon-BSjgzw0G.js";
 import { httpPost as D, ResStatus as I } from "@skyfox2000/fapi";
-import { s as ae, _ as se } from "./uploadList-D80ld89N.js";
-import { p as R, U as s } from "./file-upload-Bkrnsn-c.js";
+import { s as ae, _ as se } from "./uploadList-B4wb8I9a.js";
+import { p as R, U as s } from "./file-upload-CwyUkWwi.js";
 import { combineParams as V } from "@skyfox2000/microbase";
 import k from "vue-m-message";
 import "async-validator";