@skyfox2000/webui 1.3.9 → 1.3.11

package/lib/es/AceEditor/index.js

@@ -1,13 +1,13 @@
 import { defineComponent as F, defineAsyncComponent as M, ref as m, watch as V, onMounted as J, createElementBlock as x, openBlock as p, Fragment as K, createElementVNode as v, createVNode as _, toDisplayString as W, unref as i, createBlock as P, withKeys as f, normalizeClass as N, withModifiers as w, withCtx as z, createCommentVNode as L } from "vue";
 import "ant-design-vue";
-import { _ as q } from "../../assets/modules/toolIcon-jkoAB1WI.js";
+import { _ as q } from "../../assets/modules/toolIcon-BSjgzw0G.js";
 import "@skyfox2000/fapi";
-import "../../assets/modules/uploadList-D80ld89N.js";
+import "../../assets/modules/uploadList-B4wb8I9a.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { _ as D } from "../../assets/modules/index-BOBTPmiP.js";
+import { _ as D } from "../../assets/modules/index-DHWlaZL2.js";
 import "vue-draggable-next";
 const h = async (s) => window.ace ? window.ace : new Promise((l, t) => {
   const o = document.createElement("script");

package/lib/es/BasicLayout/index.js

@@ -1,8 +1,8 @@
 import { defineComponent as y, ref as I, watch as C, onMounted as g, resolveComponent as b, createBlock as n, openBlock as o, unref as e, withCtx as l, createCommentVNode as c, createVNode as r, createElementVNode as u, createElementBlock as k, toDisplayString as w, normalizeClass as S, KeepAlive as N, resolveDynamicComponent as $ } from "vue";
 import { Layout as f, LayoutSider as E } from "ant-design-vue";
-import { a as z } from "../../assets/modules/toolIcon-jkoAB1WI.js";
-import { I as A, _ as B, f as L, d as V, g as D } from "../../assets/modules/menuTabs-D0MJJye5.js";
-import { ad as j, a as K, af as M } from "../../assets/modules/uploadList-D80ld89N.js";
+import { a as z } from "../../assets/modules/toolIcon-BSjgzw0G.js";
+import { I as A, _ as B, f as L, d as V, g as D } from "../../assets/modules/menuTabs-NoNLt_B5.js";
+import { ad as j, a as K, af as M } from "../../assets/modules/uploadList-B4wb8I9a.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import P from "vue-m-message";

package/lib/es/Error403/index.js

@@ -1,5 +1,5 @@
 import { defineComponent as i, createBlock as p, openBlock as m, unref as r, withCtx as e, createVNode as n, createTextVNode as a } from "vue";
-import { r as s } from "../../assets/modules/uploadList-D80ld89N.js";
+import { r as s } from "../../assets/modules/uploadList-B4wb8I9a.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

package/lib/es/Error404/index.js

@@ -1,5 +1,5 @@
 import { defineComponent as i, createBlock as p, openBlock as m, unref as r, withCtx as e, createVNode as n, createTextVNode as a } from "vue";
-import { r as s } from "../../assets/modules/uploadList-D80ld89N.js";
+import { r as s } from "../../assets/modules/uploadList-B4wb8I9a.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

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 { _ as Y } from "../../assets/modules/index-DpVh0k1G.js";
+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-D80ld89N.js";
-import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-Bkrnsn-c.js";
+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-D9o5XTiu.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-D9o5XTiu.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/es/UploadForm/index.js

@@ -1,15 +1,15 @@
 import { defineComponent as y, ref as f, watch as S, onMounted as z, createBlock as D, openBlock as F, unref as u, withCtx as s, createVNode as m, createTextVNode as C } from "vue";
-import { _ as c } from "../../assets/modules/index-DpVh0k1G.js";
+import { _ as c } from "../../assets/modules/index-BRWQ6SRp.js";
 import { Modal as _, Space as k } from "ant-design-vue";
 import { ResStatus as E } from "@skyfox2000/fapi";
-import { a3 as h } from "../../assets/modules/uploadList-D80ld89N.js";
+import { a3 as h } from "../../assets/modules/uploadList-B4wb8I9a.js";
 import "@skyfox2000/microbase";
 import L from "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { A as N } from "../../assets/modules/file-upload-Bkrnsn-c.js";
+import { A as N } from "../../assets/modules/file-upload-CwyUkWwi.js";
 import "vue-draggable-next";
-import { U as B } from "../../assets/modules/uploadList-Bwj7G7OA.js";
+import { U as B } from "../../assets/modules/uploadList-1Zmhwr0q.js";
 const K = /* @__PURE__ */ y({
   __name: "uploadForm",
   props: {

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

@@ -1,6 +1,6 @@
-import { u as Je, i as Z, a as ve, c as Xe, P as H, o as Ee, b as Ze, d as ea, e as Pe, r as ce, f as aa, g as ta, h as Fe, j as la, k as ke, l as sa, _ as ra, m as oa, O as Ne, q as Me, n as na, p as ia, s as L, t as ca, v as ua, w as da, x as pa, y as fa, z as va, A as Q, B as ma, C as ha, D as ga, E as Re } from "./assets/modules/uploadList-D80ld89N.js";
-import { a9 as Sl, N as Cl, Q as Tl, U as $l, a8 as Il, a6 as Dl, a7 as El, aa as Pl, X as Fl, S as Nl, a4 as Ml, a1 as Rl, L as Bl, a3 as Al, T as Ol, G as Ll, Z as zl, a2 as Ul, a5 as Vl, M as Yl, R as Kl, ab as Wl, F as Hl, a0 as jl, ac as Ql, W as ql, Y as Gl, V as Jl, ad as Xl, H as Zl, I as es, ae as as, K as ts, af as ls, J as ss, $ as rs } from "./assets/modules/uploadList-D80ld89N.js";
-import { A as ns, U as is, a as cs, g as us, c as ds, d as ps, p as fs, u as vs, b as ms } from "./assets/modules/file-upload-Bkrnsn-c.js";
+import { u as Je, i as Z, a as ve, c as Xe, P as H, o as Ee, b as Ze, d as ea, e as Pe, r as ce, f as aa, g as ta, h as Fe, j as la, k as ke, l as sa, _ as ra, m as oa, O as Ne, q as Me, n as na, p as ia, s as L, t as ca, v as ua, w as da, x as pa, y as fa, z as va, A as Q, B as ma, C as ha, D as ga, E as Re } from "./assets/modules/uploadList-B4wb8I9a.js";
+import { a9 as Sl, N as Cl, Q as Tl, U as $l, a8 as Il, a6 as Dl, a7 as El, aa as Pl, X as Fl, S as Nl, a4 as Ml, a1 as Rl, L as Bl, a3 as Al, T as Ol, G as Ll, Z as zl, a2 as Ul, a5 as Vl, M as Yl, R as Kl, ab as Wl, F as Hl, a0 as jl, ac as Ql, W as ql, Y as Gl, V as Jl, ad as Xl, H as Zl, I as es, ae as as, K as ts, af as ls, J as ss, $ as rs } from "./assets/modules/uploadList-B4wb8I9a.js";
+import { A as ns, U as is, a as cs, g as us, c as ds, d as ps, p as fs, u as vs, b as ms } from "./assets/modules/file-upload-CwyUkWwi.js";
 import { EnvConfig as we } from "@skyfox2000/microbase";
 import { FrontCache as re, httpPost as Be, ResStatus as Ae, SERVER_HOST as ba, fieldMapping as oe } from "@skyfox2000/fapi";
 import me from "vue-m-message";
@@ -9,15 +9,15 @@ import "async-validator";
 import pe from "dayjs";
 import { Popover as Sa, theme as Le, Drawer as Ca, Space as te, Form as ze, message as Ta, FormItem as Ue, ConfigProvider as Ce, Popconfirm as $a, Button as Ve, DropdownButton as Ia, Menu as be, MenuItem as xe, Dropdown as fe, Checkbox as Da, Table as Ye, Tree as Ea, Cascader as Pa, DatePicker as Fa, Input as ee, InputPassword as Na, InputNumber as Ma, RangePicker as Ra, Textarea as Ba, Transfer as Aa, TreeSelect as Oa, LayoutContent as La } from "ant-design-vue";
 import { VueDraggableNext as za } from "vue-draggable-next";
-import { d as Ke } from "./assets/modules/uploadList-Bwj7G7OA.js";
-import { C as gs, U as bs, a as xs, p as _s } from "./assets/modules/uploadList-Bwj7G7OA.js";
-import { c as We } from "./assets/modules/index-D9o5XTiu.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-D9o5XTiu.js";
-import { _ as O } from "./assets/modules/index-DpVh0k1G.js";
-import { _ as U } from "./assets/modules/toolIcon-jkoAB1WI.js";
-import { a as Rs } from "./assets/modules/toolIcon-jkoAB1WI.js";
-import { _ as As, b as Os, c as Ls, d as zs, e as Us, I as Vs, f as Ys, g as Ks, a as Ws } from "./assets/modules/menuTabs-D0MJJye5.js";
-import { _ as js } from "./assets/modules/index-BOBTPmiP.js";
+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-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";
+import { _ as As, b as Os, c as Ls, d as zs, e as Us, I as Vs, f as Ys, g as Ks, a as Ws } from "./assets/modules/menuTabs-NoNLt_B5.js";
+import { _ as js } from "./assets/modules/index-DHWlaZL2.js";
 import { _ as q } from "./assets/modules/_plugin-vue_export-helper-CHgC5LLL.js";
 const Te = (s, a, e, t = "remove") => {
   if (!e)

package/package.json

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