mvframe 1.0.10 → 1.0.13

package/dist/store.js

@@ -1,23 +1,28 @@
-import { createPinia as g, defineStore as h } from "pinia";
+import { createPinia as p, defineStore as h } from "pinia";
 const T = () => ({
-  lang: "en_us"
+  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
-}, S = () => ({
+}, d = () => ({
   useTab: !1,
   // 是否使用tab
   tabs: [],
   ctab: {}
   // current tab
-}), d = {
+}), S = {
   saveData(t, e) {
     this[t] = e;
   },
@@ -32,19 +37,19 @@ const T = () => ({
         return;
       } else
         this.closeTab(e, s);
-    const { fullPath: a, name: i, meta: n, params: c, query: u } = t;
-    if (i !== "Login") {
+    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], n.icon && (l = n.icon);
+      r[r.length - 1] === "Home" ? l = r[r.length - 2] : l = r[r.length - 1], i.icon && (l = i.icon);
       const b = {
-        name: i,
-        meta: n,
+        name: n,
+        meta: i,
         path: r,
         params: c,
         query: u,
         icon: l
-      }, { index: m } = this.tabs.filter1((p) => p.name === this.ctab.name);
+      }, { index: m } = this.tabs.filter1((g) => g.name === this.ctab.name);
       this.tabs.splice(m + 1, 0, b), this.saveCurrentTab(b);
     }
   },
@@ -53,20 +58,20 @@ const T = () => ({
     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 i;
+    var n;
     const s = [];
     let a = !1;
-    this.tabs.forEach((n, c) => {
-      e >= c ? s.push(n) : n.name === this.ctab.name && (a = !0);
-    }), this.tabs = s, a && ((i = globalThis.$router) == null || i.push({ name: t.name }));
+    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 i;
+    var n;
     const s = [];
     let a = !1;
-    this.tabs.forEach((n, c) => {
-      e <= c ? s.push(n) : n.name === this.ctab.name && (a = !0);
-    }), this.tabs = s, a && ((i = globalThis.$router) == null || i.push({ name: t.name }));
+    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;
@@ -76,8 +81,8 @@ const T = () => ({
     this.tabs = [];
   }
 }, v = {}, w = {
-  state: S,
-  actions: d,
+  state: d,
+  actions: S,
   getters: v
 }, O = () => ({
   type: "",
@@ -88,7 +93,7 @@ const T = () => ({
     x: 0,
     y: 0
   }
-}), J = {
+}), L = {
   saveData(t, e) {
     this[t] = e;
   },
@@ -101,28 +106,30 @@ const T = () => ({
       y: 0
     }, this.type = "";
   }
-}, N = {}, x = {
+}, N = {}, J = {
   state: O,
-  actions: J,
+  actions: L,
   getters: N
-}, D = g(), o = {}, E = (t) => {
+}, 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 = e.match(/chip\/(.+?)\.js$/);
+    const a = D(e);
     if (!a || !(s != null && s.default)) {
       console.warn(`Invalid store module: ${e}`);
       return;
     }
-    const i = a[1].replace(/\//g, "_");
     try {
-      o[i] = h(i, s.default);
+      o[a] = h(a, s.default);
     } catch (n) {
-      console.error(`Failed to register store module '${i}':`, n);
+      console.error(`Failed to register store module '${a}':`, n);
     }
   });
 };
 o.init = h("init", $);
 o.tab = h("tab", w);
-o.rmenu = h("rmenu", x);
+o.rmenu = h("rmenu", J);
 const f = (t) => {
   try {
     switch (window.$getType(t)) {
@@ -140,16 +147,16 @@ const f = (t) => {
   } catch (e) {
     console.error(`Failed to parse '${t}' from localStorage:`, e);
   }
-}, I = (t, { storeChips: e, useTab: s } = {}) => {
+}, F = (t, { storeChips: e, useTab: s } = {}) => {
   try {
-    t.use(D).provide("store", o);
+    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 {
-  I as a,
-  D as p,
+  F as a,
+  x as p,
   o as s
 };

package/dist/util.js

@@ -1,4 +1,5 @@
-const I = (s) => {
+import { MVFRAME_STORAGE_LANG as U } from "./composition.js";
+const P = (s) => {
   const f = (e) => {
     if (e.startsWith("/"))
       return new URL(e, import.meta.url).href;
@@ -6,7 +7,10 @@ const I = (s) => {
       return new URL((/* @__PURE__ */ Object.assign({}))[`/src/assets/img/${e}`], import.meta.url).href;
     throw new Error("please provide an image url with getImg");
   };
-  s.config.globalProperties.$getImg = f, globalThis.$getImg = f, globalThis.$getLang = () => localStorage.getItem("lang") || globalThis.config.lang || "en_us", globalThis.token = "WQpvrYIEnSzAxhOWrbUpGvElhGztdOjOGOdbrSlhUYlrQArOdpMhY1vYMSA7l4xMOUl9MAl1I6AvSrQ8vlE0bpChQ0UWMMlYt0hQC0M0pSz0rUhvlIllSWzMESnAMUlt";
+  s.config.globalProperties.$getImg = f, globalThis.$getImg = f, globalThis.$getLang = () => {
+    var e;
+    return localStorage.getItem(U) || ((e = globalThis.$config) == null ? void 0 : e.lang) || "en_us";
+  }, globalThis.token = "WQpvrYIEnSzAxhOWrbUpGvElhGztdOjOGOdbrSlhUYlrQArOdpMhY1vYMSA7l4xMOUl9MAl1I6AvSrQ8vlE0bpChQ0UWMMlYt0hQC0M0pSz0rUhvlIllSWzMESnAMUlt";
   const m = (e) => Number(e.match(/\d+(\.\d+)?/g).join(""));
   globalThis.$md5 = (e) => m(e);
   const $ = (e, r = 0) => {
@@ -31,8 +35,8 @@ const I = (s) => {
     let l = n[0].split("");
     l = l.reverse();
     let a = [];
-    l.forEach((A, d) => {
-      d !== 0 && d % 3 === 0 && a.push(","), a.push(A);
+    l.forEach((E, d) => {
+      d !== 0 && d % 3 === 0 && a.push(","), a.push(E);
     });
     let i = a.reverse().join("");
     return globalThis.$getType(r) === "Number" && r > 0 && (i += ".", n[1] ? i += n[1].padEnd(r, 0).substr(0, r) : i += "0".padEnd(r, "0")), Number(t) !== Number(e) ? `-${i}` : i;
@@ -71,7 +75,7 @@ const I = (s) => {
     });
   };
   globalThis.$pm = C;
-  const k = (e = () => {
+  const M = (e = () => {
   }, r = 500) => {
     let o;
     return function(...t) {
@@ -80,7 +84,7 @@ const I = (s) => {
       }, r);
     };
   };
-  globalThis.$db = k, Number.prototype.toFixedNumber = function(e) {
+  globalThis.$db = M, Number.prototype.toFixedNumber = function(e) {
     return Number(this.toFixed(e));
   }, Array.prototype.filter1 = function(e) {
     if (!e || typeof e != "function")
@@ -116,27 +120,27 @@ const I = (s) => {
     }
   };
   globalThis.$copy = h, s.config.globalProperties.$copy = h;
-  const w = (e) => e < 1e3 ? e : e < 1e6 ? parseInt(e / 1e3) + "k" : parseInt(e / 1e6) + "m";
-  globalThis.$sc = w;
+  const k = (e) => e < 1e3 ? e : e < 1e6 ? parseInt(e / 1e3) + "k" : parseInt(e / 1e6) + "m";
+  globalThis.$sc = k;
   const F = {
     cpa: "avgCPA",
     cpt: "avgCPT"
-  }, M = (e, r = F) => {
+  }, w = (e, r = F) => {
     const o = r[e.name];
     o && (e.name = o);
   };
-  globalThis.$nr = M;
-  const x = (e, r) => (Object.keys(e).forEach((o) => {
+  globalThis.$nr = w;
+  const O = (e, r) => (Object.keys(e).forEach((o) => {
     objMap[o] && (e[objMap[o]] = e[o], delete e[o]);
   }), e);
-  globalThis.$nro = x;
-  const O = (e) => {
+  globalThis.$nro = O;
+  const x = (e) => {
     let r = 0;
     return Object.keys(e).forEach((o) => {
       (globalThis.$getType(e[o]) === "Array" && e[o].length !== 0 || e[o]) && r++;
     }), r;
   };
-  globalThis.$pc = O;
+  globalThis.$pc = x;
   const c = {
     info: {
       tag: "background-color:#0085FF; color:#f1f7ff; border-radius: 2px 0 0 2px;",
@@ -158,7 +162,7 @@ const I = (s) => {
       tag: "background-color:#20c997; color:#f6fffc; border-radius: 2px 0 0 2px;",
       style: "background-color:#f6fffc; color:#20c997;"
     }
-  }, S = (e) => {
+  }, A = (e) => {
     let r = !1;
     for (let o in e)
       if (globalThis.$getType(e[o]) === "Object") {
@@ -166,11 +170,11 @@ const I = (s) => {
         break;
       }
     return r;
-  }, U = ["info", "log", "warn", "error", "success"];
-  globalThis.$c = {}, U.forEach((e) => {
+  }, S = ["info", "log", "warn", "error", "success"];
+  globalThis.$c = {}, S.forEach((e) => {
     globalThis.$c[e] = (...r) => {
       const o = e.toUpperCase();
-      S(r) ? (console.groupCollapsed(`%c ${o} `, `${c[e].tag}`), console[e](r), console.groupEnd()) : console.info(
+      A(r) ? (console.groupCollapsed(`%c ${o} `, `${c[e].tag}`), console[e](r), console.groupEnd()) : console.info(
         `%c ${o} %c┆${r}┆`,
         `${c[e].tag}`,
         `${c[e].style}`
@@ -192,5 +196,5 @@ const I = (s) => {
   };
 };
 export {
-  I as u
+  P as u
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mvframe",
   "packageManager": "yarn@4.4.1",
-  "version": "1.0.10",
+  "version": "1.0.13",
   "author": "matt avis",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -46,6 +46,9 @@
     "scripts/scaffold-app.js",
     ".cursor/skills/mvframe-app-init"
   ],
+  "peerDependencies": {
+    "element-plus": "^2.2.0"
+  },
   "dependencies": {
     "pinia": "^3.0.0",
     "vue": "^3.3.4",

package/scripts/scaffold-app.js

@@ -41,6 +41,8 @@ const SCAFFOLD_DEPENDENCIES = {
   "@vue/shared": "^3.5.0",
   "vue-router": "^4.6.0",
   pinia: "^3.0.0",
+  /** mvframe 产物对 Table 列配置等直接 import，strict 包管理器下需直连依赖 */
+  vuedraggable: "^4.1.0",
   mvframe: "^1.0.0",
   "element-plus": "^2.13.0",
 };
@@ -129,6 +131,8 @@ import mvframe from "mvframe";
 import routes from "./router/index.js";
 import appConfig from "./config/index.js";
 import "./assets/style/index.scss";
+import "mvframe/style";
+import "mvframe/style/cpt";
 
 const app = createApp(App);
 app.use(ElementPlus);
@@ -296,14 +300,9 @@ export {};
 
   write(
     "src/assets/style/index.scss",
-    `/* 项目全局样式入口（已在 main.js 引入） */
-
-/* MVFrame 工具类与变量：按安装方式选一种
- * - monorepo / 源码依赖：*/
-/* @import "mvframe/src/style/index.scss"; */
-
-/* - 发布包全量样式：*/
-/* @import "mvframe/style"; */
+    `/* 项目全局样式入口（main.js 已 import 本文件） */
+/* MVFrame：main.js 已 import "mvframe/style" 与 "mvframe/style/cpt"（发布包 CSS），勿在此处再 @import 同一路径，避免重复。 */
+/* 若需在 SCSS 内 @use 变量/mixin，可指向 node_modules 内 mvframe 源码路径或 monorepo workspace 路径。 */
 
 body {
   margin: 0;
@@ -433,9 +432,17 @@ yarn install
 
 这是 **Vue 3 自带的底层包**，一般不必手写；在 **pnpm / 严格 node_modules** 等环境下可能未被提升到可被 Vite 解析的位置。脚手架已在 \`dependencies\` 中合并 \`@vue/shared\`（与 \`vue\` 同主版本）；老项目可手动执行 \`yarn add @vue/shared@^3.5\`。
 
+### 报错无法解析 \`vuedraggable\`
+
+发布包 \`dist/index.js\` 会对 \`vuedraggable\` 做 **直连 import**（如 Table 列配置）。脚手架已在 \`dependencies\` 中写入 \`vuedraggable@^4.1.0\`；老项目可 \`yarn add vuedraggable@^4.1\`。
+
 ## 样式
 
-在 \`src/assets/style/index.scss\` 中取消注释并指向实际 mvframe 样式路径（源码或 dist）。
+\`src/main.js\` 已包含 \`import "mvframe/style"\` 与 \`import "mvframe/style/cpt"\`（分别对应工具类/变量与 **Mvc\*** 组件 scoped 等样式），一般 **无需** 在 \`index.scss\` 再引一遍 mvframe 的 dist CSS，以免重复。项目级覆盖写在 \`src/assets/style/index.scss\` 即可。
+
+## 子路径（按需）
+
+发布包 \`exports\` 还提供 \`mvframe/composition\`、\`mvframe/util\`、\`mvframe/store\` 等，业务侧可 \`import { ... } from "mvframe/composition"\` 等，参见包内 \`package.json\` 的 \`exports\`。
 
 ## 目录约定