@skyfox2000/webui 1.3.6 → 1.3.7

package/lib/assets/modules/{file-upload-DhPgqGdk.js → file-upload-CKliLHBF.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-DAVjJkqz.js";
+import { ae as S, ad as w, u as g } from "./uploadList-M21hxVQy.js";
 import { mainAppApis as a } from "@skyfox2000/microbase";
 import y from "dayjs";
 import p from "vue-m-message";

package/lib/assets/modules/{index-C31q4LHC.js → index-CTOX9glc.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-CCpTizF9.js";
+import { _ as m } from "./index-DTFrhJdN.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-DAVjJkqz.js";
+import { P as M, d as P, o as $, b as K } from "./uploadList-M21hxVQy.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";

package/lib/assets/modules/{index-02J2AYth.js → index-Cm_1mhHh.js}

@@ -1,10 +1,10 @@
 import V from "async-validator";
 import { httpPost as j, ResStatus as M } from "@skyfox2000/fapi";
-import { i as T, ag as $ } from "./uploadList-DAVjJkqz.js";
+import { i as T, ag as $ } from "./uploadList-M21hxVQy.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 { Spin as N, Alert as L } from "ant-design-vue";
-import { _ as K } from "./toolIcon-CqM4gBIc.js";
+import { _ as K } from "./toolIcon-CNfvNkNh.js";
 const H = (i) => {
   const e = i.split(`
 `).filter((c) => c.trim() !== "");

package/lib/assets/modules/{index-CCpTizF9.js → index-DTFrhJdN.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-CqM4gBIc.js";
+import { a as P, _ as k } from "./toolIcon-CNfvNkNh.js";
 const C = /* @__PURE__ */ d({
   inheritAttrs: !1,
   __name: "index",

package/lib/assets/modules/{menuTabs-DyhSKN9r.js → menuTabs-ylnnzjNu.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-CqM4gBIc.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-DAVjJkqz.js";
+import { a as w, _ as b } from "./toolIcon-CNfvNkNh.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-M21hxVQy.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-CqM4gBIc.js → toolIcon-CNfvNkNh.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-DAVjJkqz.js";
+import { c as S } from "./uploadList-M21hxVQy.js";
 const T = /* @__PURE__ */ i({
   __name: "index",
   props: {

package/lib/assets/modules/{uploadList-ZajZKqaS.js → uploadList-DroJGtBI.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-CCpTizF9.js";
-import { a as z, _ as L } from "./toolIcon-CqM4gBIc.js";
+import { _ as ne } from "./index-DTFrhJdN.js";
+import { a as z, _ as L } from "./toolIcon-CNfvNkNh.js";
 import { httpPost as D, ResStatus as I } from "@skyfox2000/fapi";
-import { s as ae, _ as se } from "./uploadList-DAVjJkqz.js";
-import { p as R, U as s } from "./file-upload-DhPgqGdk.js";
+import { s as ae, _ as se } from "./uploadList-M21hxVQy.js";
+import { p as R, U as s } from "./file-upload-CKliLHBF.js";
 import { combineParams as V } from "@skyfox2000/microbase";
 import k from "vue-m-message";
 import "async-validator";

package/lib/assets/modules/{uploadList-DAVjJkqz.js → uploadList-M21hxVQy.js}

@@ -175,10 +175,11 @@ const ue = {
   }
 }, P = (e) => e == null || e === "" ? !0 : Array.isArray(e) ? e.length === 0 : typeof e == "object" ? Object.keys(e).length === 0 : !1, Oe = (e, t) => {
   var n;
+  const a = e.page;
   return {
     url: "",
-    ...(n = e.page.urls) == null ? void 0 : n[t.urlKey],
     ...e.url,
+    ...(n = a.urls) == null ? void 0 : n[t.urlKey],
     ...t.url,
     loadingText: t.loadingText
   };

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-CqM4gBIc.js";
+import { _ as q } from "../../assets/modules/toolIcon-CNfvNkNh.js";
 import "@skyfox2000/fapi";
-import "../../assets/modules/uploadList-DAVjJkqz.js";
+import "../../assets/modules/uploadList-M21hxVQy.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { _ as D } from "../../assets/modules/index-C31q4LHC.js";
+import { _ as D } from "../../assets/modules/index-CTOX9glc.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-CqM4gBIc.js";
-import { I as A, _ as B, f as L, d as V, g as D } from "../../assets/modules/menuTabs-DyhSKN9r.js";
-import { ad as j, a as K, af as M } from "../../assets/modules/uploadList-DAVjJkqz.js";
+import { a as z } from "../../assets/modules/toolIcon-CNfvNkNh.js";
+import { I as A, _ as B, f as L, d as V, g as D } from "../../assets/modules/menuTabs-ylnnzjNu.js";
+import { ad as j, a as K, af as M } from "../../assets/modules/uploadList-M21hxVQy.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-DAVjJkqz.js";
+import { r as s } from "../../assets/modules/uploadList-M21hxVQy.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-DAVjJkqz.js";
+import { r as s } from "../../assets/modules/uploadList-M21hxVQy.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

package/lib/es/ExcelForm/index.js

@@ -1,19 +1,19 @@
 import { defineComponent as we, ref as v, computed as U, watch as W, onMounted as be, createBlock as H, openBlock as f, unref as n, 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-CCpTizF9.js";
+import { _ as Y } from "../../assets/modules/index-DTFrhJdN.js";
 import { Modal as Fe, Upload as ce, 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-DAVjJkqz.js";
-import { A as Re, p as De, U as ue } from "../../assets/modules/file-upload-DhPgqGdk.js";
+import { E as Te, a1 as Se, a7 as Ee } from "../../assets/modules/uploadList-M21hxVQy.js";
+import { A as Re, p as De, U as ue } from "../../assets/modules/file-upload-CKliLHBF.js";
 import "@skyfox2000/microbase";
 import c from "vue-m-message";
-import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-02J2AYth.js";
+import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-Cm_1mhHh.js";
 import "dayjs";
 import "vue-draggable-next";
 import "async-validator";
 import Ve from "@vue-office/excel";
-const Be = (t) => t.includes(",") || t.includes(`
-`), Me = (t, s) => t === "text/csv" || (s == null ? void 0 : s.toLowerCase().includes(".csv")) || !1, ze = (t, s) => t === "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" || t === "application/vnd.ms-excel" || (s == null ? void 0 : s.toLowerCase().match(/\.(xlsx|xls)$/)) !== null, ee = async (t, s = "preview.csv") => {
-  const e = await ke(t, s);
+const Be = (l) => l.includes(",") || l.includes(`
+`), Me = (l, r) => l === "text/csv" || (r == null ? void 0 : r.toLowerCase().includes(".csv")) || !1, ze = (l, r) => l === "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" || l === "application/vnd.ms-excel" || (r == null ? void 0 : r.toLowerCase().match(/\.(xlsx|xls)$/)) !== null, ee = async (l, r = "preview.csv") => {
+  const e = await ke(l, r);
   if (e.success)
     return {
       success: !0,
@@ -21,16 +21,16 @@ const Be = (t) => t.includes(",") || t.includes(`
       fileName: e.fileName
     };
   throw new Error(e.error || "CSV格式处理失败");
-}, ae = (t, s, e = "预览文件.xlsx") => ({
+}, ae = (l, r, e = "预览文件.xlsx") => ({
   success: !0,
-  blobUrl: `data:${s || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"};base64,${t}`,
+  blobUrl: `data:${r || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"};base64,${l}`,
   fileName: e
-}), ve = async (t, s = !1) => {
-  if (s) {
-    if (typeof t == "string")
-      return Be(t) ? await ee(t) : ae(t);
-    if (t instanceof ArrayBuffer || t instanceof Uint8Array) {
-      const e = new Blob([t], {
+}), ve = async (l, r = !1) => {
+  if (r) {
+    if (typeof l == "string")
+      return Be(l) ? await ee(l) : ae(l);
+    if (l instanceof ArrayBuffer || l instanceof Uint8Array) {
+      const e = new Blob([l], {
         type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
       });
       return {
@@ -41,40 +41,40 @@ const Be = (t) => t.includes(",") || t.includes(`
     } else
       throw new Error("不支持的原始文件格式");
   }
-  if (t.Content && t.Type)
-    return Me(t.Type, t.FileName) ? await ee(t.Content, t.FileName || "preview.csv") : ze(t.Type, t.FileName) ? ae(t.Content, t.Type, t.FileName || "预览文件.xlsx") : ae(t.Content);
-  if (t.url)
+  if (l.Content && l.Type)
+    return Me(l.Type, l.FileName) ? await ee(l.Content, l.FileName || "preview.csv") : ze(l.Type, l.FileName) ? ae(l.Content, l.Type, l.FileName || "预览文件.xlsx") : ae(l.Content);
+  if (l.url)
     return {
       success: !0,
-      blobUrl: t.url,
-      fileName: t.fileName || "预览文件.xlsx"
+      blobUrl: l.url,
+      fileName: l.fileName || "预览文件.xlsx"
     };
-  if (typeof t == "string")
-    return await ee(t);
+  if (typeof l == "string")
+    return await ee(l);
   throw new Error("不支持的文件格式");
-}, Pe = async (t, s) => {
-  if (!t || !s)
-    throw new Error("预览URL或Excel控制器未配置");
+}, Pe = async (l, r) => {
+  if (!l || !r)
+    return c.error("预览URL或Excel控制器未配置"), { success: !1 };
   try {
     let e = null;
-    if (t.method === "GET") {
+    if (l.method === "GET") {
       const a = {
-        ...t,
+        ...l,
         method: "GET",
-        api: t.api || s.page.api,
-        authorize: t.authorize ?? s.page.authorize
+        api: l.api || r.page.api,
+        authorize: l.authorize ?? r.page.authorize
       };
       e = await Ue(a);
     } else {
-      const a = t.params;
-      e = await Te(s, {
-        url: t,
+      const a = l.params;
+      e = await Te(r, {
+        url: l,
         urlKey: "preview",
         params: a,
         hideErrorToast: !0
       });
     }
-    if (t.raw)
+    if (l.raw)
       return await ve(e, !0);
     if ((e == null ? void 0 : e.status) === fe.SUCCESS && e.data) {
       const a = e.data;
@@ -119,8 +119,8 @@ const Be = (t) => t.includes(",") || t.includes(`
     previewUrl: {},
     fileType: {}
   },
-  setup(t, { expose: s }) {
-    const e = t, a = e.excelCtrl, m = v(!1), w = v(""), le = v([]), y = v(""), P = U(() => !!e.previewUrl), te = U(() => e.enableUpload), de = U(() => {
+  setup(l, { expose: r }) {
+    const e = l, a = e.excelCtrl, m = v(!1), w = v(""), le = v([]), y = v(""), P = U(() => !!e.previewUrl), te = U(() => e.enableUpload), de = U(() => {
       switch (e.fileType || "both") {
         case "excel":
           return ".xlsx,.xls";
@@ -159,22 +159,20 @@ const Be = (t) => t.includes(",") || t.includes(`
       { deep: !0 }
     );
     const F = v(e.uploadParams), R = U(() => {
-      var l;
-      return (l = F.value) == null ? void 0 : l.uploadUrl;
+      var t;
+      return (t = F.value) == null ? void 0 : t.uploadUrl;
     }), M = U(() => {
-      var l;
-      return (l = F.value) == null ? void 0 : l.duplicateRules;
+      var t;
+      return (t = F.value) == null ? void 0 : t.duplicateRules;
     }), D = U(() => {
-      var l;
-      return (l = F.value) == null ? void 0 : l.duplicateUrl;
+      var t;
+      return (t = F.value) == null ? void 0 : t.duplicateUrl;
     }), I = async () => {
       if (!(!e.previewUrl || !a)) {
         a.isFormLoading.value = !0;
         try {
-          const l = await Pe(e.previewUrl, a);
-          l.success && (w.value = l.blobUrl, y.value = l.fileName);
-        } catch (l) {
-          console.error("预览文件加载错误:", l), c.error("文件加载失败：" + ((l == null ? void 0 : l.message) || "未知错误"));
+          const t = await Pe(e.previewUrl, a);
+          t.success && (w.value = t.blobUrl, y.value = t.fileName);
         } finally {
           setTimeout(() => {
             a.isFormLoading.value = !1;
@@ -184,8 +182,8 @@ const Be = (t) => t.includes(",") || t.includes(`
     }, me = async () => {
       var i;
       F.value = e.uploadParams;
-      const l = R.value;
-      if (!l) {
+      const t = R.value;
+      if (!t) {
         c.error("未配置文件上传地址！");
         return;
       }
@@ -199,7 +197,7 @@ const Be = (t) => t.includes(",") || t.includes(`
           c.warning("请先选择文件！"), a.isFormSaving.value = !1;
           return;
         }
-        const r = new Re(l, 1), u = q.value || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", o = new File([L.value], y.value, {
+        const s = new Re(t, 1), u = q.value || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", o = new File([L.value], y.value, {
           type: u
         }), d = De.join(((i = F.value) == null ? void 0 : i.basePath) ?? "", y.value), p = {
           uid: "1",
@@ -211,15 +209,15 @@ const Be = (t) => t.includes(",") || t.includes(`
             FileKey: d
           }
         }, b = new AbortController();
-        (await r.uploadFile(p, b.signal, (h) => {
+        (await s.uploadFile(p, b.signal, (h) => {
           p.percent = h;
         })).status === ue.Success && (c.success("文件上传成功，开始业务处理！"), ye(p));
-      } catch (r) {
-        console.error("上传处理错误：", r), c.error("上传处理失败：" + ((r == null ? void 0 : r.message) || "未知错误"));
+      } catch (s) {
+        console.error("上传处理错误：", s), c.error("上传处理失败：" + ((s == null ? void 0 : s.message) || "未知错误"));
       } finally {
         a.isFormSaving.value = !1;
       }
-    }, ye = async (l) => {
+    }, ye = async (t) => {
       if (a.formData.value) {
         if (e.excelRecordsKey || e.excelRowsKey) {
           const o = await Ne(L.value);
@@ -236,14 +234,14 @@ const Be = (t) => t.includes(",") || t.includes(`
           e.excelRecordsKey && (a.formData.value[e.excelRecordsKey] = b), e.excelRowsKey && (a.formData.value[e.excelRowsKey] = p);
         }
         const i = e.fileField ?? "FileInfo";
-        a.formData.value[i] = l;
-        const r = {};
-        a.primaryKey && a.formData.value[a.primaryKey] !== void 0 && (r[a.primaryKey] = a.formData.value[a.primaryKey]);
+        a.formData.value[i] = t;
+        const s = {};
+        a.primaryKey && a.formData.value[a.primaryKey] !== void 0 && (s[a.primaryKey] = a.formData.value[a.primaryKey]);
         const u = {
           Data: {
             ...a.formData.value
           },
-          Query: r
+          Query: s
         };
         if (a.beforeSave && a.beforeSave(u) === !1)
           return;
@@ -261,19 +259,19 @@ const Be = (t) => t.includes(",") || t.includes(`
           a.isFormSaving.value = !1;
         }
       }
-    }, _ = v(!1), k = v(!1), L = v(null), q = v(""), re = async (l) => {
+    }, _ = v(!1), k = v(!1), L = v(null), q = v(""), se = async (t) => {
       const i = e.gridCtrl;
       if (i) {
         F.value = e.uploadParams;
         try {
           D.value && (D.value.api || (D.value.api = i.page.api), D.value.authorize === void 0 && (D.value.authorize = i.page.authorize));
           const {
-            hasError: r,
+            hasError: s,
             errBlob: u,
             validationMsg: o,
             duplicateMsg: d
-          } = await Ke(l, a.formRules.value, M.value, D.value);
-          if (V.value = o, $.value = d, r) {
+          } = await Ke(t, a.formRules.value, M.value, D.value);
+          if (V.value = o, $.value = d, s) {
             if (u) {
               _.value = !0, k.value = !0, E.value = "error", B.value = "error";
               const p = URL.createObjectURL(u);
@@ -285,41 +283,41 @@ const Be = (t) => t.includes(",") || t.includes(`
           V.value = "验证异常", $.value = "验证异常", E.value = "error", B.value = "error";
         }
       }
-    }, xe = async (l) => {
+    }, xe = async (t) => {
       if (!e.gridCtrl) {
         c.error("未配置表格控制器！");
         return;
       }
       F.value = e.uploadParams;
-      const r = l.type === "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" || l.type === "application/vnd.ms-excel", u = l.type === "text/csv" || l.name.toLowerCase().endsWith(".csv"), o = e.fileType || "both";
+      const s = t.type === "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" || t.type === "application/vnd.ms-excel", u = t.type === "text/csv" || t.name.toLowerCase().endsWith(".csv"), o = e.fileType || "both";
       let d = !1, p = "";
       switch (o) {
         case "excel":
-          d = r, p = "只能上传Excel文件!";
+          d = s, p = "只能上传Excel文件!";
           break;
         case "csv":
           d = u, p = "只能上传CSV文件!";
           break;
         case "both":
         default:
-          d = r || u, p = "只能上传Excel文件或CSV文件!";
+          d = s || u, p = "只能上传Excel文件或CSV文件!";
           break;
       }
       if (!d)
         return c.error(p), ce.LIST_IGNORE;
       try {
-        if (j(), y.value = l.name, q.value = u ? "text/csv" : "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", u) {
-          const h = await l.arrayBuffer(), O = new TextDecoder("utf-8").decode(h), { csvToExcelView: G } = await import("../../assets/modules/index-02J2AYth.js").then((he) => he.j), z = await G(O, l.name);
+        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-Cm_1mhHh.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;
+          return L.value = oe, await se(oe), !_.value && !k.value && (w.value = z.blobUrl), y.value = z.fileName, a.isFormLoading.value = !1, !1;
         }
-        const b = await l.arrayBuffer();
+        const b = await t.arrayBuffer();
         L.value = b;
         const N = new FileReader();
-        N.readAsDataURL(l), N.onload = async (h) => {
-          h.target ? (await re(b), !_.value && !k.value && (w.value = h.target.result), a.isFormLoading.value = !1) : c.error("加载文件失败，请检查文件格式！");
+        N.readAsDataURL(t), N.onload = async (h) => {
+          h.target ? (await se(b), !_.value && !k.value && (w.value = h.target.result), a.isFormLoading.value = !1) : c.error("加载文件失败，请检查文件格式！");
         };
       } catch (b) {
         console.error("文件处理错误:", b), c.error("文件处理失败，请检查文件格式！"), a.isFormLoading.value = !1, V.value = "文件处理错误", E.value = "error";
@@ -328,45 +326,45 @@ const Be = (t) => t.includes(",") || t.includes(`
     }, A = Se(a.formRules.value);
     be(() => {
       var i;
-      const l = (i = e.gridCtrl) == null ? void 0 : i.page;
-      if (l && !P.value) {
+      const t = (i = e.gridCtrl) == null ? void 0 : i.page;
+      if (t && !P.value) {
         if (!R.value) {
           c.error("未配置文件上传地址！");
           return;
         }
-        R.value.api || (R.value.api = l.api), R.value.authorize === void 0 && (R.value.authorize = l.authorize);
-        for (const r in a.formData.value)
-          e.gridCtrl.rowData.value && (a.formData.value[r] = e.gridCtrl.rowData.value[r]);
+        R.value.api || (R.value.api = t.api), R.value.authorize === void 0 && (R.value.authorize = t.authorize);
+        for (const s in a.formData.value)
+          e.gridCtrl.rowData.value && (a.formData.value[s] = e.gridCtrl.rowData.value[s]);
       }
       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 l = e.fileField ?? "FileInfo", i = e.excelRecordsKey, r = e.excelRowsKey;
-        delete a.formData.value[l], i && delete a.formData.value[i], r && delete a.formData.value[r];
+        const t = e.fileField ?? "FileInfo", i = e.excelRecordsKey, s = e.excelRowsKey;
+        delete a.formData.value[t], i && delete a.formData.value[i], s && delete a.formData.value[s];
       }
-    }, se = () => {
+    }, re = () => {
       a.visible.value = !1;
     }, ge = () => {
     };
-    return s({
+    return r({
       clearAll: j
-    }), (l, i) => (f(), H(n(Fe), {
-      title: l.title ?? "文件上传",
+    }), (t, i) => (f(), H(n(Fe), {
+      title: t.title ?? "文件上传",
       open: m.value,
-      "onUpdate:open": i[0] || (i[0] = (r) => m.value = r),
-      wrapClassName: ["modal", "mx-auto", l.$attrs.width ? "w-[" + l.$attrs.width + "]" : ""].join(" "),
+      "onUpdate:open": i[0] || (i[0] = (s) => m.value = s),
+      wrapClassName: ["modal", "mx-auto", t.$attrs.width ? "w-[" + t.$attrs.width + "]" : ""].join(" "),
       width: 940,
-      onClose: se
+      onClose: re
     }, {
       footer: T(() => [
         C(n(_e), null, {
           default: T(() => {
-            var r;
+            var s;
             return [
-              C(n(Y), { onClick: se }, {
+              C(n(Y), { onClick: re }, {
                 default: T(() => [
-                  X(S(l.cancelText ?? (P.value ? "关闭" : "取消")), 1)
+                  X(S(t.cancelText ?? (P.value ? "关闭" : "取消")), 1)
                 ]),
                 _: 1
               }),
@@ -374,11 +372,11 @@ const Be = (t) => t.includes(",") || t.includes(`
                 key: 0,
                 onClick: me,
                 type: "primary",
-                loading: ((r = n(a)) == null ? void 0 : r.isFormSaving.value) ?? !1,
+                loading: ((s = n(a)) == null ? void 0 : s.isFormSaving.value) ?? !1,
                 disabled: !w.value || _.value || k.value || n(a).isFormLoading.value
               }, {
                 default: T(() => [
-                  X(S(l.saveText ?? "上传文件"), 1)
+                  X(S(t.saveText ?? "上传文件"), 1)
                 ]),
                 _: 1
               }, 8, ["loading", "disabled"]))
@@ -388,9 +386,9 @@ const Be = (t) => t.includes(",") || t.includes(`
         })
       ]),
       default: T(() => [
-        J(l.$slots, "default"),
+        J(t.$slots, "default"),
         P.value ? K("", !0) : (f(), x("div", $e, [
-          J(l.$slots, "file-before"),
+          J(t.$slots, "file-before"),
           C(n(ce), {
             "file-list": le.value,
             "before-upload": xe,
@@ -418,7 +416,7 @@ const Be = (t) => t.includes(",") || t.includes(`
               "show-icon": !1
             }, null, 8, ["message"])
           ])) : K("", !0),
-          J(l.$slots, "file-after")
+          J(t.$slots, "file-after")
         ])),
         g("div", je, [
           n(a).isFormLoading.value ? (f(), H(n(Le), {
@@ -453,13 +451,13 @@ const Be = (t) => t.includes(",") || t.includes(`
                   class: "mb-2"
                 }, null, 8, ["message", "type"]),
                 g("div", Qe, [
-                  (f(!0), x(ie, null, ne(n(A), (r, u) => (f(), x("div", {
+                  (f(!0), x(ie, null, ne(n(A), (s, u) => (f(), x("div", {
                     key: u,
                     class: "border-b pb-0"
                   }, [
-                    g("div", We, S(r.field), 1),
+                    g("div", We, S(s.field), 1),
                     g("ul", He, [
-                      (f(!0), x(ie, null, ne(r.rules, (o, d) => (f(), x("li", {
+                      (f(!0), x(ie, null, ne(s.rules, (o, d) => (f(), x("li", {
                         key: d,
                         class: "text-[12px] text-gray-600"
                       }, S(o), 1))), 128))

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-CCpTizF9.js";
+import { _ as c } from "../../assets/modules/index-DTFrhJdN.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-DAVjJkqz.js";
+import { a3 as h } from "../../assets/modules/uploadList-M21hxVQy.js";
 import "@skyfox2000/microbase";
 import L from "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { A as N } from "../../assets/modules/file-upload-DhPgqGdk.js";
+import { A as N } from "../../assets/modules/file-upload-CKliLHBF.js";
 import "vue-draggable-next";
-import { U as B } from "../../assets/modules/uploadList-ZajZKqaS.js";
+import { U as B } from "../../assets/modules/uploadList-DroJGtBI.js";
 const K = /* @__PURE__ */ y({
   __name: "uploadForm",
   props: {

package/lib/webui.es.js

@@ -1,6 +1,6 @@
-import { u as Je, i as Z, a as me, c as Xe, P as j, 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-DAVjJkqz.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 Ol, T as Al, G as Ll, Z as zl, a2 as Ul, a5 as Vl, M as Yl, R as Wl, ab as Kl, F as jl, a0 as Hl, 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-DAVjJkqz.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-DhPgqGdk.js";
+import { u as Je, i as Z, a as me, c as Xe, P as j, 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-M21hxVQy.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 Ol, T as Al, G as Ll, Z as zl, a2 as Ul, a5 as Vl, M as Yl, R as Wl, ab as Kl, F as jl, a0 as Hl, 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-M21hxVQy.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-CKliLHBF.js";
 import { EnvConfig as we } from "@skyfox2000/microbase";
 import { FrontCache as re, httpPost as Be, ResStatus as Oe, SERVER_HOST as ba, fieldMapping as oe } from "@skyfox2000/fapi";
 import he from "vue-m-message";
@@ -9,15 +9,15 @@ import "async-validator";
 import fe 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 ve, 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 Oa, TreeSelect as Aa, LayoutContent as La } from "ant-design-vue";
 import { VueDraggableNext as za } from "vue-draggable-next";
-import { d as We } from "./assets/modules/uploadList-ZajZKqaS.js";
-import { C as gs, U as bs, a as xs, p as _s } from "./assets/modules/uploadList-ZajZKqaS.js";
-import { c as Ke } from "./assets/modules/index-02J2AYth.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-02J2AYth.js";
-import { _ as A } from "./assets/modules/index-CCpTizF9.js";
-import { _ as U } from "./assets/modules/toolIcon-CqM4gBIc.js";
-import { a as Rs } from "./assets/modules/toolIcon-CqM4gBIc.js";
-import { _ as Os, b as As, c as Ls, d as zs, e as Us, I as Vs, f as Ys, g as Ws, a as Ks } from "./assets/modules/menuTabs-DyhSKN9r.js";
-import { _ as Hs } from "./assets/modules/index-C31q4LHC.js";
+import { d as We } from "./assets/modules/uploadList-DroJGtBI.js";
+import { C as gs, U as bs, a as xs, p as _s } from "./assets/modules/uploadList-DroJGtBI.js";
+import { c as Ke } from "./assets/modules/index-Cm_1mhHh.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-Cm_1mhHh.js";
+import { _ as A } from "./assets/modules/index-DTFrhJdN.js";
+import { _ as U } from "./assets/modules/toolIcon-CNfvNkNh.js";
+import { a as Rs } from "./assets/modules/toolIcon-CNfvNkNh.js";
+import { _ as Os, b as As, c as Ls, d as zs, e as Us, I as Vs, f as Ys, g as Ws, a as Ks } from "./assets/modules/menuTabs-ylnnzjNu.js";
+import { _ as Hs } from "./assets/modules/index-CTOX9glc.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.6",
+   "version": "1.3.7",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],
@@ -66,4 +66,4 @@
       "vite-plugin-dts": "^4.5.4",
       "vue-tsc": "^2.2.0"
    }
-}
+}

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

@@ -289,9 +289,6 @@ const loadPreviewFileLocal = async () => {
          excelUrl.value = result.blobUrl!;
          fileName.value = result.fileName!;
       }
-   } catch (error: any) {
-      console.error('预览文件加载错误:', error);
-      message.error('文件加载失败：' + (error?.message || '未知错误'));
    } finally {
       setTimeout(() => {
          excelCtrl.isFormLoading.value = false;

package/src/utils/data.ts

@@ -3,12 +3,21 @@ import { ApiResponse, httpPost, IUrlInfo, ResStatus } from '@skyfox2000/fapi';
 import message from 'vue-m-message';
 import { isEmpty } from './isEmpty';
 
+/**
+ * 合并URL信息
+ * - 使用控件的URL信息
+ * - 使用页面的URL信息
+ * - 单独配置项的URL信息
+ * @param control
+ * @param options
+ * @returns
+ */
 const combineUrl = (control: AnyControl, options: ExecuteOptions<any>) => {
    const pageCtrl = control.page;
    const url: IUrlInfo | undefined = {
       url: '',
-      ...pageCtrl.urls?.[options.urlKey],
       ...control.url,
+      ...pageCtrl.urls?.[options.urlKey],
       ...options.url,
       loadingText: options.loadingText,
    };

package/src/utils/excel-preview.ts

@@ -138,7 +138,8 @@ export const loadPreviewFile = async (
    excelCtrl: any,
 ): Promise<{ success: boolean; blobUrl?: string; fileName?: string }> => {
    if (!previewUrl || !excelCtrl) {
-      throw new Error('预览URL或Excel控制器未配置');
+      message.error('预览URL或Excel控制器未配置');
+      return { success: false };
    }
 
    try {