@_tc/template-core 0.0.1-bate.35 → 0.0.1-bate.37

package/cjs/packages/core/loader/router.js

@@ -13,7 +13,6 @@ koa_router = require_runtime.__toESM(koa_router, 1);
 * 解析 xx/app/router/下的所有文件 加载到 koa-router上
 */
 var router_default = (app) => {
-	const router = new koa_router.default();
 	let routerGuard;
 	try {
 		const businessPath = require_packages_core_paths.getAppPath(app, "business");
@@ -21,8 +20,12 @@ var router_default = (app) => {
 	} catch (error) {
 		console.info("-- [router-guard] -- not router-guard.js file");
 	}
+	const routers = [];
 	require_packages_core_paths.getAppPaths(app).forEach((currentPath) => {
 		require_packages_utils_loadFile.loadFileFn(currentPath, "router", { preProcessingFileCallback: (filePath) => {
+			const router = new koa_router.default();
+			router.level = 0;
+			routers.push(router);
 			/**
 			*  module.export = (app,router) => {
 			*      router.get('/xxx/xxxx', app.controller)
@@ -31,7 +34,9 @@ var router_default = (app) => {
 			require_packages_utils_runFileFn.runFileFn(require(require_packages_utils_path.resolve(filePath)))(app, router);
 		} });
 	});
-	router.get("(.*)", async (ctx, _next) => {
+	const BaseRouters = new koa_router.default();
+	BaseRouters.level = 99;
+	BaseRouters.get("(.*)", async (ctx, _next) => {
 		console.info("\x1B[31m%s\x1B[0m", `-- notFound path: ${ctx.path} --`);
 		ctx.status = 302;
 		const executionResults = routerGuard?.(ctx);
@@ -41,9 +46,13 @@ var router_default = (app) => {
 			ctx.body = "notFound";
 		}
 	});
-	app.use(router.routes());
-	app.use(router.allowedMethods());
-	app.currentUseRouter = router;
+	routers.push(BaseRouters);
+	routers.sort((r, nr) => (r.level ?? 0) < (nr.level ?? 0) ? -1 : 1);
+	routers.forEach((r) => {
+		app.use(r.routes());
+		app.use(r.allowedMethods());
+	});
+	app.currentUseRouter = routers;
 };
 //#endregion
 module.exports = router_default;

package/esm/app/controller/base.js

@@ -1,5 +1,5 @@
 //#region app/controller/base.ts
-var base_default = (app) => class BaseController {
+var getBaseController = (app) => class BaseController {
 	app;
 	config;
 	constructor() {
@@ -20,9 +20,9 @@ var base_default = (app) => class BaseController {
 		ctx.body = {
 			data,
 			code,
-			message
+			message: message ?? "ok"
 		};
 	}
 };
 //#endregion
-export { base_default as default };
+export { getBaseController as default };

package/esm/app/controller/project.js

@@ -1,7 +1,7 @@
-import base_default from "./base.js";
+import getBaseController from "./base.js";
 //#region app/controller/project.ts
 var getProjectController = (app) => {
-	const BaseController = base_default(app);
+	const BaseController = getBaseController(app);
 	return class ProjectController extends BaseController {
 		getModelList = async (ctx) => {
 			const dtoModelList = (await this.service.project.getModelList()).reduce((preList, item) => {
@@ -31,7 +31,7 @@ var getProjectController = (app) => {
 			this.success(ctx, dtoModelList);
 		};
 		getProjectList = async (ctx) => {
-			const { proj_key: projectKey } = ctx.query;
+			const { projk: projectKey } = ctx.query;
 			const dtoProject = (await this.service.project.getList(projectKey))?.map((project) => {
 				const { modelKey, key, name, desc, homePage } = project;
 				return {

package/esm/app/controller/view.js

@@ -1,13 +1,22 @@
 //#region app/controller/view.ts
 var getViewController = (app) => class ViewController {
 	async renderPage(ctx) {
-		app.extends.renderView(`dist/${ctx.params.page}.entry.tpl`, ctx, {
-			projKey: ctx.query.proj_key,
-			name: app.options?.name,
-			env: app.envs.get(),
-			basePath: `/view/${ctx.params.page}`,
-			options: JSON.stringify(app.options)
-		});
+		app.extends.logger.log(" - render page: " + ctx.params.page);
+		try {
+			app.extends.renderView(`dist/${ctx.params.page}.entry.tpl`, ctx, {
+				projKey: ctx.query.projk,
+				name: app.options?.name,
+				env: app.envs.get(),
+				basePath: `${app.options.pageBasePage}${ctx.params.page}`,
+				options: JSON.stringify(app.options)
+			});
+		} catch (error) {
+			app.extends.generateErrorMessage("template not found", {
+				status: 404,
+				showError: true,
+				code: 0
+			});
+		}
 	}
 };
 //#endregion

package/esm/app/middleware/api-params-verify.js

@@ -12,7 +12,16 @@ var validateFN = (key, data, schema) => {
 var api_params_verify_default = (app) => async (ctx, next) => {
 	const { path, method } = ctx;
 	if (path.indexOf("/api") < 0) return next();
-	const routePath = app.currentUseRouter.match(path, "get").path[0]?.path;
+	const currentUseRouter = app.currentUseRouter;
+	let route;
+	for (const r of currentUseRouter) {
+		const data = r.match(path, "get");
+		if (data) {
+			route = data;
+			break;
+		}
+	}
+	const routePath = route?.path[0]?.path;
 	if (routePath) {
 		const params = app.extends.parsingParamsOnUrl(routePath, path);
 		const { body, query, headers } = ctx.request;

package/esm/app/middleware/error-handle.js

@@ -1,4 +1,5 @@
 //#region app/middleware/error-handle.ts
+var redirectInfo = {};
 var error_handle_default = (app) => async (ctx, next) => {
 	try {
 		await next();
@@ -8,9 +9,14 @@ var error_handle_default = (app) => async (ctx, next) => {
 		app.extends.logger?.error("-- [excption] --", error);
 		app.extends.logger?.error("-- [excption] info --", status, message, detail);
 		if (message?.includes("template not found")) {
-			ctx.status = 302;
-			ctx.redirect(app.options?.homePage ?? "/");
-			return;
+			const url = ctx.req.url;
+			if (redirectInfo[url] !== void 0) redirectInfo[url] += 1;
+			else redirectInfo[url] = 0;
+			if (redirectInfo[url] < app.config.notFoundRedirectCount) {
+				ctx.status = 302;
+				ctx.redirect(app.options?.homePage ?? "/");
+				return;
+			} else redirectInfo[url] = 0;
 		}
 		if (returnError) {
 			ctx.status = status;

package/esm/app/middleware/project-handler.js

@@ -1,6 +1,6 @@
 //#region app/middleware/project-handler.ts
 var project_handler_default = () => async (ctx, next) => {
-	const key = ctx.headers.proj_key;
+	const key = ctx.headers.projk;
 	const { path } = ctx;
 	if (path.indexOf("/api/proj/") !== -1) {
 		if (!key || ["undefined", "null"].includes(key)) {

package/esm/app/router/view.js

@@ -1,6 +1,8 @@
 //#region app/router/view.ts
 var view_default = (app, router) => {
-	router.get(["/view/:page", "/view/:page(.*)"], app.controller.view.renderPage.bind(app.controller.view));
+	const { pageBasePage } = app.options;
+	router.level = 2;
+	router.get([`${pageBasePage}:page`, `${pageBasePage}:page/:r(.*)`], app.controller.view.renderPage.bind(app.controller.view));
 };
 //#endregion
 export { view_default as default };

package/esm/app/router-schema/project.js

@@ -7,7 +7,7 @@ var routerSchema = {
 	} } },
 	"/api/project/list": { get: { query: {
 		type: "object",
-		properties: { proj_key: { type: "string" } }
+		properties: { projk: { type: "string" } }
 	} } },
 	"/api/project/model_list": { get: {} }
 };

package/esm/app/service/project.js

@@ -8,6 +8,11 @@ var getProjectService = (app) => {
 		async getModelList() {
 			return modelData;
 		}
+		/**
+		*
+		* @param key 不传查所有
+		* @returns
+		*/
 		getList = (key) => {
 			return modelData.reduce((preList, modeItem) => {
 				const { project } = modeItem;

package/esm/bundler/defaultAlias.js

@@ -0,0 +1,4 @@
+//#region bundler/defaultAlias.ts
+var defaultAlias_default = {};
+//#endregion
+export { defaultAlias_default as default };

package/esm/bundler/dev.js

@@ -1,13 +1,14 @@
+import { logGreen, logRed } from "../packages/common/log/index.js";
 import { VBuildFE, entries, watchFiles } from "./utils.js";
 //#region bundler/dev.ts
 var init = async () => {
 	const input = entries();
-	console.log(input);
+	logGreen(input);
 	if (!Object.keys(input).length) {
-		console.error("no entry found");
+		logRed("no entry found");
 		process.exit(1);
 	}
-	await VBuildFE(input);
+	await VBuildFE(input, "dev");
 };
 async function dev() {
 	await init();

package/esm/bundler/index.js

@@ -1,3 +1,4 @@
+import { logRed } from "../packages/common/log/index.js";
 import { dev } from "./dev.js";
 import { prod } from "./prod.js";
 //#region bundler/index.ts
@@ -9,7 +10,7 @@ var buildFE = (mode) => {
 		case "prod":
 			prod();
 			break;
-		default: console.log("Usage: npx tsx scripts/index.ts [dev|prod]");
+		default: logRed("Usage: npx tsx scripts/index.ts [dev|prod]");
 	}
 };
 //#endregion

package/esm/bundler/prod.js

@@ -1,16 +1,17 @@
+import { logGreen, logRed } from "../packages/common/log/index.js";
 import { VBuildFE, entries } from "./utils.js";
 //#region bundler/prod.ts
 async function prod() {
 	const input = entries();
 	if (!Object.keys(input).length) {
-		console.error("no entry found");
+		logRed("no entry found");
 		process.exit(1);
 	}
 	try {
 		await VBuildFE(input);
-		console.log("build done");
+		logGreen("build done");
 	} catch (err) {
-		console.error(String(err));
+		logRed(String(err));
 		process.exit(1);
 	}
 }

package/esm/bundler/utils.js

@@ -1,10 +1,11 @@
 import { resolve as resolve$1 } from "../packages/utils/path.js";
 import "../packages/utils/index.js";
+import { colorize, logJoinColorized, logRed, logWhite, logYellow } from "../packages/common/log/index.js";
 import path from "path";
 import * as glob from "glob";
-import { build } from "vite";
-import { copyFileSync, existsSync, readFileSync, readdirSync, rmdirSync, unlinkSync, writeFileSync } from "fs";
 import tailwindcss from "@tailwindcss/vite";
+import { copyFileSync, existsSync, readFileSync, readdirSync, rmdirSync, unlinkSync, writeFileSync } from "fs";
+import { build } from "vite";
 //#region bundler/utils.ts
 var base = process.cwd();
 var framePath = path.resolve(__dirname, "../../");
@@ -18,8 +19,8 @@ var runFEPath = path.resolve(runPath, "./frontend");
 * 生成入口
 */
 function entries() {
-	console.log("frameFEPath: ", frameFEPath);
-	console.log("runFEPath: ", runFEPath);
+	logWhite("frameFEPath: " + frameFEPath);
+	logWhite("runFEPath: " + runFEPath);
 	/**
 	* 所有包含 entry 的文件
 	*/
@@ -72,12 +73,11 @@ var watchFiles = async (callback) => {
 	watcher.on("change", async (filePath) => {
 		if (building) return;
 		building = true;
-		console.log(`changed: ${filePath}`);
+		logYellow(`changed: ${filePath}`);
 		await callback?.();
-		console.log("rebuild done");
 		building = false;
 	});
-	console.log(`watching ${runFEPath}/...`);
+	logYellow(`watching ${runFEPath}/...`);
 };
 /**
 *
@@ -122,26 +122,55 @@ function flattenHtmlPlugin(suffix = ".html") {
 			* ------------------
 			*/
 			const endFiles = glob.sync("**/*" + suffix, { cwd: feDir });
-			for (const f of endFiles) console.log("final file path -----> ", f);
+			for (const f of endFiles) logYellow("final file path -----> " + f);
 		}
 	};
 }
-var VBuildFE = async (input) => {
-	await build({
-		configFile: false,
-		base: "dist",
-		plugins: [
-			(await import("@vitejs/plugin-react")).default(),
-			flattenHtmlPlugin(".tpl"),
-			tailwindcss()
-		],
-		build: {
-			outDir: outDir(),
-			emptyOutDir: true,
-			rollupOptions: { input }
-		},
-		resolve: { alias: { "@tc/ui-react": path.resolve(__dirname, "../../fe/packages/ui/react/") } }
-	});
+/**
+* 处理别名目录兜底
+* 如果 alias 指向的路径不存在，则使用 ./defaultAlias 兜底文件
+*/
+function resolveAliasWithFallback(aliasList) {
+	const aliasExtensions = [
+		"",
+		".ts",
+		".tsx",
+		".js",
+		".jsx"
+	];
+	return aliasList.reduce((o, [aliasName, aliasPath]) => {
+		const businessFilePath = aliasExtensions.map((ext) => path.resolve(runFEPath, aliasPath + ext)).find((filePath) => existsSync(filePath));
+		let filePath = path.resolve(__dirname, "./defaultAlias");
+		if (businessFilePath) filePath = businessFilePath;
+		o[aliasName] = filePath;
+		return o;
+	}, {});
+}
+var VBuildFE = async (input, OperatingEnv) => {
+	try {
+		await build({
+			configFile: false,
+			base: "/dist",
+			plugins: [
+				(await import("@vitejs/plugin-react")).default(),
+				flattenHtmlPlugin(".tpl"),
+				tailwindcss()
+			],
+			build: {
+				outDir: outDir(),
+				emptyOutDir: true,
+				sourcemap: OperatingEnv === "dev" ? "inline" : "hidden",
+				rollupOptions: { input }
+			},
+			resolve: { alias: {
+				"@tc/ui-react": path.resolve(__dirname, "../../fe/packages/ui/react/"),
+				...resolveAliasWithFallback([["$business/SchemaForm/data", "./extended/SchemaForm/data"]])
+			} }
+		});
+		logJoinColorized(colorize("builded", "green"), colorize(" -> ", "white"), colorize("time: ", "cyan"), colorize(/* @__PURE__ */ new Date(), "pink"));
+	} catch (error) {
+		logRed(error);
+	}
 };
 //#endregion
 export { VBuildFE, entries, outDir, watchFiles };

package/esm/index.js

@@ -1,4 +1,4 @@
-import base_default from "./app/controller/base.js";
+import getBaseController from "./app/controller/base.js";
 import bese_default from "./app/service/bese.js";
 import { resolve } from "./packages/utils/path.js";
 import "./packages/utils/index.js";
@@ -12,7 +12,7 @@ var serverStart = (options) => {
 	});
 };
 var baseFn = {
-	baseControllerFn: base_default,
+	baseControllerFn: getBaseController,
 	baseServiceFn: bese_default
 };
 //#endregion

package/esm/packages/common/LRUCache.js

@@ -0,0 +1,2 @@
+import { LRUCache } from "./cache/LRUCache.js";
+export { LRUCache };

package/esm/packages/common/array/index.js

@@ -0,0 +1,37 @@
+import { isNonNullable } from "../guards/index.js";
+//#region packages/common/array/index.ts
+function toArray(value) {
+	if (value === null || value === void 0) return [];
+	return Array.isArray(value) ? [...value] : [value];
+}
+var compact = (items) => {
+	return items.filter(isNonNullable);
+};
+var uniqueBy = (items, getKey) => {
+	const keys = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const item of items) {
+		const key = getKey(item);
+		if (keys.has(key)) continue;
+		keys.add(key);
+		result.push(item);
+	}
+	return result;
+};
+var groupBy = (items, getKey) => {
+	const result = {};
+	for (const item of items) {
+		const key = getKey(item);
+		result[key] = result[key] ?? [];
+		result[key].push(item);
+	}
+	return result;
+};
+var chunk = (items, size) => {
+	if (!Number.isInteger(size) || size <= 0) throw new RangeError("chunk size must be a positive integer");
+	const result = [];
+	for (let index = 0; index < items.length; index += size) result.push(items.slice(index, index + size));
+	return result;
+};
+//#endregion
+export { chunk, compact, groupBy, toArray, uniqueBy };

package/esm/packages/common/cache/LRUCache.js

@@ -0,0 +1,43 @@
+//#region packages/common/cache/LRUCache.ts
+var LRUCache = class {
+	limit;
+	data;
+	constructor(limit) {
+		if (!Number.isInteger(limit) || limit <= 0) throw new Error("LRUCache limit must be a positive integer");
+		this.limit = limit;
+		this.data = /* @__PURE__ */ new Map();
+	}
+	get size() {
+		return this.data.size;
+	}
+	has(k) {
+		return this.data.has(k);
+	}
+	get(k) {
+		if (!this.data.has(k)) return void 0;
+		const value = this.data.get(k);
+		this.updateSorting(k, value);
+		return value;
+	}
+	set(k, v) {
+		if (this.data.has(k)) {
+			this.updateSorting(k, v);
+			return;
+		}
+		if (this.data.size >= this.limit) this.deleteFirstKey();
+		this.data.set(k, v);
+	}
+	push(k, v) {
+		this.set(k, v);
+	}
+	deleteFirstKey() {
+		const firstKey = this.data.keys().next().value;
+		if (firstKey !== void 0) this.data.delete(firstKey);
+	}
+	updateSorting(k, v) {
+		this.data.delete(k);
+		this.data.set(k, v);
+	}
+};
+//#endregion
+export { LRUCache };

package/esm/packages/common/cache/index.js

@@ -0,0 +1,2 @@
+import { LRUCache } from "./LRUCache.js";
+export { LRUCache };

package/esm/packages/common/guards/index.js

@@ -0,0 +1,26 @@
+//#region packages/common/guards/index.ts
+var isNil = (value) => {
+	return value === null || value === void 0;
+};
+var isNonNullable = (value) => {
+	return value !== null && value !== void 0;
+};
+var isString = (value) => {
+	return typeof value === "string";
+};
+var isNumber = (value) => {
+	return typeof value === "number" && Number.isFinite(value);
+};
+var isBoolean = (value) => {
+	return typeof value === "boolean";
+};
+var isFunction = (value) => {
+	return typeof value === "function";
+};
+var isPlainObject = (value) => {
+	if (value === null || typeof value !== "object") return false;
+	const prototype = Object.getPrototypeOf(value);
+	return prototype === Object.prototype || prototype === null;
+};
+//#endregion
+export { isBoolean, isFunction, isNil, isNonNullable, isNumber, isPlainObject, isString };

package/esm/packages/common/i18n/default.js

@@ -0,0 +1,93 @@
+//#region packages/common/i18n/default.ts
+/**
+* UI 组件库默认中文语言资源。
+*
+* 这里只放组件内置文案，业务项目可以通过 I18nProvider.resources 覆盖或追加。
+*/
+var defaultLanguageResources = {
+	common: {
+		tip: "提示",
+		confirm: "确认",
+		cancel: "取消",
+		close: "关闭",
+		submit: "提交",
+		reset: "重置"
+	},
+	components: {
+		breadcrumb: { close: "关闭" },
+		confirmDialog: {
+			title: "提示",
+			okText: "确认",
+			cancelText: "取消"
+		},
+		dataTable: { noData: "暂无数据" },
+		date: {
+			placeholder: "请选择日期",
+			placeholderDateTime: "请选择日期时间",
+			placeholderRange: "选择日期范围",
+			placeholderDateTimeRange: "选择日期时间范围",
+			weekDays: [
+				"日",
+				"一",
+				"二",
+				"三",
+				"四",
+				"五",
+				"六"
+			],
+			selectTime: "选择时间",
+			startTime: "开始时间",
+			endTime: "结束时间",
+			confirm: "确认",
+			monthFormat: "yyyy年 M月",
+			quickRanges: "快速选择",
+			quickRangeToday: "今天",
+			quickRangeYesterday: "昨天",
+			quickRangeLast7Days: "近7天",
+			quickRangeLast30Days: "近30天",
+			quickRangeThisMonth: "本月",
+			quickRangeLastYear: "最近一年",
+			clear: "清除"
+		},
+		form: {
+			submit: "提交",
+			cancel: "取消"
+		},
+		imagePreview: {
+			closePreview: "关闭预览",
+			previousImage: "上一张",
+			nextImage: "下一张",
+			zoomOut: "缩小",
+			zoomIn: "放大",
+			reset: "重置",
+			rotateLeft: "左旋转",
+			rotateRight: "右旋转",
+			flipHorizontal: "左右镜像",
+			flipVertical: "上下镜像",
+			previewImage: "预览第{index}张"
+		},
+		modal: {
+			close: "关闭",
+			confirmTitle: "提示",
+			okText: "确认",
+			cancelText: "取消"
+		},
+		message: { close: "关闭" },
+		select: { empty: "暂无选项" },
+		tableSearch: {
+			reset: "重置",
+			search: "查询",
+			export: "导出Excel",
+			expand: "展开",
+			collapse: "收起",
+			exportCurrentPage: "当前页",
+			exportCurrentQuery: "当前查询条件"
+		},
+		upload: {
+			deleteImage: "删除图片",
+			upload: "上传"
+		}
+	}
+};
+//#endregion
+export { defaultLanguageResources };