@skyfox2000/webui 1.3.20 → 1.3.21

package/lib/assets/modules/{baseLayout-B9dSxkYo.js → baseLayout-Bz3oRE5o.js}

@@ -1,8 +1,8 @@
 import { defineComponent as _, onMounted as I, createBlock as s, openBlock as o, unref as e, withCtx as l, createCommentVNode as r, createVNode as p, createElementVNode as x, createElementBlock as y, toDisplayString as g, renderSlot as h } from "vue";
 import { Layout as i, LayoutSider as k } from "ant-design-vue";
-import { a as b } from "./toolIcon-XOgjdQdO.js";
-import { I as C, _ as S, f as w, d as $, g as N } from "./menuTabs-BFPjaQRI.js";
-import { ad as v, a as B, af as E } from "./uploadList-BedljASx.js";
+import { a as b } from "./toolIcon-BuqRfX4F.js";
+import { I as C, _ as S, f as w, d as $, g as N } from "./menuTabs-NVgroqVO.js";
+import { ad as v, a as B, af as E } from "./uploadList-B6MIYOtN.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import L from "vue-m-message";

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

package/lib/assets/modules/{index-BMkaOjBS.js → index-CAqiqqdd.js}

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

package/lib/assets/modules/{index-BOYtm8ib.js → index-CvQ24Mzh.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-BkChvyed.js";
+import { _ as m } from "./index-D0njzOzQ.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-BedljASx.js";
+import { P as M, d as P, o as $, b as K } from "./uploadList-B6MIYOtN.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";

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

package/lib/assets/modules/{menuTabs-BFPjaQRI.js → menuTabs-NVgroqVO.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-XOgjdQdO.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-BedljASx.js";
+import { a as w, _ as b } from "./toolIcon-BuqRfX4F.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-B6MIYOtN.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-XOgjdQdO.js → toolIcon-BuqRfX4F.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-BedljASx.js";
+import { c as S } from "./uploadList-B6MIYOtN.js";
 const T = /* @__PURE__ */ i({
   __name: "index",
   props: {

package/lib/assets/modules/{uploadList-BedljASx.js → uploadList-B6MIYOtN.js}

@@ -1,11 +1,11 @@
 var ma = Object.defineProperty;
 var va = (e, t, a) => t in e ? ma(e, t, { enumerable: !0, configurable: !0, writable: !0, value: a }) : e[t] = a;
 var $ = (e, t, a) => va(e, typeof t != "symbol" ? t + "" : t, a);
-import { inject as te, ref as f, provide as Le, watch as g, toRaw as Ze, h as U, nextTick as ga, shallowRef as K, defineComponent as X, reactive as ya, onMounted as xe, onUnmounted as ie, createBlock as Ae, createCommentVNode as B, openBlock as E, unref as b, mergeProps as le, useAttrs as Ee, createElementBlock as L, createVNode as C, withCtx as V, createTextVNode as Oe, toDisplayString as z, Fragment as ne, renderList as Ue, normalizeClass as ea, createElementVNode as Sa } from "vue";
+import { inject as te, ref as f, provide as Le, watch as g, toRaw as Ze, h as U, nextTick as ga, shallowRef as K, defineComponent as X, reactive as ya, onMounted as xe, onUnmounted as ie, createBlock as Ae, createCommentVNode as B, openBlock as E, unref as b, mergeProps as le, useAttrs as Ee, createElementBlock as L, createVNode as z, withCtx as V, createTextVNode as Oe, toDisplayString as C, Fragment as ne, renderList as Ue, normalizeClass as ea, createElementVNode as Sa } from "vue";
 import { Switch as ba, AutoComplete as Ia, Input as xa, CheckboxGroup as Aa, Checkbox as Ea, RadioGroup as Oa, Radio as Ra, Select as Ta, SelectOption as wa } from "ant-design-vue";
 import { createPinia as Pa, defineStore as ue } from "pinia";
 import ka from "pinia-plugin-persistedstate";
-import { combineParams as ce, EnvConfig as ye, AppAction as Be, AppSource as Ce, isMicroApp as Se, mainAppApis as N, isBaseMicroApp as La } from "@skyfox2000/microbase";
+import { combineParams as ce, EnvConfig as ye, AppAction as Be, AppSource as ze, isMicroApp as Se, mainAppApis as N, isBaseMicroApp as La } from "@skyfox2000/microbase";
 import { ResStatus as T, httpPost as G, setToken as me, fieldMapping as $a, parseFieldTemplate as be, API_HOST as $e, SERVER_HOST as Fa } from "@skyfox2000/fapi";
 import x from "vue-m-message";
 import He from "async-validator";
@@ -229,7 +229,7 @@ const fe = {
   loadingState: e.isTreeLoading,
   loadingText: !1,
   processParams: () => ce(e.treeQuery, t)
-}).then((a) => (a == null ? void 0 : a.status) === T.SUCCESS ? (e.data.value = a.data, e.data.value) : []);
+}).then((a) => (a == null ? void 0 : a.status) === T.SUCCESS ? (e.data.value = a.data || [], e.afterLoad && e.afterLoad(e.data.value), e.data.value) : (e.afterLoad && e.afterLoad((a == null ? void 0 : a.data) || []), []));
 let re;
 const Ft = (e) => {
   re = new He({}), re.messages({
@@ -418,7 +418,7 @@ const Ft = (e) => {
   ).then((n) => {
     var o, r;
     if ((n == null ? void 0 : n.status) === T.SUCCESS)
-      x.success("保存成功！"), e.grid && (e.grid.reload.value = !0), e.afterSave && e.afterSave(), e.autoClose !== !1 && (e.visible.value = !1);
+      x.success("保存成功！"), e.grid && (e.grid.reload.value = !0), e.afterSave && e.afterSave(n), e.autoClose !== !1 && (e.visible.value = !1);
     else if (n != null && n.msg && ((o = n == null ? void 0 : n.msg) == null ? void 0 : o.indexOf("Duplicate entry")) > -1) {
       const l = (r = n == null ? void 0 : n.msg) == null ? void 0 : r.match(/Duplicate entry '([^']+)' for key '([^']+)'/);
       if (l && l.length > 2 && l[1] && l[2]) {
@@ -437,8 +437,9 @@ const Ft = (e) => {
         }
         x.error(`保存失败！数据 \`${u}\` 已存在！`);
       } else x.error((n == null ? void 0 : n.msg) ?? "保存失败！");
+      e.afterSave && e.afterSave(n);
     } else
-      x.error((n == null ? void 0 : n.msg) ?? "保存失败！");
+      x.error((n == null ? void 0 : n.msg) ?? "保存失败！"), e.afterSave && e.afterSave(n);
   });
 }, Vt = async (e) => {
   const t = e.page, a = e.grid;
@@ -628,7 +629,7 @@ const Ja = (e) => {
       AppCode: "",
       Version: "",
       Host: "",
-      Source: Ce.Manual,
+      Source: ze.Manual,
       Action: Be.App,
       Path: "",
       Icon: "",
@@ -797,7 +798,7 @@ const Ja = (e) => {
         AppCode: "",
         Version: "",
         Host: "",
-        Source: Ce.Manual,
+        Source: ze.Manual,
         Action: Be.App,
         Path: "",
         Icon: "",
@@ -812,7 +813,7 @@ const Ja = (e) => {
     }
   },
   persist: !1
-}), ia = "Token解析失败", ze = "登录过期，请重新登录", je = {
+}), ia = "Token解析失败", Ce = "登录过期，请重新登录", je = {
   login: {
     api: "PLATFORM_API",
     url: "/openapi/LoginSrv/login",
@@ -838,14 +839,14 @@ const Ja = (e) => {
     Query: e
   };
   return G(je.login, t).then((a) => (a == null ? void 0 : a.status) === T.SUCCESS ? a : null);
-}, Ca = (e) => {
+}, za = (e) => {
   let t = {
     Query: {
       AppId: e
     }
   };
   return G(je.auth, t).then((a) => (a == null ? void 0 : a.status) === T.SUCCESS ? a.data : (x.error("获取授权信息失败，" + (a == null ? void 0 : a.msg)), null));
-}, za = () => {
+}, Ca = () => {
   let e = {
     Option: {},
     Query: {}
@@ -858,10 +859,10 @@ const Ja = (e) => {
   } catch (t) {
     return console.error(ia, t), !0;
   }
-}, Me = (e, t) => e == "" ? (x.error(ze, {
+}, Me = (e, t) => e == "" ? (x.error(Ce, {
   duration: 3e3,
   onClose: t
-}), !1) : Ya(e) ? (x.error(ze, {
+}), !1) : Ya(e) ? (x.error(Ce, {
   duration: 3e3,
   onClose: t
 }), !1) : !0, Xa = (e) => {
@@ -928,7 +929,7 @@ const Ja = (e) => {
       if (ee.value && ee.value.appId === e)
         return !0;
       try {
-        const t = await Ca(e);
+        const t = await za(e);
         return t ? (ee.value = {
           appId: e,
           permits: t.permits || [],
@@ -1026,7 +1027,7 @@ const Ja = (e) => {
      */
     async logout() {
       try {
-        await za();
+        await Ca();
       } catch (e) {
         console.error("调用登出接口失败", e);
       } finally {
@@ -1085,9 +1086,12 @@ const Ja = (e) => {
       return s.rows ? (e.tableData.value = s.rows, e.total.value = s.total) : (e.tableData.value = a.data, e.total.value = a.data.length, s = {
         total: e.total.value,
         rows: a.data
-      }, e.afterLoad && e.afterLoad(s)), s;
+      }), e.afterLoad && e.afterLoad(s), s;
     }
-    return e.tableData.value = [], e.total.value = 0, {
+    return e.tableData.value = [], e.total.value = 0, e.afterLoad && e.afterLoad({
+      total: 0,
+      rows: []
+    }), {
       total: 0,
       rows: []
     };
@@ -1432,7 +1436,7 @@ const q = new at(), Z = (e, t, a) => {
   ), {
     gridCtrl: s
   };
-}, Ct = (e, t) => {
+}, zt = (e, t) => {
   ke(e);
   const a = {
     ...S.TreeOption,
@@ -1475,7 +1479,7 @@ const q = new at(), Z = (e, t, a) => {
   ), {
     optionCtrl: a
   };
-}, zt = (e, t, a) => {
+}, Ct = (e, t, a) => {
   ke(e);
   const s = {
     ...S.PageOption,
@@ -1968,7 +1972,7 @@ const q = new at(), Z = (e, t, a) => {
     }), (y, A) => {
       var h;
       return E(), L("div", null, [
-        C(b(Ia), le({
+        z(b(Ia), le({
           value: l.value,
           "onUpdate:value": A[0] || (A[0] = (I) => l.value = I),
           class: ["w-full", (h = b(i)) == null ? void 0 : h.errClass],
@@ -1977,10 +1981,10 @@ const q = new at(), Z = (e, t, a) => {
           onSelect: O
         }, b(s), { "allow-clear": !1 }), {
           option: V(({ label: I }) => [
-            Oe(z(I), 1)
+            Oe(C(I), 1)
           ]),
           default: V(() => [
-            C(b(xa), {
+            z(b(xa), {
               "allow-clear": "",
               placeholder: "请输入并选择" + b(c)
             }, null, 8, ["placeholder"])
@@ -2047,7 +2051,7 @@ const q = new at(), Z = (e, t, a) => {
     }), ie(() => {
       r && de(r, a);
     }), (y, A) => (E(), L("div", mt, [
-      C(b(Aa), le({
+      z(b(Aa), le({
         onChange: p,
         class: "w-full mb-[-3px]"
       }, b(s)), {
@@ -2066,11 +2070,11 @@ const q = new at(), Z = (e, t, a) => {
               ])
             }, {
               default: V(() => [
-                Oe(z(h.label), 1)
+                Oe(C(h.label), 1)
               ]),
               _: 2
             }, 1032, ["value", "disabled", "class"]);
-          }), 128)) : e.nodata ? (E(), L("div", vt, z(e.nodata), 1)) : B("", !0)
+          }), 128)) : e.nodata ? (E(), L("div", vt, C(e.nodata), 1)) : B("", !0)
         ]),
         _: 1
       }, 16)
@@ -2147,7 +2151,7 @@ const q = new at(), Z = (e, t, a) => {
     }), ie(() => {
       r && de(r, a);
     }), (h, I) => (E(), L("div", gt, [
-      C(b(Oa), le({
+      z(b(Oa), le({
         value: u.value,
         "onUpdate:value": I[0] || (I[0] = (R) => u.value = R),
         autocheck: !1,
@@ -2172,12 +2176,12 @@ const q = new at(), Z = (e, t, a) => {
                 ])
               }, {
                 default: V(() => [
-                  Oe(z(R.label), 1)
+                  Oe(C(R.label), 1)
                 ]),
                 _: 2
               }, 1032, ["checked", "value", "class"])) : B("", !0)
             ], 64);
-          }), 128)) : e.nodata ? (E(), L("div", yt, z(e.nodata), 1)) : B("", !0)
+          }), 128)) : e.nodata ? (E(), L("div", yt, C(e.nodata), 1)) : B("", !0)
         ]),
         _: 1
       }, 16, ["value"])
@@ -2299,10 +2303,10 @@ const q = new at(), Z = (e, t, a) => {
       var _, We, qe;
       return E(), L("div", null, [
         (We = (_ = b(i)) == null ? void 0 : _.url) != null && We.loading ? (E(), L("div", St, [
-          C(b(De), { class: "text-[#555] mx-[5px] !ml-[10px] !w-4 !h-4" }),
+          z(b(De), { class: "text-[#555] mx-[5px] !ml-[10px] !w-4 !h-4" }),
           P[1] || (P[1] = Sa("span", null, "数据加载中...", -1))
         ])) : B("", !0),
-        C(b(Ta), le({
+        z(b(Ta), le({
           class: [(qe = b(r)) == null ? void 0 : qe.errClass, "w-full"],
           value: d.value,
           "onUpdate:value": P[0] || (P[0] = (W) => d.value = W),
@@ -2320,7 +2324,7 @@ const q = new at(), Z = (e, t, a) => {
                 value: W.value
               }, {
                 default: V(() => [
-                  Oe(z(W.label), 1)
+                  Oe(C(W.label), 1)
                 ]),
                 _: 2
               }, 1032, ["value"])) : B("", !0)
@@ -2343,8 +2347,8 @@ export {
   Bt as G,
   rt as H,
   ot as I,
-  Ct as J,
-  zt as K,
+  zt as J,
+  Ct as K,
   nt as L,
   fa as M,
   Yt as N,

package/lib/assets/modules/{uploadList-CW7OIDS3.js → uploadList-KG6kpOaY.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-BkChvyed.js";
-import { a as z, _ as L } from "./toolIcon-XOgjdQdO.js";
+import { _ as ne } from "./index-D0njzOzQ.js";
+import { a as z, _ as L } from "./toolIcon-BuqRfX4F.js";
 import { httpPost as D, ResStatus as I } from "@skyfox2000/fapi";
-import { s as ae, _ as se } from "./uploadList-BedljASx.js";
-import { p as R, U as s } from "./file-upload-JBIvw5Xx.js";
+import { s as ae, _ as se } from "./uploadList-B6MIYOtN.js";
+import { p as R, U as s } from "./file-upload-CmnCEJze.js";
 import { combineParams as V } from "@skyfox2000/microbase";
 import k from "vue-m-message";
 import "async-validator";

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-XOgjdQdO.js";
+import { _ as q } from "../../assets/modules/toolIcon-BuqRfX4F.js";
 import "@skyfox2000/fapi";
-import "../../assets/modules/uploadList-BedljASx.js";
+import "../../assets/modules/uploadList-B6MIYOtN.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { _ as D } from "../../assets/modules/index-BOYtm8ib.js";
+import { _ as D } from "../../assets/modules/index-CvQ24Mzh.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,6 +1,6 @@
 import { defineComponent as f, ref as d, watch as _, onMounted as v, resolveComponent as h, createBlock as o, openBlock as t, withCtx as s, createElementVNode as C, normalizeClass as x, createVNode as w, KeepAlive as y, unref as n, resolveDynamicComponent as I } from "vue";
-import { _ as g } from "../../assets/modules/baseLayout-B9dSxkYo.js";
-import { ad as A, a as S } from "../../assets/modules/uploadList-BedljASx.js";
+import { _ as g } from "../../assets/modules/baseLayout-Bz3oRE5o.js";
+import { ad as A, a as S } from "../../assets/modules/uploadList-B6MIYOtN.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import b 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-BedljASx.js";
+import { r as s } from "../../assets/modules/uploadList-B6MIYOtN.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-BedljASx.js";
+import { r as s } from "../../assets/modules/uploadList-B6MIYOtN.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 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-BkChvyed.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 n, 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-D0njzOzQ.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-BedljASx.js";
-import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-JBIvw5Xx.js";
+import { E as Te, a1 as Se, a7 as Ee } from "../../assets/modules/uploadList-B6MIYOtN.js";
+import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-CmnCEJze.js";
 import "@skyfox2000/microbase";
 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-BMkaOjBS.js";
+import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-CAqiqqdd.js";
 import "dayjs";
 import "vue-draggable-next";
 import "async-validator";
@@ -197,12 +197,12 @@ const Be = (l) => l.includes(",") || l.includes(`
           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, {
+        const r = new Re(t, 1), u = q.value || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", i = new File([L.value], y.value, {
           type: u
         }), c = De.join(((o = F.value) == null ? void 0 : o.basePath) ?? "", y.value), v = {
           uid: "1",
           name: y.value,
-          originFileObj: n,
+          originFileObj: i,
           status: ce.Uploading,
           percent: 0,
           params: {
@@ -220,9 +220,9 @@ const Be = (l) => l.includes(",") || l.includes(`
     }, ye = async (t) => {
       if (a.formData.value) {
         if (e.excelRecordsKey || e.excelRowsKey) {
-          const n = await Ne(L.value);
-          if (!n) return null;
-          const { excelData: c, excelRows: v } = n, x = c.map((N) => {
+          const i = await Ne(L.value);
+          if (!i) return null;
+          const { excelData: c, excelRows: v } = i, x = c.map((N) => {
             var Q;
             const w = {};
             for (const O in N) {
@@ -247,14 +247,14 @@ const Be = (l) => l.includes(",") || l.includes(`
           return;
         a.isFormSaving.value = !0;
         try {
-          const n = await Ee(e.excelCtrl, {
+          const i = await Ee(e.excelCtrl, {
             params: u,
             urlKey: "save",
             url: e.excelCtrl.saveUrl
           });
-          (n == null ? void 0 : n.status) === fe.SUCCESS && (a.afterSave && a.afterSave(), a.visible.value = !1);
-        } catch (n) {
-          console.error("保存错误：", n), p.error("数据保存失败，请稍后再试！");
+          (i == null ? void 0 : i.status) === fe.SUCCESS && (a.afterSave && a.afterSave(i), a.visible.value = !1);
+        } catch (i) {
+          console.error("保存错误：", i), p.error("数据保存失败，请稍后再试！");
         } finally {
           a.isFormSaving.value = !1;
         }
@@ -268,11 +268,11 @@ const Be = (l) => l.includes(",") || l.includes(`
           const {
             errBlob: r,
             validationMsg: u,
-            duplicateMsg: n,
+            duplicateMsg: i,
             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) {
+          if (V.value = u, P.value = i, 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;
@@ -288,9 +288,9 @@ const Be = (l) => l.includes(",") || l.includes(`
         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";
+      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"), i = e.fileType || "both";
       let c = !1, v = "";
-      switch (n) {
+      switch (i) {
         case "excel":
           c = r, v = "只能上传Excel文件!";
           break;
@@ -306,7 +306,7 @@ const Be = (l) => l.includes(",") || l.includes(`
         return p.error(v), ue.LIST_IGNORE;
       try {
         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-BMkaOjBS.js").then((he) => he.j), M = await G(O, t.name);
+          const w = await t.arrayBuffer(), O = new TextDecoder("utf-8").decode(w), { csvToExcelView: G } = await import("../../assets/modules/index-CAqiqqdd.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();
@@ -348,7 +348,7 @@ const Be = (l) => l.includes(",") || l.includes(`
     };
     return s({
       clearAll: A
-    }), (t, o) => (d(), H(i(Fe), {
+    }), (t, o) => (d(), H(n(Fe), {
       title: t.title ?? "文件上传",
       open: m.value,
       "onUpdate:open": o[0] || (o[0] = (r) => m.value = r),
@@ -357,22 +357,22 @@ const Be = (l) => l.includes(",") || l.includes(`
       onClose: se
     }, {
       footer: S(() => [
-        C(i(_e), null, {
+        C(n(_e), null, {
           default: S(() => {
             var r;
             return [
-              C(i(Y), { onClick: se }, {
+              C(n(Y), { onClick: se }, {
                 default: S(() => [
                   X(E(t.cancelText ?? (z.value ? "关闭" : "取消")), 1)
                 ]),
                 _: 1
               }),
-              z.value ? K("", !0) : (d(), H(i(Y), {
+              z.value ? K("", !0) : (d(), H(n(Y), {
                 key: 0,
                 onClick: me,
                 type: "primary",
-                loading: ((r = i(a)) == null ? void 0 : r.isFormSaving.value) ?? !1,
-                disabled: !b.value || U.value || k.value || i(a).isFormLoading.value
+                loading: ((r = n(a)) == null ? void 0 : r.isFormSaving.value) ?? !1,
+                disabled: !b.value || U.value || k.value || n(a).isFormLoading.value
               }, {
                 default: S(() => [
                   X(E(t.saveText ?? "上传文件"), 1)
@@ -388,7 +388,7 @@ const Be = (l) => l.includes(",") || l.includes(`
         J(t.$slots, "default"),
         z.value ? K("", !0) : (d(), g("div", $e, [
           J(t.$slots, "file-before"),
-          C(i(ue), {
+          C(n(ue), {
             "file-list": le.value,
             "before-upload": xe,
             accept: de.value,
@@ -396,7 +396,7 @@ const Be = (l) => l.includes(",") || l.includes(`
             disabled: !te.value
           }, {
             default: S(() => [
-              C(i(Y), {
+              C(n(Y), {
                 type: "primary",
                 disabled: !te.value
               }, {
@@ -409,7 +409,7 @@ const Be = (l) => l.includes(",") || l.includes(`
             _: 1
           }, 8, ["file-list", "accept", "disabled"]),
           b.value && y.value ? (d(), g("div", je, [
-            C(i(Z), {
+            C(n(Z), {
               message: y.value,
               type: "info",
               "show-icon": !1
@@ -418,15 +418,15 @@ const Be = (l) => l.includes(",") || l.includes(`
           J(t.$slots, "file-after")
         ])),
         h("div", Ae, [
-          i(a).isFormLoading.value ? (d(), H(i(Le), {
+          n(a).isFormLoading.value ? (d(), H(n(Le), {
             key: 0,
             size: "large"
           })) : K("", !0),
           h("div", {
-            class: Ce(["flex-shrink-0 relative border border-gray-200 rounded-md overflow-hidden", [i(j).length === 0 ? "w-[100%]" : "w-[80%]"]]),
+            class: Ce(["flex-shrink-0 relative border border-gray-200 rounded-md overflow-hidden", [n(j).length === 0 ? "w-[100%]" : "w-[80%]"]]),
             style: { height: "430px" }
           }, [
-            C(i(Ve), {
+            C(n(Ve), {
               src: b.value,
               onError: ge,
               style: { width: "100%", height: "100%" },
@@ -440,31 +440,31 @@ const Be = (l) => l.includes(",") || l.includes(`
               }
             }, null, 8, ["src"])
           ], 2),
-          i(j).length > 0 ? (d(), g("div", Oe, [
+          n(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), {
+              n(j).length === 0 ? (d(), g("div", Ie, "没有设置验证规则")) : (d(), g("div", qe, [
+                C(n(Z), {
                   message: V.value,
                   type: B.value,
                   "show-icon": "",
                   class: "mb-2"
                 }, null, 8, ["message", "type"]),
                 h("div", Qe, [
-                  (d(!0), g(ie, null, ne(i(j), (r, u) => (d(), g("div", {
+                  (d(!0), g(ie, null, ne(n(j), (r, u) => (d(), g("div", {
                     key: u,
                     class: "border-b pb-0"
                   }, [
                     h("div", We, E(r.field), 1),
                     h("ul", He, [
-                      (d(!0), g(ie, null, ne(r.rules, (n, c) => (d(), g("li", {
+                      (d(!0), g(ie, null, ne(r.rules, (i, c) => (d(), g("li", {
                         key: c,
                         class: "text-[12px] text-gray-600"
-                      }, E(n), 1))), 128))
+                      }, E(i), 1))), 128))
                     ])
                   ]))), 128))
                 ]),
                 _.value && _.value.length > 0 ? (d(), g("div", Je, [
-                  C(i(Z), {
+                  C(n(Z), {
                     message: P.value,
                     type: $.value,
                     "show-icon": "",

package/lib/es/MenuLayout/index.js

@@ -1,6 +1,6 @@
 import { defineComponent as f, ref as d, watch as _, onMounted as v, resolveComponent as h, createBlock as o, openBlock as t, withCtx as s, createElementVNode as C, normalizeClass as x, createVNode as w, KeepAlive as I, unref as n, resolveDynamicComponent as g } from "vue";
-import { _ as y } from "../../assets/modules/baseLayout-B9dSxkYo.js";
-import { ad as A, a as S } from "../../assets/modules/uploadList-BedljASx.js";
+import { _ as y } from "../../assets/modules/baseLayout-Bz3oRE5o.js";
+import { ad as A, a as S } from "../../assets/modules/uploadList-B6MIYOtN.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import k from "vue-m-message";

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-BkChvyed.js";
+import { _ as c } from "../../assets/modules/index-D0njzOzQ.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-BedljASx.js";
+import { a3 as h } from "../../assets/modules/uploadList-B6MIYOtN.js";
 import "@skyfox2000/microbase";
 import L from "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { A as N } from "../../assets/modules/file-upload-JBIvw5Xx.js";
+import { A as N } from "../../assets/modules/file-upload-CmnCEJze.js";
 import "vue-draggable-next";
-import { U as B } from "../../assets/modules/uploadList-CW7OIDS3.js";
+import { U as B } from "../../assets/modules/uploadList-KG6kpOaY.js";
 const K = /* @__PURE__ */ y({
   __name: "uploadForm",
   props: {

package/lib/typings/form.d.ts

@@ -76,7 +76,7 @@ export type EditorControl<T> = EditorControlOption & {
     * @param editorCtrl 表单配置数据
     * @param pageCtrl 页面控制器
     */
-   afterSave?: () => void | undefined;
+   afterSave?: (result: ApiResponse<any>) => void | undefined;
    /**
     * 表单数据
     * - Model对象

package/lib/typings/tree.d.ts

@@ -69,4 +69,8 @@ export type TreeControl = TreeControlOption & {
     * 是否正在加载中
     */
    isTreeLoading: Ref<boolean>;
+   /**
+    * 表格数据加载后回调
+    */
+   afterLoad?: (result: TreeNode[] | null) => void;
 };

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 Pe, b as Ze, d as ea, e as Ee, 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 Y, B as ma, C as ha, D as ga, E as Be } from "./assets/modules/uploadList-BedljASx.js";
-import { a9 as Tl, N as $l, Q as Il, U as Dl, a8 as Pl, a6 as El, a7 as Fl, aa as Nl, X as Ml, S as Bl, a4 as Rl, a1 as Al, L as Ol, a3 as Ll, T as zl, G as Ul, Z as Vl, a2 as Yl, a5 as Kl, M as Wl, R as Hl, ab as jl, F as Ql, a0 as ql, ac as Gl, W as Jl, Y as Xl, V as Zl, ad as es, H as as, I as ts, ae as ls, K as ss, af as rs, J as os, $ as ns } from "./assets/modules/uploadList-BedljASx.js";
-import { A as cs, U as us, a as ds, g as ps, c as fs, d as vs, p as ms, u as hs, b as gs } from "./assets/modules/file-upload-JBIvw5Xx.js";
+import { u as Je, i as Z, a as me, c as Xe, P as j, o as Pe, b as Ze, d as ea, e as Ee, 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 Y, B as ma, C as ha, D as ga, E as Be } from "./assets/modules/uploadList-B6MIYOtN.js";
+import { a9 as Tl, N as $l, Q as Il, U as Dl, a8 as Pl, a6 as El, a7 as Fl, aa as Nl, X as Ml, S as Bl, a4 as Rl, a1 as Al, L as Ol, a3 as Ll, T as zl, G as Ul, Z as Vl, a2 as Yl, a5 as Kl, M as Wl, R as Hl, ab as jl, F as Ql, a0 as ql, ac as Gl, W as Jl, Y as Xl, V as Zl, ad as es, H as as, I as ts, ae as ls, K as ss, af as rs, J as os, $ as ns } from "./assets/modules/uploadList-B6MIYOtN.js";
+import { A as cs, U as us, a as ds, g as ps, c as fs, d as vs, p as ms, u as hs, b as gs } from "./assets/modules/file-upload-CmnCEJze.js";
 import { EnvConfig as we } from "@skyfox2000/microbase";
 import { FrontCache as re, httpPost as Re, ResStatus as Ae, 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 _e, MenuItem as xe, Dropdown as ve, Checkbox as Da, Table as Ye, Tree as Pa, Cascader as Ea, DatePicker as Fa, Input as ee, InputPassword as Na, InputNumber as Ma, RangePicker as Ba, Textarea as Ra, TimePicker as Aa, Transfer as Oa, TreeSelect as La, LayoutContent as za } from "ant-design-vue";
 import { VueDraggableNext as Ua } from "vue-draggable-next";
-import { d as Ke } from "./assets/modules/uploadList-CW7OIDS3.js";
-import { C as _s, U as xs, a as ys, p as ks } from "./assets/modules/uploadList-CW7OIDS3.js";
-import { c as We } from "./assets/modules/index-BMkaOjBS.js";
-import { _ as Ss, h as Cs, b as Ts, a as $s, d as Is, e as Ds, g as Ps, f as Es, n as Fs, p as Ns, t as Ms, v as Bs } from "./assets/modules/index-BMkaOjBS.js";
-import { _ as O } from "./assets/modules/index-BkChvyed.js";
-import { _ as U } from "./assets/modules/toolIcon-XOgjdQdO.js";
-import { a as As } from "./assets/modules/toolIcon-XOgjdQdO.js";
-import { _ as Ls, b as zs, c as Us, d as Vs, e as Ys, I as Ks, f as Ws, g as Hs, a as js } from "./assets/modules/menuTabs-BFPjaQRI.js";
-import { _ as qs } from "./assets/modules/index-BOYtm8ib.js";
+import { d as Ke } from "./assets/modules/uploadList-KG6kpOaY.js";
+import { C as _s, U as xs, a as ys, p as ks } from "./assets/modules/uploadList-KG6kpOaY.js";
+import { c as We } from "./assets/modules/index-CAqiqqdd.js";
+import { _ as Ss, h as Cs, b as Ts, a as $s, d as Is, e as Ds, g as Ps, f as Es, n as Fs, p as Ns, t as Ms, v as Bs } from "./assets/modules/index-CAqiqqdd.js";
+import { _ as O } from "./assets/modules/index-D0njzOzQ.js";
+import { _ as U } from "./assets/modules/toolIcon-BuqRfX4F.js";
+import { a as As } from "./assets/modules/toolIcon-BuqRfX4F.js";
+import { _ as Ls, b as zs, c as Us, d as Vs, e as Ys, I as Ks, f as Ws, g as Hs, a as js } from "./assets/modules/menuTabs-NVgroqVO.js";
+import { _ as qs } from "./assets/modules/index-CvQ24Mzh.js";
 import { _ as q } from "./assets/modules/_plugin-vue_export-helper-CHgC5LLL.js";
 const Te = (s, a, e, t = "remove") => {
   if (!e)
@@ -616,7 +616,7 @@ const Gt = async (s, a) => {
       if (!a.rule)
         return !1;
       const o = f(a.rule.split("."), (p = t == null ? void 0 : t.formRules) == null ? void 0 : p.value);
-      return o ? o.required ?? !0 : (Ta.error(`"${a.label}" 的验证规则 \`${a.rule}\` 不存在`), i.value.errClass = "text-[#ff4d4f]", i.value.msg = `规则 \`${a.rule}\` 不存在，请检查代码！`, !0);
+      return o ? (o.required || (i.value.errClass = "", i.value.msg = ""), o.required ?? !0) : (Ta.error(`"${a.label}" 的验证规则 \`${a.rule}\` 不存在`), i.value.errClass = "text-[#ff4d4f]", i.value.msg = `规则 \`${a.rule}\` 不存在，请检查代码！`, !0);
     });
     return (o, p) => (m(), S("div", {
       class: E(["relative", o.bottomMargin ? o.bottomMargin : "mb-1"])

package/package.json

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

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

@@ -413,7 +413,7 @@ const dialogSave = async (uploadFile: UploadFile) => {
 
          if (result?.status === ResStatus.SUCCESS) {
             if (excelCtrl.afterSave) {
-               excelCtrl.afterSave();
+               excelCtrl.afterSave(result);
             }
             excelCtrl.visible.value = false;
          }

package/src/components/content/form/formItem.vue

@@ -81,6 +81,11 @@ const required = computed(() => {
       errInfo.value.msg = `规则 \`${props.rule}\` 不存在，请检查代码！`;
       return true;
    }
+   if (!rule.required) {
+      // 如果rule.required为false，则表示该字段是可选字段，不需要验证
+      errInfo.value.errClass = '';
+      errInfo.value.msg = '';
+   }
    return rule.required ?? true;
 });
 

package/src/typings/form.d.ts

@@ -77,7 +77,7 @@ export type EditorControl<T> = EditorControlOption & {
     * @param editorCtrl 表单配置数据
     * @param pageCtrl 页面控制器
     */
-   afterSave?: () => void | undefined;
+   afterSave?: (result: ApiResponse<any>) => void | undefined;
    /**
     * 表单数据
     * - Model对象

package/src/typings/tree.d.ts

@@ -70,4 +70,8 @@ export type TreeControl = TreeControlOption & {
     * 是否正在加载中
     */
    isTreeLoading: Ref<boolean>;
+   /**
+    * 表格数据加载后回调
+    */
+   afterLoad?: (result: TreeNode[] | null) => void;
 };

package/src/utils/form.ts

@@ -95,7 +95,7 @@ export const saveForm = async <T>(editorCtrl: EditorControl<T>): Promise<void> =
          }
 
          if (editorCtrl.afterSave) {
-            editorCtrl.afterSave();
+            editorCtrl.afterSave(result);
          }
          if (editorCtrl!.autoClose !== false) {
             editorCtrl!.visible.value = false;
@@ -128,8 +128,14 @@ export const saveForm = async <T>(editorCtrl: EditorControl<T>): Promise<void> =
             }
             message.error(`保存失败！数据 \`${fieldValue}\` 已存在！`);
          } else message.error(result?.msg ?? '保存失败！');
+         if (editorCtrl.afterSave) {
+            editorCtrl.afterSave(result);
+         }
       } else {
          message.error(result?.msg ?? '保存失败！');
+         if (editorCtrl.afterSave) {
+            editorCtrl.afterSave(result);
+         }
       }
    });
 };

package/src/utils/table.ts

@@ -140,14 +140,19 @@ export const gridQueryFind = <T>(gridCtrl: GridControl<T>): Promise<FindResult>
                total: gridCtrl.total.value,
                rows: result.data as unknown as Record<string, any>[],
             };
-
-            if (gridCtrl.afterLoad) gridCtrl.afterLoad(findResult);
          }
+         if (gridCtrl.afterLoad) gridCtrl.afterLoad(findResult);
          return findResult;
       }
 
       gridCtrl.tableData.value = [];
       gridCtrl.total.value = 0;
+      if (gridCtrl.afterLoad) {
+         gridCtrl.afterLoad({
+            total: 0,
+            rows: [],
+         });
+      }
       return {
          total: 0,
          rows: [],

package/src/utils/tree.ts

@@ -20,9 +20,11 @@ export const queryTree = (treeCtrl: TreeControl, params?: ReqParams): Promise<Tr
       },
    }).then((result: ApiResponse<TreeNode> | null) => {
       if (result?.status === ResStatus.SUCCESS) {
-         treeCtrl.data.value = result.data as unknown as TreeNode[];
-         return treeCtrl.data.value as unknown as TreeNode[];
+         treeCtrl.data.value = (result.data as unknown as TreeNode[]) || [];
+         if (treeCtrl.afterLoad) treeCtrl.afterLoad(treeCtrl.data.value);
+         return treeCtrl.data.value;
       }
+      if (treeCtrl.afterLoad) treeCtrl.afterLoad((result?.data as unknown as TreeNode[]) || []);
       return [];
    });
 };