mvframe 1.0.16 → 1.0.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mvframe",
   "packageManager": "yarn@4.4.1",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "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

@@ -117,6 +117,7 @@ function main() {
     "src/router",
     "src/pinia/chip",
     "src/config",
+    "src/maps",
     "src/composition",
   ];
   for (const d of dirs) {
@@ -133,6 +134,7 @@ import mvframe from "mvframe";
 import { pinia, store } from "mvframe/store";
 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";
@@ -147,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: "Overview_Home", replace: true });
+  if (authed && to.name === loginPage) {
+    next({ name: firstPage, replace: true });
     return;
   }
   next();
@@ -181,6 +189,7 @@ app.use(mvframe, {
     storeChips: import.meta.glob("./pinia/chip/*.js", { eager: true }),
   },
   config: appConfig,
+  maps: appMaps,
 });
 app.mount("#app");
 `,
@@ -232,6 +241,7 @@ export default [
     component: () => import("@/views/Overview/Home.vue"),
     meta: {
       title: "Overview",
+      admin: true,
     },
   },
   {
@@ -241,6 +251,7 @@ export default [
     meta: {
       title: "A",
       icon: "im-swap-right",
+      admin: true,
     },
   },
   {
@@ -250,9 +261,9 @@ export default [
     meta: {
       title: "B",
       icon: "im-swap-right",
+      admin: true,
     },
     children: [
-      { path: "", redirect: { name: "B_First" } },
       {
         path: "first",
         name: "B_First",
@@ -307,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 } */
@@ -330,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 */
@@ -343,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");
     },
   },
 };
@@ -424,6 +462,7 @@ const frameMenu = {
     <Login
       :form-fileds="formFileds"
       :login-methods="[0]"
+      :loading="loading"
       @submit="onSubmit"
     />
   </div>
@@ -437,10 +476,18 @@ defineOptions({
 const router = useRouter();
 const store = inject("store");
 const launch = store.launch();
-
-const onSubmit = (payload) => {
-  launch.setLogin(payload ?? {});
-  router.replace({ name: "Overview_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 */
@@ -611,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,
     }),
@@ -692,6 +751,7 @@ yarn install
 | \`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（可选）