mvframe 1.0.13 → 1.0.15

package/dist/index.js

@@ -1,6 +1,6 @@
 import { u as Ne } from "./util.js";
 import { d as Ke } from "./directive.js";
-import { s as Te, p as Ae, a as Fe } from "./store.js";
+import { s as Te, p as Ae, a as Fe } from "./store-shared.js";
 import { createRouter as De, createWebHistory as Be, useRoute as Me, useRouter as Ve } from "vue-router";
 import { computed as O, openBlock as b, createElementBlock as M, mergeProps as oe, unref as n, Fragment as Y, renderList as se, normalizeClass as F, createCommentVNode as K, createTextVNode as W, toDisplayString as L, reactive as H, onUnmounted as ce, watch as ne, markRaw as me, resolveComponent as E, createVNode as z, withCtx as V, createElementVNode as r, renderSlot as R, createBlock as B, resolveDynamicComponent as Oe, nextTick as ge, getCurrentInstance as ae, ref as G, onMounted as ee, normalizeStyle as Le, defineComponent as Ie, cloneVNode as _e, h as we, inject as he, withModifiers as $e, defineAsyncComponent as Pe, resolveDirective as Re, normalizeProps as de, guardReactiveProps as fe, createSlots as ie, withDirectives as He, useSlots as Ue, Transition as Ge, withKeys as Je, createStaticVNode as qe, useAttrs as ve, isRef as je, onBeforeMount as We } from "vue";
 /* empty css    */
@@ -2983,7 +2983,7 @@ const Tt = Ie({
 }, sl = {
   name: "Matt Avias Frame",
   copyright: "©2026",
-  version: "1.0.13",
+  version: "1.0.15",
   author: "Matt Avias",
   date: "2026-02-26",
   /** 默认语言 key，与 `$getLang`、localStorage `lang` 一致；业务在 app.use(mvframe, { config }) 里覆盖 */

package/dist/store-shared.js

@@ -0,0 +1,162 @@
+import { createPinia as p, defineStore as h } from "pinia";
+const T = () => ({
+  lang: "en_us",
+  /** 路由切换 / 异步页面 chunk 加载期间为 true，由 router guard 维护 */
+  pageLoading: !1
+}), y = {
+  saveData(t, e) {
+    this[t] = e;
+  },
+  setLang(t) {
+    this.lang = t;
+  },
+  setPageLoading(t) {
+    this.pageLoading = !!t;
+  }
+}, $ = {
+  state: T,
+  actions: y
+}, d = () => ({
+  useTab: !1,
+  // 是否使用tab
+  tabs: [],
+  ctab: {}
+  // current tab
+}), S = {
+  saveData(t, e) {
+    this[t] = e;
+  },
+  saveCurrentTab(t) {
+    this.ctab = t, localStorage.setItem("ctab", JSON.stringify(t));
+  },
+  saveTab(t) {
+    const { data: e, index: s } = this.tabs.filter1((r) => r.name === t.name);
+    if (e)
+      if (JSON.stringify(e.params) === JSON.stringify(t.params) && JSON.stringify(e.query) === JSON.stringify(t.query)) {
+        this.saveCurrentTab(e);
+        return;
+      } else
+        this.closeTab(e, s);
+    const { fullPath: a, name: n, meta: i, params: c, query: u } = t;
+    if (n !== "Login") {
+      const r = a.split("/");
+      let l;
+      r[r.length - 1] === "Home" ? l = r[r.length - 2] : l = r[r.length - 1], i.icon && (l = i.icon);
+      const b = {
+        name: n,
+        meta: i,
+        path: r,
+        params: c,
+        query: u,
+        icon: l
+      }, { index: m } = this.tabs.filter1((g) => g.name === this.ctab.name);
+      this.tabs.splice(m + 1, 0, b), this.saveCurrentTab(b);
+    }
+  },
+  closeTab(t, e) {
+    var s;
+    this.tabs.splice(e, 1), t.name === this.ctab.name && ((s = globalThis.$router) == null || s.push({ name: this.tabs[e - 1 > 0 ? e - 1 : 0].name }));
+  },
+  closeRightTab(t, e) {
+    var n;
+    const s = [];
+    let a = !1;
+    this.tabs.forEach((i, c) => {
+      e >= c ? s.push(i) : i.name === this.ctab.name && (a = !0);
+    }), this.tabs = s, a && ((n = globalThis.$router) == null || n.push({ name: t.name }));
+  },
+  closeLeftTab(t, e) {
+    var n;
+    const s = [];
+    let a = !1;
+    this.tabs.forEach((i, c) => {
+      e <= c ? s.push(i) : i.name === this.ctab.name && (a = !0);
+    }), this.tabs = s, a && ((n = globalThis.$router) == null || n.push({ name: t.name }));
+  },
+  closeOtherTab(t, e) {
+    var s;
+    this.tabs = [t], t.name !== this.ctab.name && ((s = globalThis.$router) == null || s.push({ name: t.name }));
+  },
+  closeAllTab() {
+    this.tabs = [];
+  }
+}, v = {}, w = {
+  state: d,
+  actions: S,
+  getters: v
+}, O = () => ({
+  type: "",
+  visible: !1,
+  options: [],
+  el: null,
+  position: {
+    x: 0,
+    y: 0
+  }
+}), L = {
+  saveData(t, e) {
+    this[t] = e;
+  },
+  show({ el: t, position: e }) {
+    this.visible = !0, e ? this.position = e : t && (this.el = t);
+  },
+  hide() {
+    this.visible = !1, this.el = null, this.position = {
+      x: 0,
+      y: 0
+    }, this.type = "";
+  }
+}, N = {}, J = {
+  state: O,
+  actions: L,
+  getters: N
+}, x = p(), o = {}, D = (t) => {
+  const e = t.match(/(?:^|[/\\])([^/\\]+)\.js$/);
+  return e ? e[1] : null;
+}, E = (t) => {
+  Object.entries(t).forEach(([e, s]) => {
+    const a = D(e);
+    if (!a || !(s != null && s.default)) {
+      console.warn(`Invalid store module: ${e}`);
+      return;
+    }
+    try {
+      o[a] = h(a, s.default);
+    } catch (n) {
+      console.error(`Failed to register store module '${a}':`, n);
+    }
+  });
+};
+o.init = h("init", $);
+o.tab = h("tab", w);
+o.rmenu = h("rmenu", J);
+const f = (t) => {
+  try {
+    switch (window.$getType(t)) {
+      case "Array":
+        t.forEach(f);
+        break;
+      case "String":
+        const s = localStorage.getItem(t);
+        s && o.tab().saveData(t, JSON.parse(s));
+        break;
+      default:
+        t = [], console.warn(`Invalid key: ${t}`);
+        break;
+    }
+  } catch (e) {
+    console.error(`Failed to parse '${t}' from localStorage:`, e);
+  }
+}, F = (t, { storeChips: e, useTab: s } = {}) => {
+  try {
+    t.use(x).provide("store", o);
+  } catch (a) {
+    throw new Error("Failed to inject store into app:", a);
+  }
+  return s && (o.tab().saveData("useTab", !0), f(["tabs", "ctab"])), e && E(e), o;
+};
+export {
+  F as a,
+  x as p,
+  o as s
+};

package/dist/store.js

@@ -1,162 +1,5 @@
-import { createPinia as p, defineStore as h } from "pinia";
-const T = () => ({
-  lang: "en_us",
-  /** 路由切换 / 异步页面 chunk 加载期间为 true，由 router guard 维护 */
-  pageLoading: !1
-}), y = {
-  saveData(t, e) {
-    this[t] = e;
-  },
-  setLang(t) {
-    this.lang = t;
-  },
-  setPageLoading(t) {
-    this.pageLoading = !!t;
-  }
-}, $ = {
-  state: T,
-  actions: y
-}, d = () => ({
-  useTab: !1,
-  // 是否使用tab
-  tabs: [],
-  ctab: {}
-  // current tab
-}), S = {
-  saveData(t, e) {
-    this[t] = e;
-  },
-  saveCurrentTab(t) {
-    this.ctab = t, localStorage.setItem("ctab", JSON.stringify(t));
-  },
-  saveTab(t) {
-    const { data: e, index: s } = this.tabs.filter1((r) => r.name === t.name);
-    if (e)
-      if (JSON.stringify(e.params) === JSON.stringify(t.params) && JSON.stringify(e.query) === JSON.stringify(t.query)) {
-        this.saveCurrentTab(e);
-        return;
-      } else
-        this.closeTab(e, s);
-    const { fullPath: a, name: n, meta: i, params: c, query: u } = t;
-    if (n !== "Login") {
-      const r = a.split("/");
-      let l;
-      r[r.length - 1] === "Home" ? l = r[r.length - 2] : l = r[r.length - 1], i.icon && (l = i.icon);
-      const b = {
-        name: n,
-        meta: i,
-        path: r,
-        params: c,
-        query: u,
-        icon: l
-      }, { index: m } = this.tabs.filter1((g) => g.name === this.ctab.name);
-      this.tabs.splice(m + 1, 0, b), this.saveCurrentTab(b);
-    }
-  },
-  closeTab(t, e) {
-    var s;
-    this.tabs.splice(e, 1), t.name === this.ctab.name && ((s = globalThis.$router) == null || s.push({ name: this.tabs[e - 1 > 0 ? e - 1 : 0].name }));
-  },
-  closeRightTab(t, e) {
-    var n;
-    const s = [];
-    let a = !1;
-    this.tabs.forEach((i, c) => {
-      e >= c ? s.push(i) : i.name === this.ctab.name && (a = !0);
-    }), this.tabs = s, a && ((n = globalThis.$router) == null || n.push({ name: t.name }));
-  },
-  closeLeftTab(t, e) {
-    var n;
-    const s = [];
-    let a = !1;
-    this.tabs.forEach((i, c) => {
-      e <= c ? s.push(i) : i.name === this.ctab.name && (a = !0);
-    }), this.tabs = s, a && ((n = globalThis.$router) == null || n.push({ name: t.name }));
-  },
-  closeOtherTab(t, e) {
-    var s;
-    this.tabs = [t], t.name !== this.ctab.name && ((s = globalThis.$router) == null || s.push({ name: t.name }));
-  },
-  closeAllTab() {
-    this.tabs = [];
-  }
-}, v = {}, w = {
-  state: d,
-  actions: S,
-  getters: v
-}, O = () => ({
-  type: "",
-  visible: !1,
-  options: [],
-  el: null,
-  position: {
-    x: 0,
-    y: 0
-  }
-}), L = {
-  saveData(t, e) {
-    this[t] = e;
-  },
-  show({ el: t, position: e }) {
-    this.visible = !0, e ? this.position = e : t && (this.el = t);
-  },
-  hide() {
-    this.visible = !1, this.el = null, this.position = {
-      x: 0,
-      y: 0
-    }, this.type = "";
-  }
-}, N = {}, J = {
-  state: O,
-  actions: L,
-  getters: N
-}, x = p(), o = {}, D = (t) => {
-  const e = t.match(/(?:^|[/\\])([^/\\]+)\.js$/);
-  return e ? e[1] : null;
-}, E = (t) => {
-  Object.entries(t).forEach(([e, s]) => {
-    const a = D(e);
-    if (!a || !(s != null && s.default)) {
-      console.warn(`Invalid store module: ${e}`);
-      return;
-    }
-    try {
-      o[a] = h(a, s.default);
-    } catch (n) {
-      console.error(`Failed to register store module '${a}':`, n);
-    }
-  });
-};
-o.init = h("init", $);
-o.tab = h("tab", w);
-o.rmenu = h("rmenu", J);
-const f = (t) => {
-  try {
-    switch (window.$getType(t)) {
-      case "Array":
-        t.forEach(f);
-        break;
-      case "String":
-        const s = localStorage.getItem(t);
-        s && o.tab().saveData(t, JSON.parse(s));
-        break;
-      default:
-        t = [], console.warn(`Invalid key: ${t}`);
-        break;
-    }
-  } catch (e) {
-    console.error(`Failed to parse '${t}' from localStorage:`, e);
-  }
-}, F = (t, { storeChips: e, useTab: s } = {}) => {
-  try {
-    t.use(x).provide("store", o);
-  } catch (a) {
-    throw new Error("Failed to inject store into app:", a);
-  }
-  return s && (o.tab().saveData("useTab", !0), f(["tabs", "ctab"])), e && E(e), o;
-};
+import { p as o, s as p } from "./store-shared.js";
 export {
-  F as a,
-  x as p,
-  o as s
+  o as pinia,
+  p as store
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mvframe",
   "packageManager": "yarn@4.4.1",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "author": "matt avis",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/scripts/scaffold-app.js

@@ -128,6 +128,7 @@ import ElementPlus from "element-plus";
 import "element-plus/dist/index.css";
 import App from "./App.vue";
 import mvframe from "mvframe";
+import { pinia, store } from "mvframe/store";
 import routes from "./router/index.js";
 import appConfig from "./config/index.js";
 import "./assets/style/index.scss";
@@ -136,9 +137,42 @@ import "mvframe/style/cpt";
 
 const app = createApp(App);
 app.use(ElementPlus);
+
+/** \`meta.public\` 为公开路由；已登录访问登录页则进首页。与 demo 一致：\`store.launch(pinia)\` 来自 \`mvframe/store\`（与插件注入的是同一单例）。 */
+const launchRouteGuard = (to, from, next) => {
+  if (!store.launch) {
+    next();
+    return;
+  }
+  const launch = store.launch(pinia);
+  const authed = Boolean(launch.login);
+  const isPublic = to.matched.some((r) => r.meta?.public);
+  if (!authed && !isPublic) {
+    next({ name: "Entry", replace: true });
+    return;
+  }
+  if (authed && to.name === "Entry") {
+    next({ name: "Home_Home", replace: true });
+    return;
+  }
+  next();
+};
+
 app.use(mvframe, {
   vueRouter: {
     routes,
+    guard: (router) => {
+      router.beforeEach(launchRouteGuard);
+    },
+    useAdmin: true,
+    adminPermission: () => Boolean(store.launch(pinia).login),
+    noaccess: (to, from, next) => {
+      if (from.path === "/") {
+        next();
+      } else {
+        next({ name: "Entry" });
+      }
+    },
   },
   pinia: {
     useTab: true,
@@ -153,66 +187,40 @@ app.mount("#app");
   write(
     "src/App.vue",
     `<template>
-  <Frame class="App" :menu="menu" :page="{}">
-    <template #logo>
-      <span class="logo-placeholder">Logo</span>
-    </template>
-    <template #logomini>
-      <span class="logo-mini">L</span>
-    </template>
-  </Frame>
+  <AdminEntry v-if="isLoggedIn" />
+  <Entry v-else />
 </template>
 <script setup>
-import routes from "./router/index.js";
+import Entry from "./views/Launch/Entry.vue";
+import AdminEntry from "./views/Launch/AdminEntry.vue";
 
 defineOptions({
   name: "App",
   inheritAttrs: false,
 });
 
-const menu = {
-  iconClass: "imicon",
-  routes,
-};
+const store = inject("store");
+const launch = store.launch();
+
+const isLoggedIn = computed(() => Boolean(launch.login));
 </script>
-<style lang="scss" scoped>
-.logo-placeholder {
-  display: inline-block;
-  min-width: 7.5rem;
-  padding: 0.25rem 0.5rem;
-  border-radius: 0.25rem;
-  background: var(--color-primary, #16b1ff);
-  color: #fff;
-  font-size: 0.875rem;
-}
-.logo-mini {
-  display: inline-flex;
-  width: 1.875rem;
-  height: 1.875rem;
-  align-items: center;
-  justify-content: center;
-  border-radius: 0.25rem;
-  background: var(--color-green, #20c997);
-  color: #fff;
-  font-size: 0.75rem;
-}
-</style>
+<style lang="scss" scoped></style>
 `,
   );
 
   write(
     "src/router/baseRouter.js",
     `/**
- * 基础路由：登录页、公开页、与后台权限无关的入口。
- * 权限接口返回后若要合并，可在本文件导出函数内拼接，或与 adminRouter 在 index 中组合。
+ * 基础路由：登录等 \`meta.public\` 公开页（不写 public 则需登录，由 main.js 内 launch 守卫处理）。
  */
 export default [
   {
     path: "/",
-    name: "Home_Home",
-    component: () => import("@/views/Home/Home.vue"),
+    name: "Entry",
+    component: () => import("@/views/Launch/LoginPage.vue"),
     meta: {
-      title: "Home",
+      title: "Login",
+      public: true,
     },
   },
 ];
@@ -222,10 +230,18 @@ export default [
   write(
     "src/router/adminRouter.js",
     `/**
- * 后台 / 业务路由：可按接口权限过滤后追加，或整段替换。
+ * 后台 / 业务路由（需登录后访问）：可按接口权限过滤后追加，或整段替换。
  * meta.admin 等字段可与 mvframe vueRouter.useAdmin / adminPermission 配合。
  */
 export default [
+  {
+    path: "/home",
+    name: "Home_Home",
+    component: () => import("@/views/Home/Home.vue"),
+    meta: {
+      title: "Home",
+    },
+  },
   {
     path: "/admin",
     name: "Admin_Dashboard",
@@ -288,6 +304,136 @@ export default {
 `,
   );
 
+  write(
+    "src/pinia/chip/launch.js",
+    `/** 登录态：与 demo/pinia/launch.js、main.js launchRouteGuard、LoginPage 一致 */
+export default {
+  state: () => ({
+    userinfo: {},
+    login: false,
+  }),
+  actions: {
+    /** 登录成功：合并写入 userinfo，并置 login: true */
+    setLogin(payload = {}) {
+      this.userinfo = {
+        ...this.userinfo,
+        ...payload,
+      };
+      this.login = true;
+    },
+    clearLogin() {
+      this.userinfo = {};
+      this.login = false;
+    },
+  },
+};
+`,
+  );
+
+  write(
+    "src/views/Launch/Entry.vue",
+    `<template>
+  <router-view />
+</template>
+<script setup>
+defineOptions({
+  name: "LaunchEntry",
+  inheritAttrs: false,
+});
+</script>
+`,
+  );
+
+  write(
+    "src/views/Launch/AdminEntry.vue",
+    `<template>
+  <Frame class="App wp100 vh100" :menu="frameMenu" :page="{}">
+    <template #logo>
+      <span class="logo-placeholder">Logo</span>
+    </template>
+    <template #logomini>
+      <span class="logo-mini">L</span>
+    </template>
+  </Frame>
+</template>
+<script setup>
+import routes from "@/router/index.js";
+
+defineOptions({
+  name: "AdminEntry",
+  inheritAttrs: false,
+});
+
+const frameMenu = {
+  iconClass: "imicon",
+  routes: routes.filter((r) => r.meta?.public !== true),
+};
+</script>
+<style lang="scss" scoped>
+.logo-placeholder {
+  display: inline-block;
+  min-width: 7.5rem;
+  padding: 0.25rem 0.5rem;
+  border-radius: 0.25rem;
+  background: var(--color-primary, #16b1ff);
+  color: #fff;
+  font-size: 0.875rem;
+}
+.logo-mini {
+  display: inline-flex;
+  width: 1.875rem;
+  height: 1.875rem;
+  align-items: center;
+  justify-content: center;
+  border-radius: 0.25rem;
+  background: var(--color-green, #20c997);
+  color: #fff;
+  font-size: 0.75rem;
+}
+</style>
+`,
+  );
+
+  write(
+    "src/views/Launch/LoginPage.vue",
+    `<template>
+  <div class="LoginPage wp100 vh100">
+    <Login
+      :form-fileds="formFileds"
+      :login-methods="[0]"
+      @submit="onSubmit"
+    />
+  </div>
+</template>
+<script setup>
+defineOptions({
+  name: "LoginPage",
+  inheritAttrs: false,
+});
+
+const router = useRouter();
+const store = inject("store");
+const launch = store.launch();
+
+const onSubmit = (payload) => {
+  launch.setLogin(payload ?? {});
+  router.replace({ name: "Home_Home" }).catch(() => {});
+};
+
+/** 与 mvframe demo 一致：自定义提交字段名 account / pwd */
+const formFileds = {
+  username: { valueKey: "account" },
+  password: { valueKey: "pwd" },
+};
+</script>
+<style lang="scss" scoped>
+.LoginPage {
+  box-sizing: border-box;
+}
+</style>
+`,
+  );
+
   write(
     "src/api/index.js",
     `/**
@@ -335,7 +481,10 @@ code {
     "src/views/Home/Home.vue",
     `<template>
   <Page title="Home" subtitle="MVFrame 雏形页，可从此扩展 views 模块">
-    <p>公开路由见 <code>src/router/baseRouter.js</code>；后台见 <code>adminRouter.js</code>，合并于 <code>index.js</code>。</p>
+    <p>
+      登录入口为 <code>baseRouter</code> 的 <code>Entry</code>（<code>meta.public</code>）；业务路由见
+      <code>adminRouter.js</code>，合并于 <code>router/index.js</code>，与侧栏菜单同源。
+    </p>
   </Page>
 </template>
 <script setup>
@@ -428,6 +577,10 @@ yarn install
 
 自动生成的 \`vite.config.js\` 已包含 \`unplugin-auto-import\`；\`dts: true\` 时类型默认写在项目根 \`auto-imports.d.ts\`。
 
+## Launch（登录壳）
+
+雏形与 **mvframe demo** 对齐：\`pinia/chip/launch.js\`（顶层 \`login\` + \`userinfo\`）、\`App.vue\`（\`<AdminEntry v-if />\` / \`<Entry v-else />\`）、\`main.js\` 内 \`import { store, pinia } from "mvframe/store"\` + \`launchRouteGuard\` + \`useAdmin\` / \`adminPermission\` / \`noaccess\`。未登录仅 \`meta.public\`；已登录进 \`Entry\` 会重定向到 \`Home_Home\`。若不需门禁，将 \`useAdmin\` 改为 \`false\` 并删除 \`adminPermission\` 与 \`noaccess\`。
+
 ### 报错 \`Could not resolve '@vue/shared'\`
 
 这是 **Vue 3 自带的底层包**，一般不必手写；在 **pnpm / 严格 node_modules** 等环境下可能未被提升到可被 Vite 解析的位置。脚手架已在 \`dependencies\` 中合并 \`@vue/shared\`（与 \`vue\` 同主版本）；老项目可手动执行 \`yarn add @vue/shared@^3.5\`。