@vtj/renderer 0.8.168 → 0.8.170

package/dist/index.mjs

@@ -1,18 +1,18 @@
-import { Base as Se, BUILT_IN_COMPONENTS as $e, ProjectModel as I, HistoryModel as ne } from "@vtj/core";
-import { isUrl as je, url as b, dedupArray as Ee, isString as $, isFunction as Y, logger as A, createRequest as Pe, merge as be, pathToRegexp as Re, pathToRegexpMatch as Ce, formDataToJson as Fe, storage as k, cookie as T, toArray as Q, delay as re, camelCase as j, upperFirst as xe, pick as Ie, jsonp as Ae, loadScript as X, Request as He, Storage as Oe, mapToObject as q } from "@vtj/utils";
+import { Base as $e, BUILT_IN_COMPONENTS as je, ProjectModel as I, HistoryModel as ne } from "@vtj/core";
+import { isUrl as Ee, url as b, dedupArray as Pe, isString as $, isFunction as Y, logger as D, createRequest as be, merge as Re, pathToRegexp as Ce, pathToRegexpMatch as Fe, formDataToJson as xe, storage as k, cookie as T, toArray as Q, unAES as Ie, MD5 as De, delay as re, camelCase as j, upperFirst as Ae, pick as Oe, jsonp as He, loadScript as X, Request as Me, Storage as ke, mapToObject as q } from "@vtj/utils";
 import * as O from "vue";
-import { inject as oe, toRef as De, readonly as Me, customRef as ke, ref as J, onBeforeUnmount as Te, getCurrentScope as Be, onScopeDispose as Ue, unref as Ne, getCurrentInstance as ie, watch as ae, computed as ce, onMounted as Le, defineComponent as ue, h as U, defineAsyncComponent as Z, watchEffect as qe } from "vue";
+import { inject as oe, toRef as Te, readonly as Be, customRef as Ue, ref as J, onBeforeUnmount as Ne, getCurrentScope as Le, onScopeDispose as qe, unref as Je, getCurrentInstance as ie, watch as ae, computed as ce, onMounted as Ve, defineComponent as ue, h as U, defineAsyncComponent as Z, watchEffect as ze } from "vue";
 import { useRoute as le } from "vue-router";
-import { ElNotification as D, ElLoading as Je } from "element-plus";
-import { XStartup as Ve } from "@vtj/ui";
+import { ElNotification as H, ElLoading as Ke } from "element-plus";
+import { XStartup as We } from "@vtj/ui";
 /**!
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/renderer 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.8.168
+ * @version 0.8.170
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const R = "0.8.168";
+const R = "0.8.170";
 var _ = /* @__PURE__ */ ((n) => (n.Runtime = "Runtime", n.Design = "Design", n.Raw = "Raw", n.VNode = "VNode", n))(_ || {});
 const ee = [
   "$el",
@@ -26,7 +26,7 @@ const ee = [
   "$props",
   "$options",
   "$forceUpdate"
-], os = [
+], us = [
   "beforeCreate",
   "created",
   "beforeMount",
@@ -40,7 +40,7 @@ const ee = [
   "renderTriggered",
   "activated",
   "deactivated"
-], ze = ["vIf", "vShow", "vModel", "vFor", "vBind"], Ke = {
+], Ge = ["vIf", "vShow", "vModel", "vFor", "vBind"], Ye = {
   String,
   Number,
   Boolean,
@@ -50,7 +50,7 @@ const ee = [
   Date
 };
 function F(n, e) {
-  return n.map((t) => je(t) || t.startsWith("/") ? t : `${e}${t}`);
+  return n.map((t) => Ee(t) || t.startsWith("/") ? t : `${e}${t}`);
 }
 function V(n) {
   return /\.css$/.test(n);
@@ -58,42 +58,42 @@ function V(n) {
 function z(n) {
   return /\.js$/.test(n);
 }
-function We(n) {
+function Qe(n) {
   return /\.json$/.test(n);
 }
-function is(n) {
+function ls(n) {
   return n.map(
     (e) => `<script src="${b.append(e, { v: R })}"><\/script>`
   ).join("");
 }
-function as(n = []) {
+function fs(n = []) {
   return n.map(
     (e) => `<link rel="stylesheet" href="${b.append(e, { v: R })}" />`
   ).join("");
 }
-function Ge(n, e = !1) {
+function Xe(n, e = !1) {
   return e && n.endsWith(".prod.js") ? n.replace(".prod.js", ".js") : n;
 }
-function Ye(n, e, t = !1) {
-  const s = n.filter((l) => !!l.enabled), r = [], o = [], a = [], i = [], u = {}, c = {}, p = [], f = {};
+function Ze(n, e, t = !1) {
+  const s = n.filter((f) => !!f.enabled), r = [], o = [], a = [], i = [], u = {}, c = {}, p = [], l = {};
   return s.forEach(
-    ({ urls: l, assetsUrl: m, library: d, assetsLibrary: h, localeLibrary: w }) => {
-      l?.forEach((v) => {
-        z(v) && r.push(Ge(v, t)), V(v) && o.push(v);
-      }), d && (i.push(d), u[d] = F(l || [], e), w && (c[d] = w)), m && a.push(m), h && p.push(h), d && h && (f[h] = d);
+    ({ urls: f, assetsUrl: m, library: d, assetsLibrary: h, localeLibrary: w }) => {
+      f?.forEach((v) => {
+        z(v) && r.push(Xe(v, t)), V(v) && o.push(v);
+      }), d && (i.push(d), u[d] = F(f || [], e), w && (c[d] = w)), m && a.push(m), h && p.push(h), d && h && (l[h] = d);
     }
   ), {
     scripts: F(r, e),
     css: F(o, e),
     materials: F(a, e),
     libraryExports: i,
-    materialExports: Ee(p),
-    materialMapLibrary: f,
+    materialExports: Pe(p),
+    materialMapLibrary: l,
     libraryMap: u,
     libraryLocaleMap: c
   };
 }
-function Qe(n, e) {
+function et(n, e) {
   const { name: t, parent: s, alias: r } = n;
   return s ? e[s]?.[r || t] : e[r || t];
 }
@@ -115,11 +115,11 @@ function de(n, e, t) {
     o ? o.innerHTML = t : (o = r.createElement("style"), o.id = e, o.innerHTML = t, r.head.appendChild(o));
   }
 }
-async function Xe(n, e) {
+async function tt(n, e) {
   const t = await window.fetch(e).then((s) => s.text()).catch(() => "");
   t && de(window, n, t);
 }
-function Ze(n, e = window) {
+function st(n, e = window) {
   const t = e.document, s = e.document.head;
   for (const r of n)
     if (!t.getElementById(r)) {
@@ -127,7 +127,7 @@ function Ze(n, e = window) {
       a.rel = "stylesheet", a.id = r, a.href = r, s.appendChild(a);
     }
 }
-async function et(n, e, t = window) {
+async function nt(n, e, t = window) {
   const s = t.document, r = t.document.head;
   let o = t[e];
   return o ? o.default || o : new Promise((a, i) => {
@@ -141,7 +141,7 @@ async function et(n, e, t = window) {
     }
   });
 }
-function tt(n) {
+function rt(n) {
   return Y(n) || Y(n?.install);
 }
 function C(n, e, t = !1, s = !1) {
@@ -154,13 +154,13 @@ function C(n, e, t = !1, s = !1) {
     const a = `with(${t ? "{}" : "$scope || {}"}) { ${o} }`;
     return new Function("$scope", a)(e);
   } catch (r) {
-    if (A.error("parseExpression.error", r, n, e?.__self ?? e), s)
+    if (D.error("parseExpression.error", r, n, e?.__self ?? e), s)
       throw r;
   }
 }
 function te(n, e, t = !1, s = !1) {
   const r = C(n, e, t, s);
-  if (typeof r != "function" && (A.error(
+  if (typeof r != "function" && (D.error(
     "parseFunction.error",
     "not a function",
     n,
@@ -175,14 +175,14 @@ function S(n) {
 function M(n) {
   return typeof n == "object" && n && n.type === "JSFunction";
 }
-function st(n) {
+function ot(n) {
   return S(n) || M(n);
 }
-function cs(n) {
-  return st(n) ? n.value : JSON.stringify(n);
+function ds(n) {
+  return ot(n) ? n.value : JSON.stringify(n);
 }
 let E = null;
-const nt = Pe({
+const it = be({
   settings: {
     type: "form",
     validSuccess: !0,
@@ -191,12 +191,12 @@ const nt = Pe({
     validate: (n) => n.data?.code === 0 || !!n.data?.success,
     failMessage: !0,
     showError: (n) => {
-      D.error({
+      H.error({
         message: n || "未知错误"
       });
     },
     showLoading: () => {
-      E && E.close(), E = Je.service({
+      E && E.close(), E = Ke.service({
         lock: !0,
         text: "Loading",
         background: "rgba(0, 0, 0, 0.05)"
@@ -208,7 +208,7 @@ const nt = Pe({
   }
 });
 let P;
-function rt(n, e) {
+function at(n, e) {
   const { jsonp: t, request: s } = e;
   if (n.method === "jsonp")
     return (r = {}) => t(n.url, {
@@ -224,10 +224,10 @@ function rt(n, e) {
         headers: r
       }
     };
-    return (a, i) => (delete o.data, s.send(be(o, i || {}, { data: a })));
+    return (a, i) => (delete o.data, s.send(Re(o, i || {}, { data: a })));
   }
 }
-function ot(n, e) {
+function ct(n, e) {
   const { metaQuery: t } = e;
   if (!t) return;
   const { code: s, queryCode: r } = n;
@@ -239,26 +239,26 @@ function ot(n, e) {
     return t(s, r, o, a);
   };
 }
-function it(n = [], e = [], t) {
+function ut(n = [], e = [], t) {
   const s = {};
   for (const r of n)
-    s[r.id] = rt(r, t);
+    s[r.id] = at(r, t);
   for (const r of e)
-    s[r.id] = ot(r, t);
+    s[r.id] = ct(r, t);
   return s;
 }
-async function at(n = []) {
+async function lt(n = []) {
   P = await import("mockjs").then((e) => e.default || e), P && (P.setup({
     timeout: "50-500"
-  }), pe(), n.forEach((e) => ct(P, e)));
+  }), pe(), n.forEach((e) => ft(P, e)));
 }
-function ct(n, e) {
+function ft(n, e) {
   if (!e.mock) return;
   const { url: t, mockTemplate: s } = e;
   if (t && s) {
-    const r = Re(`${t}(.*)`), o = Ce(t, { decode: decodeURIComponent }), a = C(s, {}, !0);
+    const r = Ce(`${t}(.*)`), o = Fe(t, { decode: decodeURIComponent }), a = C(s, {}, !0);
     n.mock(r, (i) => {
-      const u = b.parse(i.url) || {}, c = i.body instanceof FormData ? Fe(i.body) : i.body, p = o(i.url)?.params;
+      const u = b.parse(i.url) || {}, c = i.body instanceof FormData ? xe(i.body) : i.body, p = o(i.url)?.params;
       return Object.assign(i, { data: c, params: u, query: p }), n.mock(a(i));
     });
   }
@@ -266,7 +266,7 @@ function ct(n, e) {
 function pe() {
   P && (P._mocked = {});
 }
-const ut = {
+const dt = {
   session: !1,
   authKey: "Authorization",
   storageKey: "ACCESS_STORAGE",
@@ -277,12 +277,12 @@ const ut = {
   unauthorizedCode: 401,
   unauthorizedMessage: "登录已经失效，请重新登录！"
 }, he = Symbol("access");
-class us {
+class ps {
   options;
   data = null;
   mode = _.Raw;
   constructor(e) {
-    this.options = Object.assign({}, ut, e), this.loadData();
+    this.options = Object.assign({}, dt, e), this.loadData();
   }
   connect(e) {
     const { mode: t, router: s, request: r } = e;
@@ -290,10 +290,10 @@ class us {
   }
   login(e) {
     const { storageKey: t, storagePrefix: s, session: r, authKey: o } = this.options;
-    this.data = e, k.save(t, e, {
+    this.setData(e), this.data && (k.save(t, e, {
       type: "local",
       prefix: s
-    }), r && T.set(o, e.token);
+    }), r && T.set(o, this.data.token));
   }
   clear() {
     const { storageKey: e, storagePrefix: t, session: s, authKey: r } = this.options;
@@ -310,7 +310,7 @@ class us {
   }
   can(e) {
     const { permissions: t = {} } = this.data || {};
-    return Q(e).every((r) => t[r]);
+    return typeof e == "function" ? e(t) : Q(e).every((r) => t[r]);
   }
   some(e) {
     const { permissions: t = {} } = this.data || {};
@@ -335,22 +335,39 @@ class us {
     const s = t ? `?${t}=${encodeURIComponent(location.href)}` : "";
     typeof e == "function" ? e(s) : location.href = t ? `${e}${s}` : e;
   }
+  setData(e) {
+    const { crypto: t } = this.options;
+    if (typeof e == "string")
+      try {
+        this.data = JSON.parse(
+          t ? Ie(e, De(t.toLowerCase())) : e
+        );
+      } catch (s) {
+        console.warn(s);
+      }
+    else
+      this.data = e;
+  }
   loadData() {
-    const { storageKey: e, storagePrefix: t } = this.options;
-    this.data = k.get(e, {
+    const { storageKey: e, storagePrefix: t } = this.options, s = k.get(e, {
       type: "local",
       prefix: t
     });
+    this.setData(s);
   }
   isLogined() {
     const { session: e, authKey: t } = this.options;
     return e && t ? !!T.get(t) : !!this.data;
   }
+  hasRoutePermission(e) {
+    const t = e.params.id;
+    return t && this.can(t);
+  }
   setGuard(e) {
     e.beforeEach((t, s, r) => this.guard(t, r));
   }
   guard(e, t) {
-    if (this.isWhiteList(e) || this.isLogined() || this.isAuthPath(e))
+    if (this.isWhiteList(e) || this.isLogined() || this.isAuthPath(e) || this.hasRoutePermission(e))
       return t();
     t(!1), this.toLogin();
   }
@@ -379,11 +396,10 @@ class us {
     );
   }
 }
-function ls() {
-  const n = oe(he, null);
-  return n || console.warn("access is null"), n;
+function pt() {
+  return oe(he, null);
 }
-class lt {
+class ht {
   __id = null;
   __mode;
   __instance = null;
@@ -493,53 +509,53 @@ function N(n) {
     $components: s,
     $libs: r,
     $apis: o
-  }, c = new lt({
+  }, c = new ht({
     mode: t,
     dsl: i.value,
     attrs: u
   }), p = e.defineComponent({
     name: i.value.name,
     props: {
-      ...dt(i.value.props ?? [], c)
+      ...vt(i.value.props ?? [], c)
     },
-    setup(f) {
-      c.$props = f, c.props = f, i.value.id && de(
+    setup(l) {
+      c.$props = l, c.props = l, i.value.id && de(
         n.window || window,
         i.value.id,
         i.value.css || ""
-      ), c.state = pt(e, i.value.state ?? {}, c);
-      const l = ht(e, i.value.computed ?? {}, c), m = mt(i.value.methods ?? {}, c), d = vt(e, i.value.inject, c), h = gt(
+      ), c.state = gt(e, i.value.state ?? {}, c);
+      const f = yt(e, i.value.computed ?? {}, c), m = _t(i.value.methods ?? {}, c), d = wt(e, i.value.inject, c), h = St(
         i.value.dataSources || {},
         c
       ), w = {
         ...d,
-        ...l,
+        ...f,
         ...m,
         ...h
       };
-      return c.setup(w, e), yt(e, i.value.watch ?? [], c), {
+      return c.setup(w, e), $t(e, i.value.watch ?? [], c), {
         vtj: c
       };
     },
-    emits: ft(i.value.emits),
+    emits: mt(i.value.emits),
     expose: ["vtj"],
     render() {
       if (!i.value.nodes) return null;
-      const f = i.value.nodes || [];
-      return f.length === 1 ? H(f[0], c, e, a) : f.map((l) => H(l, c, e, a));
+      const l = i.value.nodes || [];
+      return l.length === 1 ? A(l[0], c, e, a) : l.map((f) => A(f, c, e, a));
     },
-    ..._t(i.value.lifeCycles ?? {}, c)
+    ...jt(i.value.lifeCycles ?? {}, c)
   });
   return {
     renderer: e.markRaw(p),
     context: c
   };
 }
-function ft(n = []) {
+function mt(n = []) {
   return n.map((e) => $(e) ? e : e.name);
 }
-function dt(n = [], e) {
-  const t = (s) => s ? (Array.isArray(s) ? s : [s]).map((o) => Ke[o]) : void 0;
+function vt(n = [], e) {
+  const t = (s) => s ? (Array.isArray(s) ? s : [s]).map((o) => Ye[o]) : void 0;
   return n.map((s) => $(s) ? {
     name: s
   } : {
@@ -556,7 +572,7 @@ function dt(n = [], e) {
     {}
   );
 }
-function pt(n, e, t) {
+function gt(n, e, t) {
   return n.reactive(
     Object.keys(e || {}).reduce(
       (s, r) => {
@@ -567,19 +583,19 @@ function pt(n, e, t) {
     )
   );
 }
-function ht(n, e, t) {
+function yt(n, e, t) {
   return Object.entries(e ?? {}).reduce(
     (s, [r, o]) => (s[r] = n.computed(t.__parseFunction(o)), s),
     {}
   );
 }
-function mt(n, e) {
+function _t(n, e) {
   return Object.entries(n ?? {}).reduce(
     (t, [s, r]) => (t[s] = e.__parseFunction(r), t),
     {}
   );
 }
-function vt(n, e = [], t) {
+function wt(n, e = [], t) {
   return e.reduce(
     (s, r) => {
       const { name: o, from: a } = r || {};
@@ -590,7 +606,7 @@ function vt(n, e = [], t) {
     {}
   );
 }
-function gt(n, e) {
+function St(n, e) {
   return Object.keys(n).reduce(
     (t, s) => {
       const r = n[s], o = e.$apis[r.ref], a = M(r.transform) ? r.transform.value ? e.__parseFunction(r.transform) : void 0 : r.transform;
@@ -602,7 +618,7 @@ function gt(n, e) {
     {}
   );
 }
-function yt(n, e = [], t) {
+function $t(n, e = [], t) {
   e.forEach((s) => {
     n.watch(
       t.__parseExpression(s.source),
@@ -614,19 +630,19 @@ function yt(n, e = [], t) {
     );
   });
 }
-function _t(n, e) {
+function jt(n, e) {
   return Object.entries(n ?? {}).reduce(
     (t, [s, r]) => (t[s] = e.__parseFunction(r), t),
     {}
   );
 }
 let B = [];
-const wt = (n) => n;
+const Et = (n) => n;
 async function me(n, e = window) {
   const { urls: t = [], library: s } = n, r = t.filter((i) => z(i));
   if (r.length === 0 || !s) return null;
   const o = t.filter((i) => V(i));
-  return o.length && Ze(o, e), await et(r, s, e).catch(
+  return o.length && st(o, e), await nt(r, s, e).catch(
     (i) => (console.warn("loadScriptUrl error", r, s, i), null)
   );
 }
@@ -657,41 +673,41 @@ function L(n) {
     return i || (console.warn("getPlugin result is null", o), null);
   })) : r;
 }
-function H(n, e, t = O, s = wt) {
+function A(n, e, t = O, s = Et) {
   if (!n || !n.name || n.invisible) return null;
-  const { id: r = null, directives: o = [] } = n, { vIf: a, vFor: i, vShow: u, vModels: c, vBind: p } = St(o);
-  if (a && !$t(a, e))
+  const { id: r = null, directives: o = [] } = n, { vIf: a, vFor: i, vShow: u, vModels: c, vBind: p } = Pt(o);
+  if (a && !bt(a, e))
     return null;
-  const f = (l) => {
-    const m = l.$components, d = (() => {
+  const l = (f) => {
+    const m = f.$components, d = (() => {
       if (n.name === "component")
-        return jt(l, n.props?.is);
+        return Rt(f, n.props?.is);
       if (n.name === "slot") return n.name;
       const g = s(n.name, n.from, t);
       return $(g) ? m[g] ?? g : g;
-    })(), h = Et(r, n.props ?? {}, l), w = Pt(t, n.events ?? {}, l);
+    })(), h = Ct(r, n.props ?? {}, f), w = Ft(t, n.events ?? {}, f);
     if (n.name === "slot")
-      return bt(t, n, h, l, s);
-    p && Object.assign(h, l.__parseExpression(p.value)), u && (h.style = Object.assign(
+      return xt(t, n, h, f, s);
+    p && Object.assign(h, f.__parseExpression(p.value)), u && (h.style = Object.assign(
       h.style ?? {},
-      Ct(u, l)
+      Dt(u, f)
     )), c.forEach((g) => {
-      Object.assign(h, Ft(t, g, l));
+      Object.assign(h, At(t, g, f));
     });
-    const v = xt(
+    const v = Ot(
       t,
       n.children ?? [],
-      l,
+      f,
       s,
       n
     );
     return t.createVNode(d, { ...h, ...w }, v);
   };
-  return i ? Ht(i, f, e) : f(e);
+  return i ? kt(i, l, e) : l(e);
 }
-function St(n = []) {
+function Pt(n = []) {
   const e = n.find((i) => j(i.name) === "vIf"), t = n.find((i) => j(i.name) === "vFor"), s = n.find((i) => j(i.name) === "vShow"), r = n.find((i) => j(i.name) === "vBind"), o = n.filter((i) => j(i.name) === "vModel"), a = n.filter(
-    (i) => !ze.includes(j(i.name))
+    (i) => !Ge.includes(j(i.name))
   );
   return {
     vIf: e,
@@ -702,13 +718,13 @@ function St(n = []) {
     others: a
   };
 }
-function $t(n, e) {
+function bt(n, e) {
   return !!e.__parseExpression(n.value);
 }
-function jt(n, e) {
+function Rt(n, e) {
   return e ? S(e) ? n.__parseExpression(e) : e : "div";
 }
-function Et(n, e, t) {
+function Ct(n, e, t) {
   const s = Object.keys(e || {}).reduce(
     (r, o) => {
       let a = e[o];
@@ -718,7 +734,7 @@ function Et(n, e, t) {
   );
   return s.ref = t.__ref(n, s.ref), s;
 }
-function Pt(n, e, t) {
+function Ft(n, e, t) {
   const s = ["passive", "capture", "once"], r = {
     capture: "Capture",
     once: "Once",
@@ -726,8 +742,8 @@ function Pt(n, e, t) {
   };
   return Object.keys(e || {}).reduce(
     (o, a) => {
-      const i = e[a], u = ve(i.modifiers), c = u.find((l) => s.includes(l)), p = "on" + xe(a) + (c && r[c] || ""), f = t.__parseFunction(i.handler);
-      return f && (o[p] = n.withModifiers(f, u)), o;
+      const i = e[a], u = ve(i.modifiers), c = u.find((f) => s.includes(f)), p = "on" + Ae(a) + (c && r[c] || ""), l = t.__parseFunction(i.handler);
+      return l && (o[p] = n.withModifiers(l, u)), o;
     },
     {}
   );
@@ -736,27 +752,27 @@ function ve(n = {}, e = !1) {
   const t = Object.keys(n);
   return e ? t.map((s) => "." + s) : t;
 }
-function bt(n, e, t, s, r) {
-  const { children: o } = e, a = Rt(e, s), i = s.$slots?.[a.name];
+function xt(n, e, t, s, r) {
+  const { children: o } = e, a = It(e, s), i = s.$slots?.[a.name];
   return i ? i(t) : o ? $(o) ? n.createTextVNode(o) : S(o) ? n.createTextVNode(
     fe(s.__parseExpression(o))
   ) : Array.isArray(o) ? o.map(
-    (u) => H(u, s, n, r)
+    (u) => A(u, s, n, r)
   ) : null : null;
 }
-function Rt(n, e) {
+function It(n, e) {
   const { props: t } = n, s = t?.name || "default";
   return {
     name: S(s) ? e.__parseExpression(s) : s,
     params: []
   };
 }
-function Ct(n, e) {
+function Dt(n, e) {
   return e.__parseExpression(n.value) ? {} : {
     display: "none"
   };
 }
-function Ft(n, e, t) {
+function At(n, e, t) {
   const s = {
     type: "JSFunction",
     value: e.value?.value ? `(v) => {
@@ -768,7 +784,7 @@ function Ft(n, e, t) {
     [`onUpdate:${a}`]: o.length && r ? n.withModifiers(r, o) : r
   };
 }
-function xt(n, e, t, s, r) {
+function Ot(n, e, t, s, r) {
   if (!e) return null;
   if ($(e))
     return { default: () => e };
@@ -777,19 +793,19 @@ function xt(n, e, t, s, r) {
       default: () => fe(t.__parseExpression(e))
     };
   if (Array.isArray(e) && e.length > 0) {
-    const o = It(e), a = (i) => !i || !r ? {} : r?.id && Object.keys(i).length ? {
+    const o = Ht(e), a = (i) => !i || !r ? {} : r?.id && Object.keys(i).length ? {
       [`scope_${r.id}`]: i
     } : {};
-    return Object.entries(o).reduce((i, [u, { nodes: c, params: p }]) => (i[u] = (f) => {
-      const l = p.length ? Ie(f ?? {}, p) : a(f);
+    return Object.entries(o).reduce((i, [u, { nodes: c, params: p }]) => (i[u] = (l) => {
+      const f = p.length ? Oe(l ?? {}, p) : a(l);
       return c.map(
-        (m) => H(m, t.__clone(l), n, s)
+        (m) => A(m, t.__clone(f), n, s)
       );
     }, i), {});
   }
   return null;
 }
-function It(n) {
+function Ht(n) {
   const e = {
     default: {
       params: [],
@@ -797,7 +813,7 @@ function It(n) {
     }
   };
   for (const t of n) {
-    const s = At(t.slot), r = s.name;
+    const s = Mt(t.slot), r = s.name;
     e[r] ? (e[r].nodes.push(t), e[r].params = e[r].params.concat(s.params)) : e[r] = {
       nodes: [t],
       params: s.params
@@ -805,103 +821,103 @@ function It(n) {
   }
   return e;
 }
-function At(n = "default") {
+function Mt(n = "default") {
   return $(n) ? { name: n, params: [] } : { params: [], ...n };
 }
-function Ht(n, e, t) {
+function kt(n, e, t) {
   const { value: s, iterator: r } = n, { item: o = "item", index: a = "index" } = r || {};
   let i = t.__parseExpression(s) || [];
   return Number.isInteger(i) && (i = new Array(i).fill(!0).map((u, c) => c + 1)), Array.isArray(i) ? i.map((u, c) => e(t.__clone({ [o]: u, [a]: c }))) : (console.warn("[vForRender]:", `${s?.value} is not a Arrary`), []);
 }
-function Ot(n) {
-  return Be() ? (Ue(n), !0) : !1;
+function Tt(n) {
+  return Le() ? (qe(n), !0) : !1;
 }
 function K(n) {
-  return typeof n == "function" ? n() : Ne(n);
+  return typeof n == "function" ? n() : Je(n);
 }
 const ge = typeof window < "u" && typeof document < "u";
 typeof WorkerGlobalScope < "u" && globalThis instanceof WorkerGlobalScope;
-const Dt = (n) => n != null, Mt = () => {
+const Bt = (n) => n != null, Ut = () => {
 };
-function kt(n) {
+function Nt(n) {
   return ie();
 }
-function Tt(...n) {
+function Lt(...n) {
   if (n.length !== 1)
-    return De(...n);
+    return Te(...n);
   const e = n[0];
-  return typeof e == "function" ? Me(ke(() => ({ get: e, set: Mt }))) : J(e);
+  return typeof e == "function" ? Be(Ue(() => ({ get: e, set: Ut }))) : J(e);
 }
-function Bt(n, e) {
-  kt() && Te(n, e);
+function qt(n, e) {
+  Nt() && Ne(n, e);
 }
-const Ut = ge ? window : void 0, Nt = ge ? window.document : void 0;
-function Lt(n) {
+const Jt = ge ? window : void 0, Vt = ge ? window.document : void 0;
+function zt(n) {
   var e;
   const t = K(n);
   return (e = t?.$el) != null ? e : t;
 }
-function qt() {
+function Kt() {
   const n = J(!1), e = ie();
-  return e && Le(() => {
+  return e && Ve(() => {
     n.value = !0;
   }, e), n;
 }
-function Jt(n) {
-  const e = qt();
+function Wt(n) {
+  const e = Kt();
   return ce(() => (e.value, !!n()));
 }
-function Vt(n, e, t = {}) {
-  const { window: s = Ut, ...r } = t;
+function Gt(n, e, t = {}) {
+  const { window: s = Jt, ...r } = t;
   let o;
-  const a = Jt(() => s && "MutationObserver" in s), i = () => {
+  const a = Wt(() => s && "MutationObserver" in s), i = () => {
     o && (o.disconnect(), o = void 0);
   }, u = ce(() => {
-    const l = K(n), m = (Array.isArray(l) ? l : [l]).map(Lt).filter(Dt);
+    const f = K(n), m = (Array.isArray(f) ? f : [f]).map(zt).filter(Bt);
     return new Set(m);
   }), c = ae(
     () => u.value,
-    (l) => {
-      i(), a.value && l.size && (o = new MutationObserver(e), l.forEach((m) => o.observe(m, r)));
+    (f) => {
+      i(), a.value && f.size && (o = new MutationObserver(e), f.forEach((m) => o.observe(m, r)));
     },
     { immediate: !0, flush: "post" }
-  ), p = () => o?.takeRecords(), f = () => {
+  ), p = () => o?.takeRecords(), l = () => {
     c(), i();
   };
-  return Ot(f), {
+  return Tt(l), {
     isSupported: a,
-    stop: f,
+    stop: l,
     takeRecords: p
   };
 }
-function zt(n = null, e = {}) {
+function Yt(n = null, e = {}) {
   var t, s, r;
   const {
-    document: o = Nt,
-    restoreOnUnmount: a = (f) => f
-  } = e, i = (t = o?.title) != null ? t : "", u = Tt((s = n ?? o?.title) != null ? s : null), c = n && typeof n == "function";
-  function p(f) {
+    document: o = Vt,
+    restoreOnUnmount: a = (l) => l
+  } = e, i = (t = o?.title) != null ? t : "", u = Lt((s = n ?? o?.title) != null ? s : null), c = n && typeof n == "function";
+  function p(l) {
     if (!("titleTemplate" in e))
-      return f;
-    const l = e.titleTemplate || "%s";
-    return typeof l == "function" ? l(f) : K(l).replace(/%s/g, f);
+      return l;
+    const f = e.titleTemplate || "%s";
+    return typeof f == "function" ? f(l) : K(f).replace(/%s/g, l);
   }
   return ae(
     u,
-    (f, l) => {
-      f !== l && o && (o.title = p(typeof f == "string" ? f : ""));
+    (l, f) => {
+      l !== f && o && (o.title = p(typeof l == "string" ? l : ""));
     },
     { immediate: !0 }
-  ), e.observe && !e.titleTemplate && o && !c && Vt(
+  ), e.observe && !e.titleTemplate && o && !c && Gt(
     (r = o.head) == null ? void 0 : r.querySelector("title"),
     () => {
       o && o.title !== u.value && (u.value = p(o.title));
     },
     { childList: !0 }
-  ), Bt(() => {
+  ), qt(() => {
     if (a) {
-      const f = a(i, u.value || "");
-      f != null && o && (o.title = f);
+      const l = a(i, u.value || "");
+      l != null && o && (o.title = l);
     }
   }), u;
 }
@@ -909,7 +925,7 @@ const se = ue({
   name: "VtjPageContainer",
   async setup() {
     const n = _e(), e = le(), t = e.params.id, s = t ? n.getPage(t) : n.getHomepage(), r = s ? await n.getRenderComponent(s.id) : null;
-    return s && zt(s.title || "VTJ"), {
+    return s && Yt(s.title || "VTJ"), {
       provider: n,
       component: r,
       file: s,
@@ -919,14 +935,14 @@ const se = ue({
   render() {
     return this.component ? U(this.component, this.query) : U("div", "页面不存在");
   }
-}), Kt = ue({
+}), Qt = ue({
   name: "VtjStartupContainer",
   render() {
-    return U(Ve);
+    return U(We);
   }
 }), ye = Symbol("Provider");
-var Wt = /* @__PURE__ */ ((n) => (n.Production = "production", n.Development = "development", n))(Wt || {});
-class Gt extends Se {
+var Xt = /* @__PURE__ */ ((n) => (n.Production = "production", n.Development = "development", n))(Xt || {});
+class Zt extends $e {
   constructor(e) {
     super(), this.options = e;
     const {
@@ -939,18 +955,18 @@ class Gt extends Se {
       globals: u = {},
       modules: c = {},
       router: p = null,
-      materialPath: f = "./",
-      nodeEnv: l = "development"
+      materialPath: l = "./",
+      nodeEnv: f = "development"
       /* Development */
     } = e;
-    this.mode = s, this.modules = c, this.service = t, this.router = p, this.materialPath = f, this.nodeEnv = l, r && (this.dependencies = r), o && (this.materials = o), Object.assign(this.globals, u), Object.assign(this.adapter, i);
+    this.mode = s, this.modules = c, this.service = t, this.router = p, this.materialPath = l, this.nodeEnv = f, r && (this.dependencies = r), o && (this.materials = o), Object.assign(this.globals, u), Object.assign(this.adapter, i);
     const { access: m, request: d } = this.adapter;
     m && m.connect({ mode: s, router: p, request: d }), s !== _.Design && this.load(a);
   }
   mode;
   globals = {};
   modules = {};
-  adapter = { request: nt, jsonp: Ae };
+  adapter = { request: it, jsonp: He };
   apis = {};
   dependencies = {};
   materials = {};
@@ -967,7 +983,7 @@ class Gt extends Se {
     if (this.project = t ? await t() : await this.service.init(e), !this.project)
       throw new Error("project is null");
     const { apis: s = [], meta: r = [] } = this.project, o = window;
-    o.CKEDITOR_VERSION = void 0, this.nodeEnv !== "production" ? await this.loadAssets(o) : await this.loadDependencies(o), this.apis = it(s, r, this.adapter), pe(), this.project.config?.mock && at(s), this.initRouter(), this.triggerReady();
+    o.CKEDITOR_VERSION = void 0, this.nodeEnv !== "production" ? await this.loadAssets(o) : await this.loadDependencies(o), this.apis = ut(s, r, this.adapter), pe(), this.project.config?.mock && lt(s), this.initRouter(), this.triggerReady();
   }
   async loadDependencies(e) {
     const t = Object.entries(this.dependencies);
@@ -979,9 +995,9 @@ class Gt extends Se {
       libraryExports: u,
       libraryMap: c,
       materials: p,
-      materialExports: f,
-      materialMapLibrary: l
-    } = Ye(
+      materialExports: l,
+      materialMapLibrary: f
+    } = Ze(
       t,
       a,
       i === "development"
@@ -996,15 +1012,15 @@ class Gt extends Se {
       else {
         const v = c[d] || [];
         for (const g of v)
-          V(g) && await Xe(d, b.append(g, { v: R })), z(g) && await X(b.append(g, { v: R }));
+          V(g) && await tt(d, b.append(g, { v: R })), z(g) && await X(b.append(g, { v: R }));
         r[d] = e[d];
       }
     }
     for (const d of p)
       await X(b.append(d, { v: R }));
     const m = this.materials || {};
-    for (const d of f) {
-      const h = e[l[d]], w = $e[d];
+    for (const d of l) {
+      const h = e[f[d]], w = je[d];
       if (w)
         h && w.forEach((v) => {
           o[v] = h[v];
@@ -1012,7 +1028,7 @@ class Gt extends Se {
       else {
         const v = m[d] ? (await m[d]()).default : e[d];
         v && h && (v.components || []).forEach((g) => {
-          o[g.name] = Qe(g, h);
+          o[g.name] = et(g, h);
         });
       }
     }
@@ -1026,13 +1042,13 @@ class Gt extends Se {
     }), e.addRoute({
       path: "/",
       name: "VtjHomepage",
-      component: t?.homepage ? se : Kt
+      component: t?.homepage ? se : Qt
     }));
   }
   install(e) {
     const t = e.config.globalProperties.installed || {};
     for (const [s, r] of Object.entries(this.library))
-      !t[s] && tt(r) && (e.use(r), t[s] = !0);
+      !t[s] && rt(r) && (e.use(r), t[s] = !0);
     this.options.install && e.use(this.options.install), this.adapter.access && e.use(this.adapter.access), e.provide(ye, this), e.config.globalProperties.installed = t, this.nodeEnv === "development" && (e.config.errorHandler = (s, r, o) => {
       const a = r?.$options.name, i = typeof s == "string" ? s : s?.message || s?.msg || "未知错误", u = `[ ${a} ] ${i} ${o}`;
       console.error(
@@ -1043,8 +1059,8 @@ class Gt extends Se {
           info: o
         },
         s?.stack
-      ), D.error({
-        title: "运行时错误：请在控制台查看详情",
+      ), H.error({
+        title: "未处理的异常：请在控制台查看详情",
         message: u
       });
     });
@@ -1109,12 +1125,12 @@ class Gt extends Se {
   async getRenderComponent(e) {
     const t = this.getFile(e);
     if (!t)
-      return A.warn(`Can not find file: ${e}`), null;
+      return D.warn(`Can not find file: ${e}`), null;
     const s = `.vtj/vue/${e}.vue`, r = this.modules[s];
     if (r)
       return (await r())?.default;
     const o = await this.getDsl(t.id);
-    return o ? this.createDslRenderer(o).renderer : (A.warn(`Can not find dsl: ${e}`), null);
+    return o ? this.createDslRenderer(o).renderer : (D.warn(`Can not find dsl: ${e}`), null);
   }
   defineUrlSchemaComponent(e, t) {
     return Z(async () => {
@@ -1126,8 +1142,8 @@ class Gt extends Se {
     return Z(async () => await me(e, window));
   }
 }
-function fs(n) {
-  const e = new Gt(n);
+function hs(n) {
+  const e = new Zt(n);
   return {
     provider: e,
     onReady: (s) => e.ready(s)
@@ -1141,7 +1157,7 @@ function _e(n = {}) {
     const { id: t, version: s } = n;
     t && s && (async () => {
       const r = await e.getDsl(t);
-      r?.__VERSION__ !== s && D.warning({
+      r?.__VERSION__ !== s && H.warning({
         title: r?.name,
         message: "当前组件源码版本与运行时版本不一致，请重新发布组件"
       });
@@ -1149,7 +1165,7 @@ function _e(n = {}) {
   }
   return e;
 }
-const W = new He({
+const W = new Me({
   settings: {
     type: "json",
     validSuccess: !0,
@@ -1157,12 +1173,12 @@ const W = new He({
     failMessage: !0,
     validate: (n) => n.data?.code === 0,
     showError: (n) => {
-      D.error({
+      H.error({
         message: n || "未知错误"
       });
     }
   }
-}), Yt = (n = "/__vtj__/api/:type.json") => (e, t) => W.send({
+}), es = (n = "/__vtj__/api/:type.json") => (e, t) => W.send({
   url: n,
   method: "post",
   params: { type: e },
@@ -1170,7 +1186,7 @@ const W = new He({
     type: e,
     data: t
   }
-}), Qt = (n = "/__vtj__/api/uploader.json") => async (e, t) => await W.send({
+}), ts = (n = "/__vtj__/api/uploader.json") => async (e, t) => await W.send({
   url: n,
   method: "post",
   data: {
@@ -1186,7 +1202,7 @@ class G {
   pluginCaches = {};
   uploader;
   constructor() {
-    this.api = Yt(), this.uploader = Qt();
+    this.api = es(), this.uploader = ts();
   }
   async getExtension() {
     console.log("BaseService.getExtension");
@@ -1259,7 +1275,7 @@ class G {
     return await this.api("clearStaticFiles", e).catch(() => "");
   }
   async getPluginMaterial(e) {
-    const { urls: t = [] } = e, s = t.filter((o) => We(o))[0];
+    const { urls: t = [] } = e, s = t.filter((o) => Qe(o))[0];
     if (!s) return null;
     const r = this.pluginCaches[s];
     return r || (this.pluginCaches[s] = W.send({
@@ -1272,12 +1288,12 @@ class G {
     }).then((o) => o.data).catch(() => null));
   }
 }
-const y = new Oe({
+const y = new ke({
   type: "local",
   expired: 0,
   prefix: "__VTJ_"
 });
-class ds extends G {
+class ms extends G {
   init(e) {
     const t = new I(e), s = y.get(`project_${t.id}`), r = Object.assign(t.toDsl(), s || {});
     return y.save(`project_${t.id}`, r), Promise.resolve(r);
@@ -1327,7 +1343,7 @@ class ds extends G {
     }), Promise.resolve(!0);
   }
 }
-class Xt extends G {
+class ss extends G {
   projects = {};
   materials = {};
   files = {};
@@ -1385,10 +1401,10 @@ class Xt extends G {
   }
 }
 let x = null;
-function ps() {
-  return x || (x = new Xt(), x);
+function vs() {
+  return x || (x = new ss(), x);
 }
-class hs extends G {
+class gs extends G {
   getFileCaches = {};
   async getExtension() {
     return await this.api("getExtension", {}).catch(() => {
@@ -1456,82 +1472,93 @@ function we(n = []) {
     };
   });
 }
-function ms() {
-  const n = _e(), e = le(), t = J(!1), s = n.project;
-  qe(() => {
-    const { name: a, params: i, meta: u } = e;
-    if (a === "VtjPage") {
-      const c = n.getPage(i.id);
-      t.value = !c?.mask;
-    } else if (a === "VtjHomepage") {
-      const c = n.getHomepage();
-      t.value = !c?.mask;
+function Se(n, e) {
+  if (!e) return n;
+  let t = [];
+  for (const s of n)
+    if (s.children && s.children.length) {
+      const r = Se(s.children, e);
+      r.length && (s.children = r, t.push(s));
+    } else
+      e[s.id] && t.push(s);
+  return t;
+}
+function ys() {
+  const n = _e(), e = le(), t = pt(), s = J(!1), r = t?.getData(), o = n.project;
+  ze(() => {
+    const { name: u, params: c, meta: p } = e;
+    if (u === "VtjPage") {
+      const l = n.getPage(c.id);
+      s.value = !l?.mask;
+    } else if (u === "VtjHomepage") {
+      const l = n.getHomepage();
+      s.value = !l?.mask;
     } else
-      t.value = !u.mask;
+      s.value = !p.mask;
   });
-  const r = we(s?.pages), o = s?.config;
+  const a = we(o?.pages), i = o?.config;
   return {
-    disabled: t,
-    logo: o?.logo,
-    themeSwitchable: o?.themeSwitchable,
-    title: o?.title || s?.description || s?.name || "VTJ App",
-    menus: r
+    disabled: s,
+    logo: i?.logo,
+    themeSwitchable: i?.themeSwitchable,
+    title: i?.title || o?.description || o?.name || "VTJ App",
+    menus: Se(a, r?.permissions)
   };
 }
 export {
   he as ACCESS_KEY,
-  us as Access,
-  ze as BUILT_IN_DIRECTIVES,
+  ps as Access,
+  Ge as BUILT_IN_DIRECTIVES,
   G as BaseService,
   ee as CONTEXT_HOST,
-  lt as Context,
+  ht as Context,
   _ as ContextMode,
-  Ke as DATA_TYPES,
-  cs as JSCodeToString,
-  os as LIFE_CYCLES_LIST,
-  hs as LocalService,
-  Xt as MemoryService,
-  Wt as NodeEnv,
-  Gt as Provider,
-  ds as StorageService,
+  Ye as DATA_TYPES,
+  ds as JSCodeToString,
+  us as LIFE_CYCLES_LIST,
+  gs as LocalService,
+  ss as MemoryService,
+  Xt as NodeEnv,
+  Zt as Provider,
+  ms as StorageService,
   R as VTJ_RENDERER_VERSION,
   de as adoptedStyleSheets,
-  is as createAssetScripts,
-  as as createAssetsCss,
-  gt as createDataSources,
+  ls as createAssetScripts,
+  fs as createAssetsCss,
+  St as createDataSources,
   L as createLoader,
-  ps as createMemoryService,
-  ot as createMetaApi,
-  fs as createProvider,
+  vs as createMemoryService,
+  ct as createMetaApi,
+  hs as createProvider,
   N as createRenderer,
-  rt as createSchemaApi,
-  it as createSchemaApis,
-  wt as defaultLoader,
+  at as createSchemaApi,
+  ut as createSchemaApis,
+  Et as defaultLoader,
   F as fillBasePath,
   ve as getModifiers,
   me as getPlugin,
-  Qe as getRawComponent,
+  et as getRawComponent,
   V as isCSSUrl,
-  st as isJSCode,
+  ot as isJSCode,
   S as isJSExpression,
   M as isJSFunction,
-  We as isJSON,
+  Qe as isJSON,
   z as isJSUrl,
-  tt as isVuePlugin,
-  Xe as loadCss,
-  Ze as loadCssUrl,
-  et as loadScriptUrl,
-  ct as mockApi,
-  at as mockApis,
+  rt as isVuePlugin,
+  tt as loadCss,
+  st as loadCssUrl,
+  nt as loadScriptUrl,
+  ft as mockApi,
+  lt as mockApis,
   pe as mockCleanup,
-  H as nodeRender,
-  Ye as parseDeps,
+  A as nodeRender,
+  Ze as parseDeps,
   C as parseExpression,
   te as parseFunction,
   ye as providerKey,
-  Ge as removeProdFlag,
+  Xe as removeProdFlag,
   fe as toString,
-  ls as useAccess,
-  ms as useMask,
+  pt as useAccess,
+  ys as useMask,
   _e as useProvider
 };