diry пре 2 недеља
родитељ
комит
cf829e9aa1

+ 13 - 9
docs/sapit-ui-基座说明与业务使用.md

@@ -182,29 +182,33 @@ export default {
 
 命名空间取 `views/` 或 `packages/` 之后的第一段目录名(`views/user/i18n.js` → `user`,`packages/components/i18n.js` → `components`)。构建期由 `import.meta.glob` 统一聚合,新增文件、新增目录都不用改任何代码。
 
-页面里先注册命名空间,之后直接 `$l('中文')`,**不需要**写 `$l('user.取消')`:
+页面里**不用注册**也能翻译:`$l('中文')` 会自动找该页面**所在目录**的 `i18n.js`(路由加载组件时按源文件路径打标 `__i18nNs`,取不到再用路由 path 首段)。需要强制指定别的命名空间时才显式注册:
 
 ```js
 export default {
   created() {
-    this.useI18n('user') // Options API
+    this.useI18n('user') // Options API,显式指定,优先级最高
   }
 }
 ```
 
 ```js
-// <script setup> 里同样可用
-const { $l } = useI18n('user')
+// <script setup>:可显式传,也可不传(不传就按当前目录自动推断)
+const { $l } = useI18n()        // 自动
+const { $l } = useI18n('user')  // 显式
 ```
 
-`$l(name)` 查找顺序:**当前组件已注册的命名空间 → 全局兜底字典(`packages/locales/lang/dict.js`)→ 原样返回**。命名空间不存在时 `useI18n` 会 `console.warn` 提示,不阻断渲染。
+`$l(name)` 查找顺序:**当前命名空间(显式注册 > 同目录 i18n > 路由首段)→ `components` 通用词 → 全局兜底字典(`packages/locales/lang/dict.js`)→ 原样返回 + `console.warn`(同一个词只提示一次)**。命名空间不存在时 `useI18n` 也会 `console.warn`,不阻断渲染。
 
 | 调用位置 | 写法 | 是否带命名空间 |
 |---|---|---|
-| 模板 / 组件内 `this.$l(...)` | `{{ $l('取消') }}` | 带,先查 `useI18n` 注册的命名空间 |
-| 组件外 JS(api / utils) | `window.$l('取消')` | 不带,只查全局兜底字典 |
+| 模板 / 组件内 `this.$l(...)` | `{{ $l('取消') }}` | 带,自动按上述优先级解析 |
+| 组件内 `const { $l } = useI18n()` | `$l('取消')` | 带,同上 |
+| 组件外 JS(api / utils) | `window.$l('取消')` | **不带**,只查 `components` + 全局字典 |
 
-中文模式直接返回原文;英文模式查不到译文时原样返回中文。antd 自身语言由 `a-config-provider` 的 `locale` 控制。
+排查用:控制台执行 `$i18nDebug()`,会打印已加载的全部命名空间、当前组件解析到的命名空间及其词条数;`$i18nNamespaces` 是命名空间全量对象。
+
+中文模式直接返回原文;英文模式查不到译文时原样返回中文并告警。antd 自身语言由 `a-config-provider` 的 `locale` 控制。
 
 ### 2.8 主题
 
@@ -856,7 +860,7 @@ export default {
 
 ### 5.6 国际化 / 主题
 
-- 国际化:各模块放 `views/<模块>/i18n.js`(扁平 `{ '中文': 'English' }`),页面 `created` 里 `this.useI18n('<模块>')` 注册命名空间后直接 `$l('中文')`。业务自己的 `i18n.js` 在业务 `main.js` 里 glob 一次传给 `$registerGlobalConfig({ locales })`,即与基座合并(同名业务优先)。
+- 国际化:各模块放 `views/<模块>/i18n.js`(扁平 `{ '中文': 'English' }`),页面**不用写** `useI18n`,`$l('中文')` 自动按页面所在目录命中;要跨目录强制指定时再 `this.useI18n('<模块>')`。业务自己的 `i18n.js` 在业务 `main.js` 里 glob 一次传给 `$registerGlobalConfig({ locales })`,即与基座合并(同名业务优先)。
 - 主题:只改 `VITE_APP_THEME_VALUE`;样式用 `var(--s-*)` 或 `.s-theme-*`。
 
 ### 5.7 子路径部署(示例 `/monitor/`)

+ 1 - 1
lib/config.json

@@ -1 +1 @@
-{"_hash":1793262827838,"VITE_APP_PROJECT_NAME":"前端项目架构","VITE_APP_VERSION":"v1.0","VITE_APP_JSS_LICENSE":"","VITE_APP_TITLE":"平台","VITE_APP_BASE_URL":"/","VITE_APP_FOOTER_VISIBLE":false,"VITE_APP_LOGIN_PHONE":false,"VITE_APP_LOGIN_QRCODE":false,"VITE_APP_MESSAGE_VISIBLE":true,"VITE_APP_IS_BASE":false,"VITE_APP_LANG_ENABLE":true,"VITE_APP_LANG":"zh","VITE_APP_API_PATH":"/apig","VITE_APP_SYS_SERVER_NAME":"portal","VITE_APP_MESSAGE_SERVER_NAME":"message","VITE_APP_PORTAL_SERVER_NAME":"portal","VITE_APP_FLOW_SERVER_NAME":"flow","VITE_APP_CLIENT_ID":"mm0001","VITE_APP_PREVIEW_ONLINE":"/filePreview/onlinePreview?url=","VITE_APP_WEB_SITE":"https://sapit.com.cn/#/home","VITE_APP_LOGIN_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_BASE_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_SOCKET_URL":"/","VITE_APP_SOCKET_PATH":"/apig/ws/websocket","VITE_CONFIG_MODE":false,"VITE_APP_API_BASE_URL":"http://192.168.200.7:6801","VITE_APP_API_FILE_URL":"/","VITE_APP_MENU_THEME":"dark","VITE_APP_MENU_BAR":"left","VITE_APP_LOGIN_PATH_THEME":"3","VITE_APP_THEME_VALUE":"blue","VITE_APP_THEME":{"blue":{"name":"blue","color":"#1677FF","lightColor":"\t#6495ED","darkColor":"#00008B","borderColor":"#B0C4DE","bgColor":"#f0f2f5"},"green":{"name":"green","color":"#00b96b","lightColor":"#90EE90","darkColor":"#3CB371","borderColor":"#98FB98","bgColor":"#F0FFF0"},"orange":{"name":"orange","color":"#FFA500","lightColor":"\t#FFE4B5","darkColor":"#FF8C00","borderColor":"#FFDEAD","bgColor":"#FFEFD5"}},"VITE_APP_LOGIN_PATH":"/login","VITE_APP_DEFAULT_PATH":"/workplace/index","VITE_USER_NODE_ENV":"production"}
+{"_hash":1793332236510,"VITE_APP_PROJECT_NAME":"前端项目架构","VITE_APP_VERSION":"v1.0","VITE_APP_JSS_LICENSE":"","VITE_APP_TITLE":"平台","VITE_APP_BASE_URL":"/","VITE_APP_FOOTER_VISIBLE":false,"VITE_APP_LOGIN_PHONE":false,"VITE_APP_LOGIN_QRCODE":false,"VITE_APP_MESSAGE_VISIBLE":true,"VITE_APP_IS_BASE":false,"VITE_APP_LANG_ENABLE":true,"VITE_APP_LANG":"zh","VITE_APP_API_PATH":"/apig","VITE_APP_SYS_SERVER_NAME":"portal","VITE_APP_MESSAGE_SERVER_NAME":"message","VITE_APP_PORTAL_SERVER_NAME":"portal","VITE_APP_FLOW_SERVER_NAME":"flow","VITE_APP_CLIENT_ID":"mm0001","VITE_APP_PREVIEW_ONLINE":"/filePreview/onlinePreview?url=","VITE_APP_WEB_SITE":"https://sapit.com.cn/#/home","VITE_APP_LOGIN_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_BASE_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_SOCKET_URL":"/","VITE_APP_SOCKET_PATH":"/apig/ws/websocket","VITE_CONFIG_MODE":false,"VITE_APP_API_BASE_URL":"http://192.168.200.7:6801","VITE_APP_API_FILE_URL":"/","VITE_APP_MENU_THEME":"dark","VITE_APP_MENU_BAR":"left","VITE_APP_LOGIN_PATH_THEME":"3","VITE_APP_THEME_VALUE":"blue","VITE_APP_THEME":{"blue":{"name":"blue","color":"#1677FF","lightColor":"\t#6495ED","darkColor":"#00008B","borderColor":"#B0C4DE","bgColor":"#f0f2f5"},"green":{"name":"green","color":"#00b96b","lightColor":"#90EE90","darkColor":"#3CB371","borderColor":"#98FB98","bgColor":"#F0FFF0"},"orange":{"name":"orange","color":"#FFA500","lightColor":"\t#FFE4B5","darkColor":"#FF8C00","borderColor":"#FFDEAD","bgColor":"#FFEFD5"}},"VITE_APP_LOGIN_PATH":"/login","VITE_APP_DEFAULT_PATH":"/workplace/index","VITE_USER_NODE_ENV":"production"}

Разлика између датотеке није приказан због своје велике величине
+ 2 - 2
lib/js/docs.js


+ 1 - 1
lib/js/index.js

@@ -1,6 +1,6 @@
 import "vue";
 import "ant-design-vue";
-import { dJ as i } from "./index2.js";
+import { dI as i } from "./index2.js";
 import "pinia";
 export {
   i as default

Разлика између датотеке није приказан због своје велике величине
+ 214 - 192
lib/js/index2.js


+ 1 - 1
lib/js/login.js

@@ -14,7 +14,7 @@ var oA = (A, e, w) => new Promise((B, g) => {
   }, P = (Y) => Y.done ? B(Y.value) : Promise.resolve(Y.value).then(r, x);
   P((w = w.apply(A, e)).next());
 });
-import { g as Hw, m as Lw, d as MA, r as Ow, u as xw, _ as mA, i as VB, ax as Zw, dd as pA, f as bw, av as lw, aw as FB, o as Gw, ck as k, de as dw, cl as aw, n as XA, df as oB, dg as NB, dh as uw, di as yw, ad as Xw, dj as jw, dk as Vw, dl as Fw, I as ow, d7 as Nw, B as mw, a6 as Jw, a7 as kw, ao as Kw, dm as Ew, dn as Iw } from "./index2.js";
+import { g as Hw, m as Lw, d as MA, r as Ow, u as xw, _ as mA, i as VB, ax as Zw, dc as pA, f as bw, av as lw, aw as FB, o as Gw, ck as k, dd as dw, cl as aw, n as XA, de as oB, df as NB, dg as uw, dh as yw, ad as Xw, di as jw, dj as Vw, dk as Fw, I as ow, d7 as Nw, B as mw, a6 as Jw, a7 as kw, ao as Kw, dl as Ew, dm as Iw } from "./index2.js";
 import { createVNode as m, defineComponent as mB, ref as ig, onMounted as pw, onUpdated as Tw, onBeforeUnmount as Sw, openBlock as N, createElementBlock as I, normalizeStyle as sA, createElementVNode as F, withDirectives as ug, vShow as yg, Transition as Uw, withCtx as S, normalizeClass as yA, toDisplayString as R, createCommentVNode as _, Fragment as JB, renderList as kB, createTextVNode as WA, createBlock as CA, resolveDynamicComponent as KB, resolveComponent as Gg, withModifiers as dA } from "vue";
 import { F as iw, _ as qw } from "./index4.js";
 import { T as hw, _ as Rw } from "./index11.js";

+ 4 - 4
lib/js/message.js

@@ -14,8 +14,8 @@ var h = (T, r, d) => new Promise((R, _) => {
   }, p = (s) => s.done ? R(s.value) : Promise.resolve(s.value).then($, e);
   p((d = d.apply(T, r)).next());
 });
-import { ref as D, reactive as N, onMounted as j, resolveComponent as K, openBlock as Y, createBlock as k, withCtx as n, createVNode as o, createElementVNode as y, toDisplayString as u, createCommentVNode as S } from "vue";
-import { I as A, dE as F, dF as G, dG as H, dH as L, dI as O, dB as q, dC as x, ai as b } from "./index2.js";
+import { ref as D, reactive as N, onMounted as j, resolveComponent as K, openBlock as Y, createBlock as k, withCtx as n, createVNode as o, createElementVNode as y, toDisplayString as u, createCommentVNode as A } from "vue";
+import { I as S, dD as F, dE as G, dF as H, dG as L, dH as O, dA as q, dB as x, ai as b } from "./index2.js";
 import { T as z, _ as J } from "./index11.js";
 import { R as Q } from "./dayjs.js";
 const W = ["onClick"], X = !1, oe = {
@@ -108,7 +108,7 @@ const W = ["onClick"], X = !1, oe = {
     return j(() => {
       E(), p.value = s;
     }), (t, a) => {
-      const g = A, v = K("s-filter-item"), m = Q, f = K("s-filter-wrap"), l = J, c = z, P = K("s-list-layout");
+      const g = S, v = K("s-filter-item"), m = Q, f = K("s-filter-wrap"), l = J, c = z, P = K("s-list-layout");
       return Y(), k(P, {
         ref_key: "layout",
         ref: r,
@@ -160,7 +160,7 @@ const W = ["onClick"], X = !1, oe = {
                   }, null, 8, ["value"])
                 ]),
                 _: 1
-              }, 8, ["label"])) : S("", !0)
+              }, 8, ["label"])) : A("", !0)
             ]),
             _: 1
           })

+ 0 - 13
lib/js/s-list-card-layout.js

@@ -1,13 +0,0 @@
-import { resolveComponent as e, openBlock as o, createBlock as a } from "vue";
-const _ = /* @__PURE__ */ Object.assign({ name: "TplListCardLayout" }, {
-  __name: "s-list-card-layout",
-  setup(s) {
-    return (r, c) => {
-      const t = e("s-list-card-layout", !0);
-      return o(), a(t, { title: "卡片列表" });
-    };
-  }
-});
-export {
-  _ as default
-};

+ 0 - 32
lib/js/s-list-layout.js

@@ -1,32 +0,0 @@
-import { ref as n, reactive as r, resolveComponent as p, openBlock as _, createBlock as m } from "vue";
-import { dc as f } from "./index2.js";
-function d(s, t) {
-  const e = window.$utils.env.VITE_APP_PORTAL_SERVER_NAME;
-  return window.$utils.http({
-    url: `/${e}/position/page?${f.stringify(t)}`,
-    data: s
-  });
-}
-const b = /* @__PURE__ */ Object.assign({ name: "TplListLayout" }, {
-  __name: "s-list-layout",
-  setup(s) {
-    window.useI18n("template");
-    const t = n([]), e = n([]), l = r({}), a = n(!1), i = (o = {}) => d(l, o), u = () => {
-    };
-    return (o, v) => {
-      const c = p("s-list-layout", !0);
-      return _(), m(c, {
-        ref: "layout",
-        buttons: t.value,
-        onReset: u,
-        columns: e.value,
-        loadData: i,
-        isSelection: a.value,
-        title: o.$l("基础列表")
-      }, null, 8, ["buttons", "columns", "isSelection", "title"]);
-    };
-  }
-});
-export {
-  b as default
-};

+ 0 - 13
lib/js/s-list-table-tree-layout.js

@@ -1,13 +0,0 @@
-import { resolveComponent as t, openBlock as o, createBlock as a } from "vue";
-const n = /* @__PURE__ */ Object.assign({ name: "TplListTableTreeLayout" }, {
-  __name: "s-list-table-tree-layout",
-  setup(l) {
-    return (s, r) => {
-      const e = t("s-list-table-tree-layout", !0);
-      return o(), a(e, { title: "树形列表" });
-    };
-  }
-});
-export {
-  n as default
-};

+ 0 - 13
lib/js/s-skeleton-layout.js

@@ -1,13 +0,0 @@
-import { resolveComponent as t, openBlock as o, createBlock as n } from "vue";
-const c = /* @__PURE__ */ Object.assign({ name: "TplSkeletonLayout" }, {
-  __name: "s-skeleton-layout",
-  setup(s) {
-    return (l, a) => {
-      const e = t("s-skeleton-layout", !0);
-      return o(), n(e, { title: "骨架布局" });
-    };
-  }
-});
-export {
-  c as default
-};

+ 0 - 13
lib/js/s-super-list-layout.js

@@ -1,13 +0,0 @@
-import { resolveComponent as e, openBlock as s, createBlock as o } from "vue";
-const _ = /* @__PURE__ */ Object.assign({ name: "TplSuperListLayout" }, {
-  __name: "s-super-list-layout",
-  setup(r) {
-    return (n, p) => {
-      const t = e("s-super-list-layout", !0);
-      return s(), o(t, { title: "高级列表" });
-    };
-  }
-});
-export {
-  _ as default
-};

+ 1 - 1
lib/js/workplace.js

@@ -16,7 +16,7 @@ var se = (e, t, n) => new Promise((a, l) => {
 });
 import { defineComponent as q, computed as _, createVNode as o, isVNode as je, inject as rt, ref as j, provide as st, toRef as Me, watch as Ue, resolveComponent as Re, openBlock as P, createBlock as k, withCtx as B, createElementBlock as U, Fragment as be, renderList as Se, normalizeStyle as ct, unref as de, resolveDynamicComponent as qe, createTextVNode as pe, toDisplayString as H, onMounted as dt, createElementVNode as G, createCommentVNode as ye, normalizeClass as We } from "vue";
 import { useRouter as ut } from "vue-router";
-import { g as Le, m as Je, d as b, r as Xe, aH as xe, t as Ye, u as J, c as oe, _ as W, i as Ce, o as Oe, dp as me, aN as He, h as gt, dq as vt, bv as mt, dr as Qe, P as X, c6 as Pe, dd as le, F as pt, ds as ft, aV as ht, dt as yt, bK as Ge, du as bt, ao as Ze, e as $e, ax as Ve, av as St, aw as Be, l as $t, b as xt, bG as Ct, L as It, aL as At, aM as Et, a3 as Tt, dv as wt, bV as zt, bz as Pt, cS as ke, B as Ke, bW as Bt, f as ce, ay as Mt, K as Rt, ad as Dt, dw as ue, dx as Lt, n as Ot, C as Ht, dy as _t, dz as Nt, dA as jt, dB as Wt, dC as Gt, dD as Vt } from "./index2.js";
+import { g as Le, m as Je, d as b, r as Xe, aH as xe, t as Ye, u as J, c as oe, _ as W, i as Ce, o as Oe, dn as me, aN as He, h as gt, dp as vt, bv as mt, dq as Qe, P as X, c6 as Pe, dc as le, F as pt, dr as ft, aV as ht, ds as yt, bK as Ge, dt as bt, ao as Ze, e as $e, ax as Ve, av as St, aw as Be, l as $t, b as xt, bG as Ct, L as It, aL as At, aM as Et, a3 as Tt, du as wt, bV as zt, bz as Pt, cS as ke, B as Ke, bW as Bt, f as ce, ay as Mt, K as Rt, ad as Dt, dv as ue, dw as Lt, n as Ot, C as Ht, dx as _t, dy as Nt, dz as jt, dA as Wt, dB as Gt, dC as Vt } from "./index2.js";
 import { T as _e, _ as kt } from "./index11.js";
 import { u as Ie, E as Ne, s as Ae, S as V, a as et } from "./Skeleton.js";
 import { _ as Ft } from "./index5.js";

Неке датотеке нису приказане због велике количине промена