@_tc/template-core 0.2.0-bate.4 → 0.2.0-bate.6

package/AGENT_README.md

@@ -19,7 +19,7 @@ TemplateCore 是一个 TypeScript + Koa + React 的后台框架包。它提供
 | --- | --- |
 | `@_tc/template-core` | `serverStart`、`baseFn`、Koa/Controller/Service 类型。 |
 | `@_tc/template-core/bundler` | `buildFE()`、`buildBE()`。 |
-| `@_tc/template-core/fe` | 前端初始化、请求方法、Dashboard/Schema 类型、共享状态、业务前端组件。 |
+| `@_tc/template-core/fe` | 前端初始化、动态组件渲染辅助、请求方法、Dashboard/Schema 类型、token 工具、共享状态、业务前端组件。 |
 | `@_tc/template-core/fe/common/request` | 请求实例、请求方法和请求类型的显式子路径。 |
 | `@_tc/template-core/fe/rc` | React UI 组件和 SchemaForm 组件。 |
 | `@_tc/template-core/fe/tailwind_ui.css` | 内置前端/UI 全局样式。 |
@@ -367,15 +367,23 @@ import '@_tc/template-core/fe/tailwind_ui.css'
 
 ```ts
 import {
+  addLanguage,
+  addLanguageResources,
   clearRafTimer,
   api,
+  clearAuthToken,
   get,
+  getAuthToken,
+  localKeyMap,
   post,
+  renderImportComponent,
   request,
   rafSetInterval,
   rafSetTimeout,
   schemaEventBus,
   schemaStore,
+  setAuthToken,
+  setLanguage,
   useSchemaStore,
   LanguageSwitch,
   ThemeSwitch,
@@ -407,11 +415,13 @@ import { Button, DataTable, Form, Input, Modal, Select } from '@_tc/template-cor
 - RAF 计时器：`rafSetTimeout`、`rafSetInterval`、`rafClearTimeout`、`rafClearInterval`、`clearRafTimer`。
 - 请求类型：`BaseResponse`、`PageParams`、`PageResponse`、`RequestConfig`、`ResponseConfig`、`AxiosError`。
 - 请求 header：自动添加 `s_t`、`s_sign`、`projk`；存在短 token 时添加 `Authorization: Bearer ${token}`。
+- 默认会先设置 `Content-Type: application/json`；如果是上传文件、`FormData` 或其他内容类型，请在请求配置里显式覆盖。
+- Token 工具：`getAuthToken()`、`setAuthToken()`、`clearAuthToken()`、`localKeyMap`；`getAuthToken()` 是同步函数，读取前无需 `await`。
 - 本地 key：短 token 是 `localStorage.auth_token`，项目 key 是 `localStorage.p_J_k`；刷新 token header 默认名是 `RT`。
-- `getAuthToken()` 是同步函数，读取前无需 `await`。
+- 组件加载辅助：`renderImportComponent(import('./Page'))` 会用 `React.lazy` + `Suspense` 渲染动态组件。
 - Schema 通信：`schemaEventBus`、`eventsInfo`、`merge`。
 - 共享状态：`modeStore`、`schemaStore`、`apiFreezerStore` 及对应 hooks。
-- 多语言：`i18nStore.getState().addResources()`，配置文案可写 `$i18n::...`。
+- 多语言：`addLanguageResources()` / `addResources()` 追加某语种文案，`addLanguage()` 新增语种，`setLanguage()` 切换语言，配置文案可写 `$i18n::...`。
 - 主题：`ThemeSwitch` 会同步根节点 `dark` class 和 `localStorage`。
 - `Input type="password"` 会自动显示密码显隐按钮；`allowClear` 不作用于密码输入。
 - RAF 计时器只在浏览器环境可用，不适合 Node 侧调用。

package/README.md

@@ -182,7 +182,7 @@ http://localhost:9000/dash?projk=demo
 | --- | --- |
 | `@_tc/template-core` | 服务启动、基础 Controller/Service、Koa 类型 |
 | `@_tc/template-core/bundler` | 构建入口，提供前端资源构建 `buildFE` 和消费方 Node/backend 构建 `buildBE` |
-| `@_tc/template-core/fe` | 前端初始化、Dash 路由扩展、请求方法、SchemaPage 事件、共享状态和内置前端组件 |
+| `@_tc/template-core/fe` | 前端初始化、动态组件渲染辅助、Dash 路由扩展、请求方法、SchemaPage 事件、token 工具、共享状态和内置前端组件 |
 | `@_tc/template-core/fe/rc` | UI/SchemaForm 组件和类型 |
 | `@_tc/template-core/fe/rc/hooks` | React hooks 汇总入口 |
 | `@_tc/template-core/fe/tailwind_ui.css` | 前端全局样式入口，源码对应 `frontend/src/main.css` |
@@ -311,18 +311,33 @@ VS Code 建议安装官方 Tailwind CSS IntelliSense 插件，并在工作区 `.
 import {
   api,
   apiFreezerStore,
+  addLanguage,
+  addLanguageResources,
+  addResources,
   AsyncSelect,
+  clearAuthToken,
   eventsInfo,
+  getCurrentLanguage,
+  getFallbackLanguage,
   FreezeState,
   get,
+  getSupportedLanguages,
+  getAuthToken,
   LanguageSwitch,
+  localKeyMap,
   merge,
   modeStore,
   post,
+  renderImportComponent,
   request,
   schemaEventBus,
   schemaStore,
+  setFallbackLanguage,
+  setLanguage,
+  setResources,
+  setAuthToken,
   ThemeSwitch,
+  t,
   useApiFreezer,
   useModeStore,
   useSchemaStore,
@@ -353,29 +368,34 @@ import type {
 | --- | --- |
 | 应用启动 | `initApp` |
 | 内置前端组件 | `AsyncSelect`、`LanguageSwitch`、`ThemeSwitch` |
+| 组件加载辅助 | `renderImportComponent` |
 | Dash 扩展类型 | `DashRoutesExtender`、`DashRoutesContext`、`DashComponentsMap`、`DashHeaderUserAreaProps`、`DashRouteGuard` |
 | SchemaPage 类型 | `CallComComponentsMap`、`CallComRenderer` |
 | SchemaForm 类型 | `FormFieldSchema`、`SchemaFormComponentsMap`、`SchemaFormNamespace`、`SelectProps` |
 | 请求方法 | `api`、`request`、`get`、`post`、`put`、`patch`、`del` |
 | 请求类型 | `BaseResponse`、`PageParams`、`PageResponse`、`RequestConfig`、`ResponseConfig`、`AxiosError` |
+| Token 工具 | `getAuthToken`、`setAuthToken`、`clearAuthToken`、`localKeyMap` |
+| 多语言工具 | `getText`、`t`、`addLanguage`、`addLanguageResources`、`addResources`、`setLanguage`、`setFallbackLanguage`、`setResources`、`getCurrentLanguage`、`getFallbackLanguage`、`getSupportedLanguages` |
 | 请求冻结 | `apiFreezerStore`、`useApiFreezer`、`FreezeState`、`ApiFreezerRequestMatcher` |
 | 事件工具 | `eventsInfo`、`merge` |
 | 共享状态 | `modeStore`、`useModeStore`、`schemaStore`、`useSchemaStore`、`schemaEventBus` |
 
 `modeStore` 管项目模型和当前项目数据，`schemaStore` 管当前 Schema 页面的 schema/cache，`schemaEventBus` 用来在 Search、Table、CallCom 之间通信。
 
+`renderImportComponent` 封装了 `React.lazy` + `Suspense`，默认会用页面骨架屏作为 fallback。`getAuthToken()`、`setAuthToken()` 和 `clearAuthToken()` 用于读写或清理本地短 token，`localKeyMap` 暴露对应的本地存储 key 常量。
+
 只使用请求层时，也可以从 `@_tc/template-core/fe/common/request` 导入 `api`、请求方法和请求类型；这是发布包显式子路径，不要下钻到 `frontend/src/common/request`。
 
 ### 前端多语言
 
-TemplateCore 前端通过 `@_tc/template-core/fe` 暴露 i18n 能力。框架内置中文、英文资源，项目可以继续追加自己的资源。
+TemplateCore 前端通过 `@_tc/template-core/fe` 暴露 i18n 能力。框架内置中文、英文资源，项目可以继续追加自己的资源或新增语种。
 
 **追加自定义语言资源**：
 
 ```ts
-import { i18nStore } from '@_tc/template-core/fe'
+import { addLanguageResources } from '@_tc/template-core/fe'
 
-i18nStore.getState().addResources('zh-CN', {
+addLanguageResources('zh-CN', {
   business: {
     product: {
       menu: '商品管理',
@@ -398,6 +418,24 @@ i18nStore.getState().addResources('en-US', {
 })
 ```
 
+**新增语种并切换**：
+
+```ts
+import { addLanguage, setLanguage } from '@_tc/template-core/fe'
+
+addLanguage('ja-JP', {
+  business: {
+    product: {
+      menu: '商品管理',
+    },
+  },
+})
+
+setLanguage('ja-JP')
+```
+
+`addLanguageResources()` / `addResources()` 默认会深合并同语种文案；传 `{ merge: false }` 可以替换该语种资源。`setResources(resources, { merge: true })` 可批量合并多语种资源。`LanguageSwitch` 默认会把已注册语种加入选项；需要自定义展示文案时仍可传入 `options`。
+
 资源注册时不写 `$i18n::` 前缀，配置中使用时才写：
 
 ```ts
@@ -535,6 +573,7 @@ applyThemeMode('dark', true)
 - `timeout`：15000ms（15秒）
 - `credentials`：`'include'`，支持跨域携带 cookie
 - `window._signKey`：由服务端页面模板从 `app.config.signKey` 注入
+- 默认会先设置 `Content-Type: application/json`；如果是上传文件、`FormData` 或其他内容类型，请在请求配置里显式覆盖
 
 **请求拦截器**：
 

package/fe/frontend/src/common/language.d.ts

@@ -1,2 +1,14 @@
-import type { I18nInterpolationValues, I18nTranslateOptions } from "../../../packages/react/ui/i18n/index";
+import type { I18nAddResourcesOptions, I18nDictionary, I18nInterpolationValues, I18nLanguage, I18nResources, I18nSetResourcesOptions, I18nTranslateOptions } from "../../../packages/react/ui/i18n/index";
+export declare const addLanguageResources: (language: I18nLanguage, messages: I18nDictionary, options?: I18nAddResourcesOptions) => void;
+export declare const addResources: (language: I18nLanguage, messages: I18nDictionary, options?: I18nAddResourcesOptions) => void;
+export declare const addLanguage: (language: I18nLanguage, messages?: I18nDictionary, options?: I18nAddResourcesOptions) => void;
+export declare const setLanguage: (language: I18nLanguage) => void;
+export declare const setFallbackLanguage: (language: I18nLanguage) => void;
+export declare const setResources: (resources: I18nResources, options?: I18nSetResourcesOptions) => void;
+export declare const getCurrentLanguage: () => string;
+export declare const getFallbackLanguage: () => string;
+export declare const getI18nResources: () => Partial<Record<string, I18nDictionary>>;
+export declare const getSupportedLanguages: () => string[];
 export declare const getText: (key: string, fillingData?: I18nInterpolationValues, options?: I18nTranslateOptions) => string;
+export declare const t: <T = string>(key: string, fillingData?: I18nInterpolationValues, options?: I18nTranslateOptions) => string | T;
+export type { I18nAddResourcesOptions, I18nDictionary, I18nInterpolationValues, I18nLanguage, I18nResources, I18nSetResourcesOptions, I18nTranslateOptions, };

package/fe/frontend/src/common/language.js

@@ -2,11 +2,32 @@ import { frontendI18nResources, i18nKeyPrefix } from "../language/index.js";
 import { i18n, i18nStore } from "../../../packages/common/i18n/index.js";
 import "../../../packages/react/ui/i18n/index.js";
 //#region frontend/src/common/language.ts
-i18nStore.getState().addResources("zh-CN", frontendI18nResources["zh-CN"] ?? {});
-i18nStore.getState().addResources("en-US", frontendI18nResources["en-US"] ?? {});
+var addLanguageResources = (language, messages, options) => {
+	i18nStore.getState().addResources(language, messages, options);
+};
+var addResources = addLanguageResources;
+var addLanguage = (language, messages = {}, options) => {
+	addLanguageResources(language, messages, options);
+};
+var setLanguage = (language) => {
+	i18nStore.getState().setLanguage(language);
+};
+var setFallbackLanguage = (language) => {
+	i18nStore.getState().setFallbackLanguage(language);
+};
+var setResources = (resources, options) => {
+	i18nStore.getState().setResources(resources, options);
+};
+var getCurrentLanguage = () => i18nStore.getState().language;
+var getFallbackLanguage = () => i18nStore.getState().fallbackLanguage;
+var getI18nResources = () => i18nStore.getState().resources;
+var getSupportedLanguages = () => Object.keys(getI18nResources());
+addLanguageResources("zh-CN", frontendI18nResources["zh-CN"] ?? {});
+addLanguageResources("en-US", frontendI18nResources["en-US"] ?? {});
 var getText = (key, fillingData, options) => {
 	if (key.includes("$i18n::")) return i18n(key.replace(i18nKeyPrefix, ""), fillingData, options);
 	return key;
 };
+var t = i18n;
 //#endregion
-export { getText };
+export { addLanguage, addLanguageResources, addResources, getCurrentLanguage, getFallbackLanguage, getI18nResources, getSupportedLanguages, getText, setFallbackLanguage, setLanguage, setResources, t };

package/fe/frontend/src/common/request.js

@@ -100,6 +100,7 @@ api.interceptors.request.use(async (config) => {
 	const aauto = getApiAuth();
 	const time = (/* @__PURE__ */ new Date()).getTime();
 	config.headers = {
+		"Content-Type": "application/json",
 		...config.headers,
 		s_t: time + "",
 		s_sign: md5(`${window["_signKey"]}_${time}`),

package/fe/frontend/src/components/LanguageSwitch/LanguageSwitch.js

@@ -2,7 +2,7 @@ import { frontendLangKeys } from "../../language/index.js";
 import { i18nStore } from "../../../../packages/common/i18n/index.js";
 import { useI18nStore } from "../../../../packages/react/ui/i18n/useI18n.js";
 import "../../../../packages/react/ui/i18n/index.js";
-import { getText } from "../../common/language.js";
+import { getSupportedLanguages, getText } from "../../common/language.js";
 import { cn } from "../../../../packages/react/ui/lib/utils.js";
 import { Button } from "../../../../packages/react/ui/components/Button/Button.js";
 import { Dropdown } from "../../../../packages/react/ui/components/Dropdown/Dropdown.js";
@@ -20,10 +20,23 @@ var getDefaultLanguageOptions = () => [{
 	value: "en-US",
 	searchText: "en-US English"
 }];
+var getLanguageOptions = () => {
+	const baseOptions = getDefaultLanguageOptions();
+	const seen = new Set(baseOptions.map((option) => option.value));
+	return [...baseOptions, ...getSupportedLanguages().filter((language) => !seen.has(language)).map((language) => ({
+		label: language,
+		value: language,
+		searchText: language
+	}))];
+};
 var LanguageSwitch = ({ value, defaultValue, options, onChange, className, buttonClassName, placeholder, disabled, loading, clearable: _clearable, searchable: _searchable, placement = "bottom-end", getPopupContainer = "parent", ...props }) => {
 	const rootRef = useRef(null);
 	const currentLanguage = useI18nStore((state) => state.language);
-	const mergedOptions = useMemo(() => options ?? getDefaultLanguageOptions(), [currentLanguage, options]);
+	const mergedOptions = useMemo(() => options ?? getLanguageOptions(), [
+		currentLanguage,
+		options,
+		useI18nStore((state) => state.resources)
+	]);
 	const selectedLanguage = value ?? currentLanguage ?? defaultValue;
 	const selectedOption = mergedOptions.find((option) => option.value === selectedLanguage);
 	const displayText = selectedOption?.label ?? placeholder ?? getText(frontendLangKeys.languageSwitchPlaceholder);

package/fe/frontend/src/index.d.ts

@@ -4,14 +4,16 @@ export * from "./main";
 export type { CallComComponentsMap, CallComRenderer } from "./defaultPages/SchemaPage/schemaType";
 export * from "./components/index";
 export type { FormFieldSchema, SchemaFormComponentsMap, SchemaFormNamespace, SelectProps } from "../../packages/react/ui/index";
-export { api, del, get, patch, post, put, request } from "./common/request";
-export type { AxiosError, BaseResponse, PageParams, PageResponse, RequestConfig, ResponseConfig } from "./common/request";
+export { renderImportComponent } from "./common/importComponent";
 export { clearRafTimer, rafClearInterval, rafClearTimeout, rafSetInterval, rafSetTimeout } from "./common/rafTimer";
 export type { RafTimerCallback, RafTimerId } from "./common/rafTimer";
+export { api, del, FetchAxios, get, patch, post, put, request } from "./common/request";
+export type { AxiosError, BaseResponse, PageParams, PageResponse, RequestConfig, ResponseConfig, } from "./common/request";
 export { applyThemeMode, getCurrentThemeMode, getStoredThemeMode, initThemeMode, persistThemeMode, themeSwitchStorageKey, } from "./common/theme";
 export type { ThemeSwitchMode } from "./common/theme";
+export { clearAuthToken, getAuthToken, localKeyMap, setAuthToken } from "./common/auth/index";
+export * from "./common/language";
 export * from "./defaultPages/SchemaPage/data/eventInfo";
 export { merge } from "./defaultPages/SchemaPage/utils/permissions";
 export * from "./exportStore";
 export { i18n, i18nStore } from "../../packages/react/ui/i18n/index";
-export { getAuthToken, localKeyMap, setAuthToken } from "./common/auth/index";

package/fe/frontend/src/index.js

@@ -1,10 +1,13 @@
-import { getAuthToken, localKeyMap, setAuthToken } from "./common/auth/index.js";
+import { clearAuthToken, getAuthToken, localKeyMap, setAuthToken } from "./common/auth/index.js";
 import { i18n, i18nStore } from "../../packages/common/i18n/index.js";
 import "../../packages/react/ui/i18n/index.js";
+import { addLanguage, addLanguageResources, addResources, getCurrentLanguage, getFallbackLanguage, getI18nResources, getSupportedLanguages, getText, setFallbackLanguage, setLanguage, setResources, t } from "./common/language.js";
 import { FreezeState, apiFreezerStore, useApiFreezer } from "./stores/apiFreezer.js";
+import FetchAxios from "../../packages/common/http/index.js";
 import { api, del, get, patch, post, put, request } from "./common/request.js";
 import { modeStore, useModeStore } from "./stores/mode.js";
 import HeaderView from "./components/BasePage/HeaderView.js";
+import { renderImportComponent } from "./common/importComponent.js";
 import { applyThemeMode, getCurrentThemeMode, getStoredThemeMode, initThemeMode, persistThemeMode, themeSwitchStorageKey } from "./common/theme.js";
 import { generateRouter } from "./components/Router/index.js";
 import { schemaEventBus } from "./stores/schemaEventBus.js";
@@ -18,4 +21,4 @@ import ThemeSwitch_default from "./components/ThemeSwitch/index.js";
 import "./components/index.js";
 import { eventsInfo } from "./defaultPages/SchemaPage/data/eventInfo.js";
 import { merge } from "./defaultPages/SchemaPage/utils/permissions.js";
-export { AsyncSelect_default as AsyncSelect, FreezeState, HeaderView, LanguageSwitch_default as LanguageSwitch, ThemeSwitch_default as ThemeSwitch, api, apiFreezerStore, applyThemeMode, clearRafTimer, del, eventsInfo, generateRouter, get, getAuthToken, getCurrentThemeMode, getStoredThemeMode, i18n, i18nStore, initApp, initThemeMode, localKeyMap, merge, modeStore, patch, persistThemeMode, post, put, rafClearInterval, rafClearTimeout, rafSetInterval, rafSetTimeout, request, schemaEventBus, schemaStore, setAuthToken, themeSwitchStorageKey, useApiFreezer, useModeStore, useSchemaStore };
+export { AsyncSelect_default as AsyncSelect, FetchAxios, FreezeState, HeaderView, LanguageSwitch_default as LanguageSwitch, ThemeSwitch_default as ThemeSwitch, addLanguage, addLanguageResources, addResources, api, apiFreezerStore, applyThemeMode, clearAuthToken, clearRafTimer, del, eventsInfo, generateRouter, get, getAuthToken, getCurrentLanguage, getCurrentThemeMode, getFallbackLanguage, getI18nResources, getStoredThemeMode, getSupportedLanguages, getText, i18n, i18nStore, initApp, initThemeMode, localKeyMap, merge, modeStore, patch, persistThemeMode, post, put, rafClearInterval, rafClearTimeout, rafSetInterval, rafSetTimeout, renderImportComponent, request, schemaEventBus, schemaStore, setAuthToken, setFallbackLanguage, setLanguage, setResources, t, themeSwitchStorageKey, useApiFreezer, useModeStore, useSchemaStore };

package/model/frontend/src/common/language.d.ts

@@ -1,2 +1,14 @@
-import type { I18nInterpolationValues, I18nTranslateOptions } from "../../../../fe/packages/react/ui/i18n/index";
+import type { I18nAddResourcesOptions, I18nDictionary, I18nInterpolationValues, I18nLanguage, I18nResources, I18nSetResourcesOptions, I18nTranslateOptions } from "../../../../fe/packages/react/ui/i18n/index";
+export declare const addLanguageResources: (language: I18nLanguage, messages: I18nDictionary, options?: I18nAddResourcesOptions) => void;
+export declare const addResources: (language: I18nLanguage, messages: I18nDictionary, options?: I18nAddResourcesOptions) => void;
+export declare const addLanguage: (language: I18nLanguage, messages?: I18nDictionary, options?: I18nAddResourcesOptions) => void;
+export declare const setLanguage: (language: I18nLanguage) => void;
+export declare const setFallbackLanguage: (language: I18nLanguage) => void;
+export declare const setResources: (resources: I18nResources, options?: I18nSetResourcesOptions) => void;
+export declare const getCurrentLanguage: () => string;
+export declare const getFallbackLanguage: () => string;
+export declare const getI18nResources: () => Partial<Record<string, I18nDictionary>>;
+export declare const getSupportedLanguages: () => string[];
 export declare const getText: (key: string, fillingData?: I18nInterpolationValues, options?: I18nTranslateOptions) => string;
+export declare const t: <T = string>(key: string, fillingData?: I18nInterpolationValues, options?: I18nTranslateOptions) => string | T;
+export type { I18nAddResourcesOptions, I18nDictionary, I18nInterpolationValues, I18nLanguage, I18nResources, I18nSetResourcesOptions, I18nTranslateOptions, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.2.0-bate.4",
+  "version": "0.2.0-bate.6",
   "description": "A full-stack TypeScript admin framework powered by Koa, React, and Vite - monorepo root",
   "types": "./types/index.d.ts",
   "exports": {