@skyfox2000/webui 1.3.10 → 1.3.11

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

@@ -1,11 +1,11 @@
-import V from "async-validator";
-import { httpPost as j, ResStatus as M } from "@skyfox2000/fapi";
+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-BSjgzw0G.js";
-const H = (i) => {
+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/es/ExcelForm/index.js

@@ -1,12 +1,12 @@
-import { defineComponent as we, ref as c, computed as U, watch as W, onMounted as be, createBlock as H, openBlock as v, unref as i, withCtx as T, renderSlot as J, createElementBlock as x, createCommentVNode as K, createElementVNode as g, createVNode as C, createTextVNode as X, toDisplayString as S, normalizeClass as Ce, Fragment as ie, renderList as ne } from "vue";
+import { defineComponent as we, ref as f, computed as T, watch as W, onMounted as be, createBlock as H, openBlock as d, unref as i, withCtx as S, renderSlot as J, createElementBlock as g, createCommentVNode as K, createElementVNode as h, createVNode as C, createTextVNode as X, toDisplayString as E, normalizeClass as Ce, Fragment as ie, renderList as ne } from "vue";
 import { _ as Y } from "../../assets/modules/index-BRWQ6SRp.js";
 import { Modal as Fe, Upload as ue, Space as _e } from "ant-design-vue";
 import { httpGet as Ue, ResStatus as fe } from "@skyfox2000/fapi";
 import { E as Te, a1 as Se, a7 as Ee } from "../../assets/modules/uploadList-B4wb8I9a.js";
 import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-CwyUkWwi.js";
 import "@skyfox2000/microbase";
-import f from "vue-m-message";
-import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-B_XPl41L.js";
+import p from "vue-m-message";
+import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-Dd8HdGOL.js";
 import "dayjs";
 import "vue-draggable-next";
 import "async-validator";
@@ -54,7 +54,7 @@ const Be = (l) => l.includes(",") || l.includes(`
   throw new Error("不支持的文件格式");
 }, Pe = async (l, s) => {
   if (!l || !s)
-    return f.error("预览URL或Excel控制器未配置"), { success: !1 };
+    return p.error("预览URL或Excel控制器未配置"), { success: !1 };
   try {
     let e = null;
     if (l.method === "GET") {
@@ -82,15 +82,15 @@ const Be = (l) => l.includes(",") || l.includes(`
     } else
       throw new Error((e == null ? void 0 : e.msg) || "文件加载失败");
   } catch (e) {
-    throw console.error("预览文件加载错误:", e), f.error("文件加载失败：" + ((e == null ? void 0 : e.message) || "未知错误")), e;
+    throw console.error("预览文件加载错误:", e), p.error("文件加载失败：" + ((e == null ? void 0 : e.message) || "未知错误")), e;
   }
 }, $e = {
   key: 0,
   class: "mb-4 flex items-center"
-}, Ae = {
+}, je = {
   key: 0,
   class: "ml-3 text-gray-600"
-}, je = { class: "flex gap-4 relative" }, Oe = {
+}, Ae = { class: "flex gap-4 relative" }, Oe = {
   key: 1,
   class: "w-[22%] flex-grow overflow-hidden flex flex-col"
 }, Ge = { class: "bg-gray-50 p-2 rounded border flex-grow flex flex-col" }, Ie = {
@@ -120,7 +120,7 @@ const Be = (l) => l.includes(",") || l.includes(`
     fileType: {}
   },
   setup(l, { expose: s }) {
-    const e = l, a = e.excelCtrl, m = c(!1), w = c(""), le = c([]), y = c(""), P = U(() => !!e.previewUrl), te = U(() => e.enableUpload), de = U(() => {
+    const e = l, a = e.excelCtrl, m = f(!1), b = f(""), le = f([]), y = f(""), z = T(() => !!e.previewUrl), te = T(() => e.enableUpload), de = T(() => {
       switch (e.fileType || "both") {
         case "excel":
           return ".xlsx,.xls";
@@ -130,7 +130,7 @@ const Be = (l) => l.includes(",") || l.includes(`
         default:
           return ".xlsx,.xls,.csv";
       }
-    }), pe = U(() => {
+    }), pe = T(() => {
       switch (e.fileType || "both") {
         case "excel":
           return "请选择Excel文件";
@@ -140,16 +140,16 @@ const Be = (l) => l.includes(",") || l.includes(`
         default:
           return "请选择Excel或CSV文件";
       }
-    }), V = c("待验证数据规则"), E = c("warning"), $ = c("待验证重复数据"), B = c("warning");
+    }), V = f("待验证数据规则"), B = f("warning"), P = f("待验证重复数据"), $ = f("warning");
     W(
       () => a.visible.value,
       () => {
-        m.value = a.visible.value, m.value && (j(), e.previewUrl && I());
+        m.value = a.visible.value, m.value && (A(), e.previewUrl && I());
       }
     ), W(
       () => m.value,
       () => {
-        a.visible.value = m.value, m.value || j();
+        a.visible.value = m.value, m.value || A();
       }
     ), W(
       () => e.previewUrl,
@@ -158,13 +158,13 @@ const Be = (l) => l.includes(",") || l.includes(`
       },
       { deep: !0 }
     );
-    const F = c(e.uploadParams), R = U(() => {
+    const F = f(e.uploadParams), R = T(() => {
       var t;
       return (t = F.value) == null ? void 0 : t.uploadUrl;
-    }), M = U(() => {
+    }), _ = T(() => {
       var t;
       return (t = F.value) == null ? void 0 : t.duplicateRules;
-    }), D = U(() => {
+    }), D = T(() => {
       var t;
       return (t = F.value) == null ? void 0 : t.duplicateUrl;
     }), I = async () => {
@@ -172,7 +172,7 @@ const Be = (l) => l.includes(",") || l.includes(`
         a.isFormLoading.value = !0;
         try {
           const t = await Pe(e.previewUrl, a);
-          t.success && (w.value = t.blobUrl, y.value = t.fileName);
+          t.success && (b.value = t.blobUrl, y.value = t.fileName);
         } finally {
           setTimeout(() => {
             a.isFormLoading.value = !1;
@@ -184,36 +184,36 @@ const Be = (l) => l.includes(",") || l.includes(`
       F.value = e.uploadParams;
       const t = R.value;
       if (!t) {
-        f.error("未配置文件上传地址！");
+        p.error("未配置文件上传地址！");
         return;
       }
-      if (_.value) {
-        f.error("表格数据存在验证错误，请修正后再上传！");
+      if (U.value) {
+        p.error("表格数据存在验证错误，请修正后再上传！");
         return;
       }
       a.isFormSaving.value = !0;
       try {
         if (!L.value || !y.value) {
-          f.warning("请先选择文件！"), a.isFormSaving.value = !1;
+          p.warning("请先选择文件！"), a.isFormSaving.value = !1;
           return;
         }
         const r = new Re(t, 1), u = q.value || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", n = new File([L.value], y.value, {
           type: u
-        }), d = De.join(((o = F.value) == null ? void 0 : o.basePath) ?? "", y.value), p = {
+        }), c = De.join(((o = F.value) == null ? void 0 : o.basePath) ?? "", y.value), v = {
           uid: "1",
           name: y.value,
           originFileObj: n,
           status: ce.Uploading,
           percent: 0,
           params: {
-            FileKey: d
+            FileKey: c
           }
-        }, b = new AbortController();
-        (await r.uploadFile(p, b.signal, (h) => {
-          p.percent = h;
-        })).status === ce.Success && (f.success("文件上传成功，开始业务处理！"), ye(p));
+        }, x = new AbortController();
+        (await r.uploadFile(v, x.signal, (w) => {
+          v.percent = w;
+        })).status === ce.Success && (p.success("文件上传成功，开始业务处理！"), ye(v));
       } catch (r) {
-        console.error("上传处理错误：", r), f.error("上传处理失败：" + ((r == null ? void 0 : r.message) || "未知错误"));
+        console.error("上传处理错误：", r), p.error("上传处理失败：" + ((r == null ? void 0 : r.message) || "未知错误"));
       } finally {
         a.isFormSaving.value = !1;
       }
@@ -222,16 +222,16 @@ const Be = (l) => l.includes(",") || l.includes(`
         if (e.excelRecordsKey || e.excelRowsKey) {
           const n = await Ne(L.value);
           if (!n) return null;
-          const { excelData: d, excelRows: p } = n, b = d.map((N) => {
+          const { excelData: c, excelRows: v } = n, x = c.map((N) => {
             var Q;
-            const h = {};
+            const w = {};
             for (const O in N) {
               const G = (Q = e.excelFieldMap) == null ? void 0 : Q[O];
-              G && (h[G] = N[O]);
+              G && (w[G] = N[O]);
             }
-            return h;
+            return w;
           });
-          e.excelRecordsKey && (a.formData.value[e.excelRecordsKey] = b), e.excelRowsKey && (a.formData.value[e.excelRowsKey] = p);
+          e.excelRecordsKey && (a.formData.value[e.excelRecordsKey] = x), e.excelRowsKey && (a.formData.value[e.excelRowsKey] = v);
         }
         const o = e.fileField ?? "FileInfo";
         a.formData.value[o] = t;
@@ -254,82 +254,81 @@ const Be = (l) => l.includes(",") || l.includes(`
           });
           (n == null ? void 0 : n.status) === fe.SUCCESS && (a.afterSave && a.afterSave(), a.visible.value = !1);
         } catch (n) {
-          console.error("保存错误：", n), f.error("数据保存失败，请稍后再试！");
+          console.error("保存错误：", n), p.error("数据保存失败，请稍后再试！");
         } finally {
           a.isFormSaving.value = !1;
         }
       }
-    }, _ = c(!1), k = c(!1), L = c(null), q = c(""), re = async (t) => {
+    }, U = f(!1), k = f(!1), L = f(null), q = f(""), re = async (t) => {
       const o = e.gridCtrl;
       if (o) {
         F.value = e.uploadParams;
         try {
           D.value && (D.value.api || (D.value.api = o.page.api), D.value.authorize === void 0 && (D.value.authorize = o.page.authorize));
           const {
-            hasError: r,
-            errBlob: u,
-            validationMsg: n,
-            duplicateMsg: d
-          } = await Ke(t, a.formRules.value, M.value, D.value);
-          if (V.value = n, $.value = d, r) {
-            if (u) {
-              _.value = !0, k.value = !0, E.value = "error", B.value = "error";
-              const p = URL.createObjectURL(u);
-              w.value = p;
-            }
+            errBlob: r,
+            validationMsg: u,
+            duplicateMsg: n,
+            hasFormatError: c,
+            hasDuplicateError: v
+          } = await Ke(t, a.formRules.value, _.value, D.value);
+          if (V.value = u, P.value = n, B.value = c ? "error" : a.formRules.value && Object.keys(a.formRules.value).length > 0 ? "success" : "warning", $.value = v ? "error" : _.value && _.value.length > 0 ? "success" : "warning", r) {
+            U.value = c ?? !1, k.value = v ?? !1;
+            const x = URL.createObjectURL(r);
+            b.value = x;
           } else
-            _.value = !1, k.value = !1, E.value = "success", B.value = "success";
+            U.value = !1, k.value = !1;
         } catch {
-          V.value = "验证异常", $.value = "验证异常", E.value = "error", B.value = "error";
+          V.value = "验证异常", P.value = "验证异常", B.value = "error", $.value = "error";
         }
       }
     }, xe = async (t) => {
       if (!e.gridCtrl) {
-        f.error("未配置表格控制器！");
+        p.error("未配置表格控制器！");
         return;
       }
       F.value = e.uploadParams;
       const r = t.type === "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" || t.type === "application/vnd.ms-excel", u = t.type === "text/csv" || t.name.toLowerCase().endsWith(".csv"), n = e.fileType || "both";
-      let d = !1, p = "";
+      let c = !1, v = "";
       switch (n) {
         case "excel":
-          d = r, p = "只能上传Excel文件!";
+          c = r, v = "只能上传Excel文件!";
           break;
         case "csv":
-          d = u, p = "只能上传CSV文件!";
+          c = u, v = "只能上传CSV文件!";
           break;
         case "both":
         default:
-          d = r || u, p = "只能上传Excel文件或CSV文件!";
+          c = r || u, v = "只能上传Excel文件或CSV文件!";
           break;
       }
-      if (!d)
-        return f.error(p), ue.LIST_IGNORE;
+      if (!c)
+        return p.error(v), ue.LIST_IGNORE;
       try {
-        if (j(), y.value = t.name, q.value = u ? "text/csv" : "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", u) {
-          const h = await t.arrayBuffer(), O = new TextDecoder("utf-8").decode(h), { csvToExcelView: G } = await import("../../assets/modules/index-B_XPl41L.js").then((he) => he.j), z = await G(O, t.name);
-          if (!z.success)
-            throw new Error(z.error || "CSV文件处理失败");
-          const oe = await (await fetch(z.blobUrl)).arrayBuffer();
-          return L.value = oe, await re(oe), !_.value && !k.value && (w.value = z.blobUrl), y.value = z.fileName, a.isFormLoading.value = !1, !1;
+        if (A(), y.value = t.name, q.value = u ? "text/csv" : "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", u) {
+          const w = await t.arrayBuffer(), O = new TextDecoder("utf-8").decode(w), { csvToExcelView: G } = await import("../../assets/modules/index-Dd8HdGOL.js").then((he) => he.j), M = await G(O, t.name);
+          if (!M.success)
+            throw new Error(M.error || "CSV文件处理失败");
+          const oe = await (await fetch(M.blobUrl)).arrayBuffer();
+          return L.value = oe, await re(oe), !U.value && !k.value && (b.value = M.blobUrl), y.value = M.fileName, a.isFormLoading.value = !1, !1;
         }
-        const b = await t.arrayBuffer();
-        L.value = b;
+        const x = await t.arrayBuffer();
+        L.value = x;
         const N = new FileReader();
-        N.readAsDataURL(t), N.onload = async (h) => {
-          h.target ? (await re(b), !_.value && !k.value && (w.value = h.target.result), a.isFormLoading.value = !1) : f.error("加载文件失败，请检查文件格式！");
+        N.readAsDataURL(t), N.onload = async (w) => {
+          w.target ? (await re(x), !U.value && !k.value && (b.value = w.target.result), a.isFormLoading.value = !1) : p.error("加载文件失败，请检查文件格式！");
         };
-      } catch (b) {
-        console.error("文件处理错误:", b), f.error("文件处理失败，请检查文件格式！"), a.isFormLoading.value = !1, V.value = "文件处理错误", E.value = "error";
+      } catch (x) {
+        console.error("文件处理错误:", x), p.error("文件处理失败，请检查文件格式！"), a.isFormLoading.value = !1, V.value = "文件处理错误", B.value = "error";
       }
       return !1;
-    }, A = Se(a.formRules.value);
+    }, j = Se(a.formRules.value);
     be(() => {
       var o;
       const t = (o = e.gridCtrl) == null ? void 0 : o.page;
-      if (t && !P.value) {
+      if (t && !z.value) {
         if (!R.value) {
-          f.error("未配置文件上传地址！");
+          p.error("未配置文件上传地址！");
           return;
         }
         R.value.api || (R.value.api = t.api), R.value.authorize === void 0 && (R.value.authorize = t.authorize);
@@ -338,8 +337,8 @@ const Be = (l) => l.includes(",") || l.includes(`
       }
       m.value = a.visible.value, m.value && e.previewUrl && I();
     });
-    const j = () => {
-      if (w.value = "", y.value = "", le.value = [], L.value = null, q.value = "", a.isFormLoading.value = !1, V.value = "待验证数据规则", E.value = "warning", $.value = "待验证重复数据", B.value = "warning", _.value = !1, k.value = !1, a.formData.value) {
+    const A = () => {
+      if (b.value = "", y.value = "", le.value = [], L.value = null, q.value = "", a.isFormLoading.value = !1, V.value = "待验证数据规则", B.value = "warning", P.value = "待验证重复数据", $.value = "warning", U.value = !1, k.value = !1, a.formData.value) {
         const t = e.fileField ?? "FileInfo", o = e.excelRecordsKey, r = e.excelRowsKey;
         delete a.formData.value[t], o && delete a.formData.value[o], r && delete a.formData.value[r];
       }
@@ -348,8 +347,8 @@ const Be = (l) => l.includes(",") || l.includes(`
     }, ge = () => {
     };
     return s({
-      clearAll: j
-    }), (t, o) => (v(), H(i(Fe), {
+      clearAll: A
+    }), (t, o) => (d(), H(i(Fe), {
       title: t.title ?? "文件上传",
       open: m.value,
       "onUpdate:open": o[0] || (o[0] = (r) => m.value = r),
@@ -357,26 +356,26 @@ const Be = (l) => l.includes(",") || l.includes(`
       width: 940,
       onClose: se
     }, {
-      footer: T(() => [
+      footer: S(() => [
         C(i(_e), null, {
-          default: T(() => {
+          default: S(() => {
             var r;
             return [
               C(i(Y), { onClick: se }, {
-                default: T(() => [
-                  X(S(t.cancelText ?? (P.value ? "关闭" : "取消")), 1)
+                default: S(() => [
+                  X(E(t.cancelText ?? (z.value ? "关闭" : "取消")), 1)
                 ]),
                 _: 1
               }),
-              P.value ? K("", !0) : (v(), H(i(Y), {
+              z.value ? K("", !0) : (d(), H(i(Y), {
                 key: 0,
                 onClick: me,
                 type: "primary",
                 loading: ((r = i(a)) == null ? void 0 : r.isFormSaving.value) ?? !1,
-                disabled: !w.value || _.value || k.value || i(a).isFormLoading.value
+                disabled: !b.value || U.value || k.value || i(a).isFormLoading.value
               }, {
-                default: T(() => [
-                  X(S(t.saveText ?? "上传文件"), 1)
+                default: S(() => [
+                  X(E(t.saveText ?? "上传文件"), 1)
                 ]),
                 _: 1
               }, 8, ["loading", "disabled"]))
@@ -385,9 +384,9 @@ const Be = (l) => l.includes(",") || l.includes(`
           _: 1
         })
       ]),
-      default: T(() => [
+      default: S(() => [
         J(t.$slots, "default"),
-        P.value ? K("", !0) : (v(), x("div", $e, [
+        z.value ? K("", !0) : (d(), g("div", $e, [
           J(t.$slots, "file-before"),
           C(i(ue), {
             "file-list": le.value,
@@ -396,20 +395,20 @@ const Be = (l) => l.includes(",") || l.includes(`
             showUploadList: !0,
             disabled: !te.value
           }, {
-            default: T(() => [
+            default: S(() => [
               C(i(Y), {
                 type: "primary",
                 disabled: !te.value
               }, {
-                default: T(() => [
-                  X(S(pe.value), 1)
+                default: S(() => [
+                  X(E(pe.value), 1)
                 ]),
                 _: 1
               }, 8, ["disabled"])
             ]),
             _: 1
           }, 8, ["file-list", "accept", "disabled"]),
-          w.value && y.value ? (v(), x("div", Ae, [
+          b.value && y.value ? (d(), g("div", je, [
             C(i(Z), {
               message: y.value,
               type: "info",
@@ -418,17 +417,17 @@ const Be = (l) => l.includes(",") || l.includes(`
           ])) : K("", !0),
           J(t.$slots, "file-after")
         ])),
-        g("div", je, [
-          i(a).isFormLoading.value ? (v(), H(i(Le), {
+        h("div", Ae, [
+          i(a).isFormLoading.value ? (d(), H(i(Le), {
             key: 0,
             size: "large"
           })) : K("", !0),
-          g("div", {
-            class: Ce(["flex-shrink-0 relative border border-gray-200 rounded-md overflow-hidden", [i(A).length === 0 ? "w-[100%]" : "w-[80%]"]]),
+          h("div", {
+            class: Ce(["flex-shrink-0 relative border border-gray-200 rounded-md overflow-hidden", [i(j).length === 0 ? "w-[100%]" : "w-[80%]"]]),
             style: { height: "430px" }
           }, [
             C(i(Ve), {
-              src: w.value,
+              src: b.value,
               onError: ge,
               style: { width: "100%", height: "100%" },
               options: {
@@ -441,40 +440,40 @@ const Be = (l) => l.includes(",") || l.includes(`
               }
             }, null, 8, ["src"])
           ], 2),
-          i(A).length > 0 ? (v(), x("div", Oe, [
-            g("div", Ge, [
-              i(A).length === 0 ? (v(), x("div", Ie, "没有设置验证规则")) : (v(), x("div", qe, [
+          i(j).length > 0 ? (d(), g("div", Oe, [
+            h("div", Ge, [
+              i(j).length === 0 ? (d(), g("div", Ie, "没有设置验证规则")) : (d(), g("div", qe, [
                 C(i(Z), {
                   message: V.value,
-                  type: E.value,
+                  type: B.value,
                   "show-icon": "",
                   class: "mb-2"
                 }, null, 8, ["message", "type"]),
-                g("div", Qe, [
-                  (v(!0), x(ie, null, ne(i(A), (r, u) => (v(), x("div", {
+                h("div", Qe, [
+                  (d(!0), g(ie, null, ne(i(j), (r, u) => (d(), g("div", {
                     key: u,
                     class: "border-b pb-0"
                   }, [
-                    g("div", We, S(r.field), 1),
-                    g("ul", He, [
-                      (v(!0), x(ie, null, ne(r.rules, (n, d) => (v(), x("li", {
-                        key: d,
+                    h("div", We, E(r.field), 1),
+                    h("ul", He, [
+                      (d(!0), g(ie, null, ne(r.rules, (n, c) => (d(), g("li", {
+                        key: c,
                         class: "text-[12px] text-gray-600"
-                      }, S(n), 1))), 128))
+                      }, E(n), 1))), 128))
                     ])
                   ]))), 128))
                 ]),
-                M.value && M.value.length > 0 ? (v(), x("div", Je, [
+                _.value && _.value.length > 0 ? (d(), g("div", Je, [
                   C(i(Z), {
-                    message: $.value,
-                    type: B.value,
+                    message: P.value,
+                    type: $.value,
                     "show-icon": "",
                     class: "mt-2 mb-2"
                   }, null, 8, ["message", "type"]),
-                  g("div", Xe, [
-                    g("div", Ye, " 以下" + S(M.value.length > 1 ? "组合" : "字段") + "必须唯一 ", 1),
-                    g("ul", Ze, [
-                      g("li", ea, S(M.value.join(", ")), 1)
+                  h("div", Xe, [
+                    h("div", Ye, " 以下" + E(_.value.length > 1 ? "组合" : "字段") + "必须唯一 ", 1),
+                    h("ul", Ze, [
+                      h("li", ea, E(_.value.join(", ")), 1)
                     ])
                   ])
                 ])) : K("", !0)

package/lib/utils/form-excel.d.ts

@@ -27,9 +27,10 @@ export declare const checkExcelDuplicates: (excelBuffer: ArrayBuffer, duplicateR
     markHeaders?: string[];
 }>;
 export declare const validateExcelUnified: (excelBuffer: ArrayBuffer, rules?: Record<string, ValidateRule>, duplicateRules?: string[], duplicateUrl?: IUrlInfo) => Promise<{
-    hasError: boolean;
     errBlob?: Blob;
     validationMsg: string;
     duplicateMsg: string;
+    hasFormatError?: boolean;
+    hasDuplicateError?: boolean;
 }>;
 export declare const appendExcelData: (fileInfo: UploadFile, fileData: Record<string, any>, fields?: string[]) => Promise<void>;

package/lib/webui.es.js

@@ -11,8 +11,8 @@ import { Popover as Sa, theme as Le, Drawer as Ca, Space as te, Form as ze, mess
 import { VueDraggableNext as za } from "vue-draggable-next";
 import { d as Ke } from "./assets/modules/uploadList-1Zmhwr0q.js";
 import { C as gs, U as bs, a as xs, p as _s } from "./assets/modules/uploadList-1Zmhwr0q.js";
-import { c as We } from "./assets/modules/index-B_XPl41L.js";
-import { _ as ks, h as ws, b as Ss, a as Cs, d as Ts, e as $s, g as Is, f as Ds, n as Es, p as Ps, t as Fs, v as Ns } from "./assets/modules/index-B_XPl41L.js";
+import { c as We } from "./assets/modules/index-Dd8HdGOL.js";
+import { _ as ks, h as ws, b as Ss, a as Cs, d as Ts, e as $s, g as Is, f as Ds, n as Es, p as Ps, t as Fs, v as Ns } from "./assets/modules/index-Dd8HdGOL.js";
 import { _ as O } from "./assets/modules/index-BRWQ6SRp.js";
 import { _ as U } from "./assets/modules/toolIcon-BSjgzw0G.js";
 import { a as Rs } from "./assets/modules/toolIcon-BSjgzw0G.js";

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.3.10",
+   "version": "1.3.11",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/content/dialog/excelForm.vue

@@ -451,32 +451,31 @@ const performDataValidation = async (buffer: ArrayBuffer): Promise<void> => {
 
       // 统一验证（格式验证和重复验证）
       const {
-         hasError,
          errBlob,
          validationMsg: valMsg,
          duplicateMsg: dupMsg,
+         hasFormatError,
+         hasDuplicateError
       } = await validateExcelUnified(buffer, excelCtrl.formRules.value, duplicateRules.value, duplicateUrl.value);
 
       // 更新验证状态
       validationMsg.value = valMsg;
       duplicateMsg.value = dupMsg;
 
-      if (hasError) {
-         // 有验证错误
-         if (errBlob) {
-            excelError.value = true;
-            duplicateError.value = true;
-            validationType.value = 'error';
-            duplicateType.value = 'error';
-            const blobUrl = URL.createObjectURL(errBlob);
-            excelUrl.value = blobUrl;
-         }
+      // 根据验证结果设置正确的状态类型
+      validationType.value = hasFormatError ? 'error' : (excelCtrl.formRules.value && Object.keys(excelCtrl.formRules.value).length > 0 ? 'success' : 'warning');
+      duplicateType.value = hasDuplicateError ? 'error' : (duplicateRules.value && duplicateRules.value.length > 0 ? 'success' : 'warning');
+
+      // 有验证错误
+      if (errBlob) {
+         excelError.value = hasFormatError ?? false;
+         duplicateError.value = hasDuplicateError ?? false;
+         const blobUrl = URL.createObjectURL(errBlob);
+         excelUrl.value = blobUrl;
       } else {
          // 验证成功
          excelError.value = false;
          duplicateError.value = false;
-         validationType.value = 'success';
-         duplicateType.value = 'success';
          // 验证成功时，excelUrl会在beforeUpload中设置
       }
    } catch (error) {

package/src/utils/form-excel.ts

@@ -316,22 +316,23 @@ export const validateExcelUnified = async (
    duplicateRules?: string[],
    duplicateUrl?: IUrlInfo,
 ): Promise<{
-   hasError: boolean;
    errBlob?: Blob;
    validationMsg: string;
    duplicateMsg: string;
+   hasFormatError?: boolean;
+   hasDuplicateError?: boolean;
 }> => {
    const allMarkCells: Array<{ row: number; col: number; color: string }> = [];
    const allMarkHeaders: string[] = [];
-   let hasValidationError = false;
+   let hasFormatError = false;
    let hasDuplicateError = false;
    let validationMsg = '数据验证成功';
-   let duplicateMsg = '数据验证通过';
+   let duplicateMsg = '待验证重复数据';
 
    // 1. 格式验证
    const validationResult = await validateExcel(excelBuffer, rules);
    if (validationResult.hasError) {
-      hasValidationError = true;
+      hasFormatError = true;
       validationMsg = '数据验证失败';
       if (validationResult.markCells) {
          allMarkCells.push(...validationResult.markCells);
@@ -339,6 +340,8 @@ export const validateExcelUnified = async (
       if (validationResult.markHeaders) {
          allMarkHeaders.push(...validationResult.markHeaders);
       }
+   } else if (rules && Object.keys(rules).length > 0) {
+      validationMsg = '数据验证通过';
    }
 
    // 2. 重复验证
@@ -363,11 +366,15 @@ export const validateExcelUnified = async (
          if (duplicateResult.markHeaders) {
             allMarkHeaders.push(...duplicateResult.markHeaders);
          }
+      } else {
+         duplicateMsg = '重复性检验通过';
       }
    }
 
+   const hasError = hasFormatError || hasDuplicateError;
+
    // 3. 如果有任何错误，创建统一的标记Excel
-   if (hasValidationError || hasDuplicateError) {
+   if (hasError) {
       const markResult = await createMarkedExcelView(
          excelBuffer,
          {
@@ -381,24 +388,27 @@ export const validateExcelUnified = async (
          const response = await fetch(markResult.blobUrl);
          const errBlob = await response.blob();
          return {
-            hasError: true,
             errBlob,
             validationMsg,
             duplicateMsg,
+            hasFormatError,
+            hasDuplicateError
          };
       } else {
          return {
-            hasError: true,
             validationMsg,
             duplicateMsg,
+            hasFormatError,
+            hasDuplicateError
          };
       }
    }
 
    return {
-      hasError: false,
       validationMsg,
       duplicateMsg,
+      hasFormatError: false,
+      hasDuplicateError: false
    };
 };