mvframe 1.0.15 → 1.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mvframe",
   "packageManager": "yarn@4.4.1",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "author": "matt avis",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -14,6 +14,10 @@
       "import": "./dist/composition.js",
       "require": "./dist/composition.js"
     },
+    "./maps": {
+      "import": "./dist/maps.js",
+      "require": "./dist/maps.js"
+    },
     "./store": {
       "import": "./dist/store.js",
       "require": "./dist/store.js"
@@ -34,11 +38,12 @@
     "dev": "vite",
     "build": "node scripts/prebuild.js",
     "install-cursor-skill": "node scripts/install-cursor-skill.js",
-    "scaffold-app": "node scripts/scaffold-app.js"
+    "scaffold-app": "node scripts/scaffold-app.js",
+    "gen-icon": "node scripts/gen-iconfont-ant-names.js"
   },
   "bin": {
-    "mvframe-install-cursor-skill": "scripts/install-cursor-skill.js",
-    "mvframe-init-app": "scripts/scaffold-app.js"
+    "mvframe-init-app": "scripts/scaffold-app.js",
+    "mvframe-install-cursor-skill": "scripts/install-cursor-skill.js"
   },
   "files": [
     "dist/*",
@@ -50,6 +55,9 @@
     "element-plus": "^2.2.0"
   },
   "dependencies": {
+    "@visactor/vtable": "^1.26.0",
+    "@visactor/vtable-editors": "^1.26.0",
+    "dayjs": "^1.11.20",
     "pinia": "^3.0.0",
     "vue": "^3.3.4",
     "vue-router": "^4.6.3",

package/scripts/scaffold-app.js

@@ -106,8 +106,10 @@ function main() {
   }
 
   const dirs = [
-    "src/views/Home",
-    "src/views/Admin",
+    "src/views/Launch",
+    "src/views/Overview",
+    "src/views/A",
+    "src/views/B",
     "src/component",
     "src/assets/img",
     "src/assets/style",
@@ -115,6 +117,7 @@ function main() {
     "src/router",
     "src/pinia/chip",
     "src/config",
+    "src/maps",
     "src/composition",
   ];
   for (const d of dirs) {
@@ -129,8 +132,9 @@ 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 routes from "./router/routes.js";
 import appConfig from "./config/index.js";
+import appMaps from "./maps/index.js";
 import "./assets/style/index.scss";
 import "mvframe/style";
 import "mvframe/style/cpt";
@@ -145,14 +149,20 @@ const launchRouteGuard = (to, from, next) => {
     return;
   }
   const launch = store.launch(pinia);
+  const loginPage = globalThis.$config?.loginPageName || "Entry";
+  const firstPage = globalThis.$config?.firstPageName || "Overview_Home";
+  if (launch.loggingOut && to.name === loginPage) {
+    next();
+    return;
+  }
   const authed = Boolean(launch.login);
   const isPublic = to.matched.some((r) => r.meta?.public);
   if (!authed && !isPublic) {
-    next({ name: "Entry", replace: true });
+    next({ name: loginPage, replace: true });
     return;
   }
-  if (authed && to.name === "Entry") {
-    next({ name: "Home_Home", replace: true });
+  if (authed && to.name === loginPage) {
+    next({ name: firstPage, replace: true });
     return;
   }
   next();
@@ -179,6 +189,7 @@ app.use(mvframe, {
     storeChips: import.meta.glob("./pinia/chip/*.js", { eager: true }),
   },
   config: appConfig,
+  maps: appMaps,
 });
 app.mount("#app");
 `,
@@ -209,9 +220,10 @@ const isLoggedIn = computed(() => Boolean(launch.login));
   );
 
   write(
-    "src/router/baseRouter.js",
+    "src/router/routes.js",
     `/**
- * 基础路由：登录等 \`meta.public\` 公开页（不写 public 则需登录，由 main.js 内 launch 守卫处理）。
+ * 与 mvframe \`demo/routes.js\` 一致：单文件导出全部路由；\`meta.public\` 为公开页（见 main.js 守卫）。
+ * B 嵌套使用 Layout + 子路由；日后若按权限裁剪菜单，可对本数组 \`filter\` 后再交给 Frame。
  */
 export default [
   {
@@ -223,49 +235,71 @@ export default [
       public: true,
     },
   },
-];
-`,
-  );
-
-  write(
-    "src/router/adminRouter.js",
-    `/**
- * 后台 / 业务路由（需登录后访问）：可按接口权限过滤后追加，或整段替换。
- * meta.admin 等字段可与 mvframe vueRouter.useAdmin / adminPermission 配合。
- */
-export default [
   {
-    path: "/home",
-    name: "Home_Home",
-    component: () => import("@/views/Home/Home.vue"),
+    path: "/overview",
+    name: "Overview_Home",
+    component: () => import("@/views/Overview/Home.vue"),
+    meta: {
+      title: "Overview",
+      admin: true,
+    },
+  },
+  {
+    path: "/a",
+    name: "A_Home",
+    component: () => import("@/views/A/Home.vue"),
     meta: {
-      title: "Home",
+      title: "A",
+      icon: "im-swap-right",
+      admin: true,
     },
   },
   {
-    path: "/admin",
-    name: "Admin_Dashboard",
-    component: () => import("@/views/Admin/Dashboard.vue"),
+    path: "/b",
+    name: "B_Home",
+    component: () => import("@/views/B/Layout.vue"),
     meta: {
-      title: "Dashboard",
-      icon: "im-setting",
-      // admin: true,
+      title: "B",
+      icon: "im-swap-right",
+      admin: true,
     },
+    children: [
+      {
+        path: "first",
+        name: "B_First",
+        component: () => import("@/views/B/First.vue"),
+        meta: { title: "B_First" },
+      },
+      {
+        path: "second",
+        name: "B_Second",
+        component: () => import("@/views/B/Second.vue"),
+        meta: { title: "B_Second" },
+      },
+      {
+        path: "third",
+        name: "B_Third",
+        component: () => import("@/views/B/Third.vue"),
+        meta: { title: "B_Third" },
+      },
+      {
+        path: "fourth",
+        name: "B_Fourth",
+        component: () => import("@/views/B/Fourth.vue"),
+        meta: { title: "B_Fourth" },
+      },
+      {
+        path: "fifth",
+        name: "B_Fifth",
+        component: () => import("@/views/B/Fifth.vue"),
+        meta: { title: "B_Fifth" },
+      },
+    ],
   },
 ];
 `,
   );
 
-  write(
-    "src/router/index.js",
-    `import baseRouter from "./baseRouter.js";
-import adminRouter from "./adminRouter.js";
-
-/** 交给 mvframe 的 vueRouter.routes（菜单与注册同源，无需拆两份维护） */
-export default [...baseRouter, ...adminRouter];
-`,
-  );
-
   write(
     "src/config/index.js",
     `/**
@@ -284,6 +318,19 @@ export default {
 `,
   );
 
+  write(
+    "src/maps/index.js",
+    `/**
+ * 与 mvframe 内置 maps/chip/*.js 深度合并（不挂全局），供 useMap / getMaps / patchMaps 使用。
+ * 顶层键与芯片文件名一致（如 common、asa）；子键用 useMap("common.vTableTool.refresh") 读取。
+ * @type {Record<string, unknown>}
+ */
+export default {
+  // asa: { countryAll: { obj: {} } },
+};
+`,
+  );
+
   write(
     "src/pinia/chip/app.js",
     `/** 业务 Pinia chip：路径须为 pinia/chip/*.js，export default { state, actions } */
@@ -307,10 +354,21 @@ export default {
   write(
     "src/pinia/chip/launch.js",
     `/** 登录态：与 demo/pinia/launch.js、main.js launchRouteGuard、LoginPage 一致 */
+const readLoginFromStorage = () => {
+  try {
+    const raw = localStorage.getItem("login");
+    if (raw == null) return false;
+    return raw === "true" || JSON.parse(raw) === true;
+  } catch {
+    return false;
+  }
+};
+
 export default {
   state: () => ({
     userinfo: {},
-    login: false,
+    login: readLoginFromStorage(),
+    loggingOut: false,
   }),
   actions: {
     /** 登录成功：合并写入 userinfo，并置 login: true */
@@ -320,10 +378,13 @@ export default {
         ...payload,
       };
       this.login = true;
+      localStorage.setItem("login", true);
     },
     clearLogin() {
       this.userinfo = {};
       this.login = false;
+      this.loggingOut = false;
+      localStorage.removeItem("login");
     },
   },
 };
@@ -357,7 +418,7 @@ defineOptions({
   </Frame>
 </template>
 <script setup>
-import routes from "@/router/index.js";
+import routes from "@/router/routes.js";
 
 defineOptions({
   name: "AdminEntry",
@@ -401,6 +462,7 @@ const frameMenu = {
     <Login
       :form-fileds="formFileds"
       :login-methods="[0]"
+      :loading="loading"
       @submit="onSubmit"
     />
   </div>
@@ -414,10 +476,18 @@ defineOptions({
 const router = useRouter();
 const store = inject("store");
 const launch = store.launch();
-
-const onSubmit = (payload) => {
-  launch.setLogin(payload ?? {});
-  router.replace({ name: "Home_Home" }).catch(() => {});
+const loading = ref(false);
+
+const onSubmit = async (payload) => {
+  loading.value = true;
+  try {
+    launch.setLogin(payload ?? {});
+    await router.replace({ name: "Overview_Home" });
+  } catch {
+    /* 路由失败时仍结束 loading */
+  } finally {
+    loading.value = false;
+  }
 };
 
 /** 与 mvframe demo 一致：自定义提交字段名 account / pwd */
@@ -457,15 +527,18 @@ body {
   );
 
   write(
-    "src/views/Admin/Dashboard.vue",
+    "src/views/Overview/Home.vue",
     `<template>
-  <Page title="Dashboard" subtitle="后台路由示例（adminRouter）">
-    <p>在 <code>src/router/adminRouter.js</code> 扩展；与 <code>baseRouter.js</code> 在 <code>index.js</code> 合并。</p>
+  <Page title="Overview" subtitle="登录后默认首页，可替换为业务概览">
+    <p>
+      路由与 mvframe <code>demo/routes.js</code> 对齐：<code>/overview</code>、<code>/a</code>、<code>/b/...</code>；公开入口为
+      <code>routes.js</code> 中的 <code>Entry</code>。
+    </p>
   </Page>
 </template>
 <script setup>
 defineOptions({
-  name: "AdminDashboard",
+  name: "OverviewHome",
   inheritAttrs: false,
 });
 </script>
@@ -478,18 +551,15 @@ code {
   );
 
   write(
-    "src/views/Home/Home.vue",
+    "src/views/A/Home.vue",
     `<template>
-  <Page title="Home" subtitle="MVFrame 雏形页，可从此扩展 views 模块">
-    <p>
-      登录入口为 <code>baseRouter</code> 的 <code>Entry</code>（<code>meta.public</code>）；业务路由见
-      <code>adminRouter.js</code>，合并于 <code>router/index.js</code>，与侧栏菜单同源。
-    </p>
+  <Page title="A" subtitle="一级业务模块示例">
+    <p>对应路由 <code>A_Home</code>，路径 <code>/a</code>。</p>
   </Page>
 </template>
 <script setup>
 defineOptions({
-  name: "HomeHome",
+  name: "AHome",
   inheritAttrs: false,
 });
 </script>
@@ -501,6 +571,52 @@ code {
 `,
   );
 
+  write(
+    "src/views/B/Layout.vue",
+    `<template>
+  <Page title="B" subtitle="嵌套路由父级，子页在下方出口渲染">
+    <router-view />
+  </Page>
+</template>
+<script setup>
+defineOptions({
+  name: "BLayout",
+  inheritAttrs: false,
+});
+</script>
+`,
+  );
+
+  const bSubPages = [
+    ["First", "B_First"],
+    ["Second", "B_Second"],
+    ["Third", "B_Third"],
+    ["Fourth", "B_Fourth"],
+    ["Fifth", "B_Fifth"],
+  ];
+  for (const [file, routeTitle] of bSubPages) {
+    write(
+      `src/views/B/${file}.vue`,
+      `<template>
+  <Page title="${routeTitle}" subtitle="B 模块子路由">
+    <p>组件 <code>${file}</code>，路由名 <code>${routeTitle}</code>。</p>
+  </Page>
+</template>
+<script setup>
+defineOptions({
+  name: "B${file}",
+  inheritAttrs: false,
+});
+</script>
+<style lang="scss" scoped>
+code {
+  font-size: 0.875rem;
+}
+</style>
+`,
+    );
+  }
+
   write("src/component/.gitkeep", "");
   write("src/assets/img/.gitkeep", "");
   write("src/composition/.gitkeep", "");
@@ -542,7 +658,19 @@ export default defineConfig({
     vue(),
     AutoImport({
       include: [/\\.vue$/, /\\.vue\\?vue/, /\\.js$/],
-      imports: ["vue", "vue-router"],
+      imports: [
+        "vue",
+        "vue-router",
+        {
+          "mvframe/maps": [
+            "useMap",
+            "getMaps",
+            "patchMaps",
+            "mapLang",
+            "mapLangPath",
+          ],
+        },
+      ],
       vueTemplate: true,
       dts: true,
     }),
@@ -579,7 +707,19 @@ yarn install
 
 ## 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\`。
+雏形与 **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\` 会重定向到 \`Overview_Home\`（\`/overview\`）。若不需门禁，将 \`useAdmin\` 改为 \`false\` 并删除 \`adminPermission\` 与 \`noaccess\`。
+
+## 路由（与 mvframe \`demo/routes.js\` 对齐）
+
+| 路由名 | 路径 | 说明 |
+|--------|------|------|
+| \`Entry\` | \`/\` | 登录，\`meta.public\` |
+| \`Overview_Home\` | \`/overview\` | 登录后默认页 |
+| \`A_Home\` | \`/a\` | 一级模块示例 |
+| \`B_Home\` | \`/b\` | 嵌套父级（\`Layout.vue\` + \`router-view\`） |
+| \`B_First\` … \`B_Fifth\` | \`/b/first\` … | 子路由 |
+
+路由集中在 \`src/router/routes.js\`（与 demo 单文件一致）；\`Frame\` 的 \`menu.routes\` 由该表筛选掉 \`meta.public\` 后与注册同源。
 
 ### 报错 \`Could not resolve '@vue/shared'\`
 
@@ -606,11 +746,12 @@ yarn install
 | \`src/api\` | 接口 |
 | \`src/assets/style\` | 样式入口，main.js 已 import |
 | \`src/assets/img\` | 静态图 |
-| \`src/router/baseRouter.js\` | 基础路由（公开页等） |
-| \`src/router/adminRouter.js\` | 后台 / 业务路由（可按权限过滤后合并） |
-| \`src/router/index.js\` | 合并导出 → \`vueRouter.routes\`（与 Frame \`menu.routes\` 同源） |
+| \`src/router/routes.js\` | 全部路由（与 \`demo/routes.js\` 结构一致）→ \`vueRouter.routes\` |
+| \`src/views/Launch/*\` | 登录壳与登录页 |
+| \`src/views/Overview\`、\`A\`、\`B\` | 与路由表一一对应的页面 |
 | \`src/pinia/chip/*.js\` | 业务 store → \`storeChips: import.meta.glob(...)\` |
 | \`src/config/index.js\` | 合并进 \`globalThis.$config\` |
+| \`src/maps/index.js\` | 与库内置 \`maps/chip\` 深度合并（模块内）；\`useMap().$l()\` / \`mapLangPath\` / \`mapLang\` 可由 auto-import 从 \`mvframe/maps\` 引入 |
 | \`src/composition\` | 可选，与 Vite 别名 \`@cps\` 对应 |
 
 ## Cursor Skill（可选）