@skyroc/scripts 2.5.0 → 2.5.2

package/README.md

@@ -144,10 +144,13 @@ pnpm sa create-admin my-admin --install
 
 从 `apps/admin` 生成 `packages/@core/scripts/templates/admin`。`apps/admin` 是唯一源码，模板目录是发布快照，不手工维护。
 
-同步产出两样东西：
+同步产出三样东西：
 
-1. `templates/admin/` —— `apps/admin` 的逐字节镜像。跳过 `node_modules`、`dist`、`.turbo`、`.tanstack`、`coverage`、`.DS_Store`、本地 `.env.*.local` 和 `src/features/router/routeTree.gen.ts`，再根据模板自身的 `src/pages` 重新生成 `routeTree.gen.ts`。
-2. `templates/admin.meta.json` —— 物化元数据。**只有在 monorepo 内才解析得出**，所以必须在同步期算好：解析后的依赖版本、展平后的 tsconfig 与 oxlint 配置、根级 `overrides`、以及未发布的 workspace 包清单。`create-admin` 的 standalone 模式只读这份文件做替换，不需要 monorepo 在场。
+1. `templates/admin-root/` + `templates/admin-root.manifest.json` —— 仓库根级工程文件快照。包含 Git 已跟踪的根级点文件/点目录，以及 `AGENTS.md`、`CLAUDE.md`、`skills-lock.json`；排除 `.git`、缓存、构建产物、本机文件，以及 admin 模板已经自带的 `.oxlintrc.json`。manifest 用于还原 npm 固定忽略的 `.npmignore`、`.npmrc` 等点文件及符号链接。
+2. `templates/admin/` —— `apps/admin` 的逐字节镜像。跳过 `node_modules`、`dist`、`.turbo`、`.tanstack`、`coverage`、`.DS_Store`、本地 `.env.*.local` 和 `src/features/router/routeTree.gen.ts`，再根据模板自身的 `src/pages` 重新生成 `routeTree.gen.ts`。
+3. `templates/admin.meta.json` —— 物化元数据。**只有在 monorepo 内才解析得出**，所以必须在同步期算好：解析后的依赖版本、展平后的 tsconfig 与 oxlint 配置、根级 `overrides`、以及未发布的 workspace 包清单。`create-admin` 的 standalone 模式只读这份文件做替换，不需要 monorepo 在场。
+
+`create-admin` 会先复制 `admin-root`，再覆盖 `admin`。因此协作说明、编辑器配置、skills 和格式化配置会进入新项目；`package.json`、`README.md`、`.oxlintrc.json` 等应用已有文件只取 admin 模板版本。
 
 元数据放在 `templates/admin/` **外层**，这样快照目录仍是纯镜像，逐字节比对不需要为 sidecar 开特例。
 

package/dist/cli.mjs

@@ -1,10 +1,10 @@
-import { h as genChangelog, i as release, l as createAdminTemplate, m as cleanup, n as updatePkg, o as gitCommit, r as syncAdminTemplate, s as gitCommitVerify, t as loadCliOptions } from "./config-BKkdncJS.mjs";
+import { h as genChangelog, i as release, l as createAdminTemplate, m as cleanup, n as updatePkg, o as gitCommit, r as syncAdminTemplate, s as gitCommitVerify, t as loadCliOptions } from "./config-Cj9IzlRz.mjs";
 import process from "node:process";
 import { blue, lightGreen, red } from "kolorist";
 import { cac } from "cac";
 
 //#region package.json
-var version = "2.5.0";
+var version = "2.5.1";
 
 //#endregion
 //#region src/cli.ts

package/dist/{config-BKkdncJS.mjs → config-Cj9IzlRz.mjs}

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import { generateChangelog, generateTotalChangelog } from "@soybeanjs/changelog";
 import { rimraf } from "rimraf";
 import { existsSync, readFileSync } from "node:fs";
-import { cp, mkdir, mkdtemp, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
+import { cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, rm, stat, symlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
 import { bgRed, cyan, green, red, yellow } from "kolorist";
@@ -249,6 +249,12 @@ function toStoragePrefix(name) {
 function getTemplateDir() {
 	return path.join(getPackageRoot(), "templates", TEMPLATE_NAME$1);
 }
+function getRootTemplateDir() {
+	return path.join(getPackageRoot(), "templates", "admin-root");
+}
+function getRootTemplateManifestPath() {
+	return path.join(getPackageRoot(), "templates", "admin-root.manifest.json");
+}
 function getShellTemplateDir() {
 	return path.join(getPackageRoot(), "templates", "admin-shell");
 }
@@ -288,6 +294,28 @@ async function installDependencies(cwd) {
 		stdio: "inherit"
 	});
 }
+async function restoreRootTemplateFiles(targetDir) {
+	const manifestPath = getRootTemplateManifestPath();
+	if (!existsSync(manifestPath)) throw new Error(`Admin root template manifest is missing: ${manifestPath}`);
+	const entries = JSON.parse(await readFile(manifestPath, "utf8"));
+	await Promise.all(entries.map(async (entry) => {
+		const target = path.resolve(targetDir, entry.path);
+		const relativeTarget = path.relative(targetDir, target);
+		if (path.isAbsolute(entry.path) || relativeTarget.startsWith("..") || path.isAbsolute(relativeTarget)) throw new Error(`Invalid admin root template path: ${entry.path}`);
+		await mkdir(path.dirname(target), { recursive: true });
+		if (entry.type === "symlink") {
+			if (!entry.target) throw new Error(`Admin root template symlink target is missing: ${entry.path}`);
+			await rm(target, {
+				force: true,
+				recursive: true
+			});
+			await symlink(entry.target, target);
+			return;
+		}
+		if (entry.content === void 0) throw new Error(`Admin root template content is missing: ${entry.path}`);
+		await writeFile(target, Buffer.from(entry.content, "base64"));
+	}));
+}
 /** 独立模式下把 monorepo 协议物化掉，并把物化过程中发现的隐患打印出来。 */
 async function applyStandaloneMaterialization(targetDir, packageName, description) {
 	const metaPath = getTemplateMetaPath();
@@ -309,7 +337,9 @@ async function createAdminTemplate(name, options = {}) {
 	const directoryName = packageName.replace(/^@[^/]+\//, "");
 	const targetDir = path.resolve(process.cwd(), options.target || path.join("apps", directoryName));
 	const templateDir = getTemplateDir();
+	const rootTemplateDir = getRootTemplateDir();
 	if (!existsSync(templateDir)) throw new Error(`Admin template is missing: ${templateDir}`);
+	if (!existsSync(rootTemplateDir)) throw new Error(`Admin root template is missing: ${rootTemplateDir}`);
 	if (existsSync(targetDir) && !await isDirectoryEmpty(targetDir)) {
 		if (!options.force) throw new Error(`Target directory is not empty: ${targetDir}. Use --force to overwrite it.`);
 		await rm(targetDir, {
@@ -318,6 +348,11 @@ async function createAdminTemplate(name, options = {}) {
 		});
 	}
 	await mkdir(path.dirname(targetDir), { recursive: true });
+	await cp(rootTemplateDir, targetDir, {
+		recursive: true,
+		verbatimSymlinks: true
+	});
+	await restoreRootTemplateFiles(targetDir);
 	await cp(templateDir, targetDir, { recursive: true });
 	if (options.workspace) await updatePackageJson(targetDir, packageName, description);
 	else {
@@ -698,9 +733,21 @@ async function resolveTemplateMeta(options) {
 //#endregion
 //#region src/commands/sync-admin-template.ts
 const TEMPLATE_NAME = "admin";
-/** shell 源码模板目录名，与 templates/admin 平级，保持 admin/ 仍是 apps/admin 的逐字节镜像。 */
+/** 仓库根级工程文件模板目录；生成项目时先铺这一层，再由 admin 应用文件覆盖同名项。 */
+const ROOT_TEMPLATE_NAME = "admin-root";
+/** Npm 会主动忽略部分点文件，因此另存一份可完整还原根快照的清单。 */
+const ROOT_TEMPLATE_MANIFEST_FILE = "admin-root.manifest.json";
+/** 不以点开头、但应随新项目保留的仓库根级文件。 */
+const ROOT_TEMPLATE_FILES = [
+	"AGENTS.md",
+	"CLAUDE.md",
+	"skills-lock.json"
+];
+/** Admin 应用模板已有自己的版本，不再从仓库根重复复制。 */
+const ROOT_TEMPLATE_EXCLUDED_FILES = new Set([".oxlintrc.json"]);
+/** Shell 源码模板目录名，与 templates/admin 平级，保持 admin/ 仍是 apps/admin 的逐字节镜像。 */
 const SHELL_TEMPLATE_NAME = "admin-shell";
-/** shell 里会被复制进生成项目 src/framework 的运行时目录；配置、测试与文档不属于产物。 */
+/** Shell 里会被复制进生成项目 src/framework 的运行时目录；配置、测试与文档不属于产物。 */
 const SHELL_RUNTIME_DIRS = [
 	"i18n",
 	"layouts",
@@ -716,6 +763,7 @@ const MAX_REPORTED_DIFFERENCES = 20;
 const TECHNICAL_DIRS = new Set([
 	".tanstack",
 	".turbo",
+	"__pycache__",
 	"coverage",
 	"dist",
 	"node_modules"
@@ -731,7 +779,7 @@ function isTechnicalGeneratedPath(relativePath) {
 	if (!relativePath) return false;
 	const segments = relativePath.split("/");
 	const basename = segments.at(-1);
-	return basename === ".DS_Store" || basename?.endsWith(".tsbuildinfo") || basename?.endsWith(".log") || isLocalEnvFile(relativePath) || segments.some((segment) => TECHNICAL_DIRS.has(segment));
+	return basename === ".DS_Store" || basename?.endsWith(".pyc") || basename?.endsWith(".tsbuildinfo") || basename?.endsWith(".log") || isLocalEnvFile(relativePath) || segments.some((segment) => TECHNICAL_DIRS.has(segment));
 }
 function isRouteTreeFile(relativePath) {
 	return relativePath === "src/features/router/routeTree.gen.ts";
@@ -748,6 +796,46 @@ function resolveSourceDir(workspaceRoot, source) {
 function resolveTargetDir(target) {
 	return path.resolve(process.cwd(), target || path.join(getPackageRoot(), "templates", TEMPLATE_NAME));
 }
+async function collectTrackedRootTemplateFiles(workspaceRoot) {
+	const { execa } = await import("execa");
+	const { stdout } = await execa("git", [
+		"ls-files",
+		"-z",
+		"--",
+		".*",
+		...ROOT_TEMPLATE_FILES
+	], { cwd: workspaceRoot });
+	return stdout.split("\0").map(normalizeRelativePath).filter(Boolean).filter((relativePath) => !ROOT_TEMPLATE_EXCLUDED_FILES.has(relativePath)).filter((relativePath) => !isTechnicalGeneratedPath(relativePath));
+}
+async function copyRootSource(workspaceRoot, targetDir) {
+	await rm(targetDir, {
+		force: true,
+		recursive: true
+	});
+	const files = await collectTrackedRootTemplateFiles(workspaceRoot);
+	const manifestEntries = [];
+	for (const relativePath of files) {
+		const source = path.join(workspaceRoot, relativePath);
+		const target = path.join(targetDir, relativePath);
+		const sourceStat = await lstat(source);
+		await mkdir(path.dirname(target), { recursive: true });
+		await cp(source, target, {
+			recursive: true,
+			verbatimSymlinks: true
+		});
+		if (sourceStat.isSymbolicLink()) manifestEntries.push({
+			path: relativePath,
+			target: await readlink(source),
+			type: "symlink"
+		});
+		else if (sourceStat.isFile()) manifestEntries.push({
+			content: (await readFile(source)).toString("base64"),
+			path: relativePath,
+			type: "file"
+		});
+	}
+	await writeFile(path.join(path.dirname(targetDir), ROOT_TEMPLATE_MANIFEST_FILE), `${JSON.stringify(manifestEntries, null, 2)}\n`);
+}
 async function copyAdminSource(sourceDir, targetDir) {
 	await rm(targetDir, {
 		force: true,
@@ -861,6 +949,7 @@ async function generateSnapshot(workspaceRoot, sourceDir, targetDir) {
 	if (!existsSync(sourceDir)) throw new Error(`Admin source is missing: ${sourceDir}`);
 	const shellSourceDir = path.join(workspaceRoot, "packages/web/admin");
 	const shellTargetDir = path.join(path.dirname(targetDir), SHELL_TEMPLATE_NAME);
+	await copyRootSource(workspaceRoot, path.join(path.dirname(targetDir), ROOT_TEMPLATE_NAME));
 	await copyAdminSource(sourceDir, targetDir);
 	await copyShellSource(shellSourceDir, shellTargetDir);
 	await generateRouteTree(targetDir);
@@ -891,11 +980,22 @@ async function checkAdminTemplate(workspaceRoot, sourceDir, targetDir) {
 		const { metaContent } = await generateSnapshot(workspaceRoot, sourceDir, generatedDir);
 		const differences = await compareDirectories(targetDir, generatedDir);
 		const shellDifferences = await compareDirectories(path.join(path.dirname(targetDir), SHELL_TEMPLATE_NAME), path.join(tempDir, SHELL_TEMPLATE_NAME));
-		differences.push(...shellDifferences.map((item) => ({
+		const rootDifferences = await compareDirectories(path.join(path.dirname(targetDir), ROOT_TEMPLATE_NAME), path.join(tempDir, ROOT_TEMPLATE_NAME));
+		differences.push(...rootDifferences.map((item) => ({
+			...item,
+			path: `${ROOT_TEMPLATE_NAME}/${item.path}`
+		})), ...shellDifferences.map((item) => ({
 			...item,
 			path: `${SHELL_TEMPLATE_NAME}/${item.path}`
 		})));
 		const currentMetaContent = await readMetaContent(path.join(path.dirname(targetDir), TEMPLATE_META_FILE));
+		const rootManifestPath = path.join(path.dirname(targetDir), ROOT_TEMPLATE_MANIFEST_FILE);
+		const generatedRootManifestPath = path.join(tempDir, ROOT_TEMPLATE_MANIFEST_FILE);
+		const [currentRootManifest, generatedRootManifest] = await Promise.all([readMetaContent(rootManifestPath), readMetaContent(generatedRootManifestPath)]);
+		if (currentRootManifest !== generatedRootManifest) differences.push({
+			path: ROOT_TEMPLATE_MANIFEST_FILE,
+			type: currentRootManifest ? "changed" : "added"
+		});
 		if (currentMetaContent !== metaContent) differences.push({
 			path: TEMPLATE_META_FILE,
 			type: currentMetaContent ? "changed" : "added"

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as createCommitMessageRegExp, c as locales, d as replaceEnvValue, f as toStoragePrefix, h as genChangelog, i as release, l as createAdminTemplate, m as cleanup, n as updatePkg, o as gitCommit, p as toTitle, r as syncAdminTemplate, s as gitCommitVerify, t as loadCliOptions, u as normalizePackageName } from "./config-BKkdncJS.mjs";
+import { a as createCommitMessageRegExp, c as locales, d as replaceEnvValue, f as toStoragePrefix, h as genChangelog, i as release, l as createAdminTemplate, m as cleanup, n as updatePkg, o as gitCommit, p as toTitle, r as syncAdminTemplate, s as gitCommitVerify, t as loadCliOptions, u as normalizePackageName } from "./config-Cj9IzlRz.mjs";
 
 //#region src/index.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyroc/scripts",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "type": "module",
   "description": "Skyroc admin CLI - changelog, release, git-commit, cleanup and other project automation scripts",
   "keywords": [

package/templates/admin/package.json

@@ -39,15 +39,17 @@
     "update-pkg": "sa update-pkg"
   },
   "dependencies": {
+    "@better-scroll/core": "catalog:web",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@skyroc/axios": "workspace:*",
     "@skyroc/color": "workspace:*",
     "@skyroc/core-state": "workspace:*",
     "@skyroc/hooks": "workspace:*",
-    "@skyroc/logger": "workspace:*",
     "@skyroc/service": "workspace:*",
     "@skyroc/utils": "workspace:*",
     "@skyroc/web-admin-devtools": "workspace:*",
-    "@skyroc/web-admin-shell": "workspace:*",
     "@skyroc/web-ui": "workspace:*",
     "@tanstack/react-query": "catalog:core",
     "@tanstack/react-router": "catalog:web",
@@ -70,7 +72,7 @@
     "@iconify/json": "catalog:ui-shared",
     "@iconify/react": "catalog:ui-shared",
     "@iconify/types": "catalog:ui-shared",
-    "@sa/uno-config": "workspace:*",
+    "@skyroc/uno-config": "workspace:*",
     "@skyroc/scripts": "workspace:*",
     "@skyroc/web-admin-vite": "workspace:*",
     "@svgr/core": "catalog:web",

package/templates/admin/src/assets/svg-icon/logo.svg

@@ -1,15 +1,3 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 viewBox="0 0 160 160" >
-<path d="M57.8,92.8c1.8-2.1,3.5-4.4,5.4-6.4c7.2-7.8,16.8-11.2,26.8-13.6c11-2.6,22.2-4.8,33.2-7.5c4.9-1.2,9.6-3.2,15.2-5.1
-	c-1.8,3.4-3.1,6.5-5,9.3c-7.7,11.5-19,17.4-32.4,19.6c-5.8,1-11.8,0.9-17.6,1.7c-13.3,1.8-22.4,9.1-26.8,21.5
-	c-3,8.5-5,17.3-7.5,25.9c-0.4,1.3-0.2,2.1,1.2,2.7c21.6,9.5,42.9,8.6,63.7-2.3c0.4-0.2,0.7-0.5,1.5-1c-14.4-13.6-27-29.3-47.3-35.1
-	c0,0.1,0-0.2,0.1-0.4c8.3-5.8,22.5-8.6,31.9-2.4c5.4,3.6,10.1,8.4,15.1,12.7c5,4.3,10,8.7,15.1,13.1c3.1-3.2,6.9-7.8,9.7-13.2
-	c9-17,10.6-34.8,4.9-53.1c-0.6-1.8-0.5-3.2,0.8-4.9c2.1-2.7,3.8-5.8,6.1-9.4c1.8,4.5,3.7,8.6,4.9,12.8c12,42.2-10.7,84.2-51.6,97.7
-	c-25.5,8.4-49.7,4.9-71.7-10.4c-18.1-12.6-29.3-30-32.4-51.7c-3.2-22.3,0.5-43.4,14.4-61.8c12.7-17,29.8-27.3,51-30.5
-	c24.1-3.7,45.8,2.1,64.9,17.1c0.5,0.4,1,0.8,1.4,1.2c0.3,0.3,0.6,0.6,1.3,1.3c-3.2,2.1-6.2,4.3-9.3,6.2c-0.4,0.3-1.6-0.3-2.3-0.8
-	c-25-17.8-59.4-19-84.6,0.2c-14.3,10.9-22.4,25.6-24.9,43c-2.6,18.2,0.8,35.2,11.8,50.3c2.4,3.3,5.4,6.3,8.5,9.9
-	c1.5-5.9,2.8-11.2,4.2-16.4c2.8-10.4,5.2-20.9,8.5-31.1c4.8-15.1,15.2-25.5,30-31.2c9-3.5,18.5-6,27.8-8.8
-	c11.4-3.5,22.8-6.8,32.6-13.8c5.2-3.7,9.8-7.9,13.6-13.6c0.1,3.2,0.6,6.5,0.4,9.7c-0.6,10.7-4.3,19.9-13,26.8
-	c-7.3,5.7-15.8,8.9-24.7,11c-9.4,2.2-18.9,4-28.2,6.4c-8.9,2.3-16.9,6.6-22.3,14.3c-2.1,2.9-3.4,6.4-5.1,9.7
-	C57.3,92.6,57.5,92.7,57.8,92.8z" fill="currentColor"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 160" role="img" aria-label="Skyroc 天鹏">
+  <path fill="currentColor" fill-rule="evenodd" d="M 8.31 49.69 Q 8.00 51.38 8.00 54.15 Q 8.00 56.92 8.46 59.08 Q 8.92 61.23 9.85 63.54 Q 10.77 65.85 12.31 68.15 Q 13.85 70.46 15.77 72.38 Q 17.69 74.31 19.85 75.85 Q 22.00 77.38 24.46 78.62 Q 26.92 79.85 30.85 81.00 Q 34.77 82.15 31.92 82.23 Q 29.08 82.31 27.38 82.00 Q 25.69 81.69 23.85 81.08 Q 22.00 80.46 19.23 78.92 Q 16.46 77.38 16.38 78.08 Q 16.31 78.77 16.77 80.15 Q 17.23 81.54 18.15 83.23 Q 19.08 84.92 22.08 87.92 Q 25.08 90.92 28.15 92.46 Q 31.23 94.00 36.00 94.77 Q 40.77 95.54 44.62 95.23 Q 48.46 94.92 53.85 93.69 Q 59.23 92.46 62.15 92.46 Q 65.08 92.46 67.38 93.38 Q 69.69 94.31 70.85 95.46 Q 72.00 96.62 72.46 97.54 Q 72.92 98.46 72.77 100.77 Q 72.62 103.08 71.54 105.38 Q 70.46 107.69 66.92 113.23 Q 63.38 118.77 62.92 120.31 Q 62.46 121.85 62.46 123.54 Q 62.46 125.23 63.08 126.92 Q 63.69 128.62 64.69 129.62 Q 65.69 130.62 69.00 123.92 Q 72.31 117.23 73.92 111.15 Q 75.54 105.08 75.62 108.38 Q 75.69 111.69 74.31 118.31 Q 72.92 124.92 72.77 126.92 Q 72.62 128.92 72.92 130.62 Q 73.23 132.31 74.15 134.31 Q 75.08 136.31 77.31 139.00 Q 79.54 141.69 80.00 141.69 Q 80.46 141.69 81.31 140.85 Q 82.15 140.00 83.85 137.69 Q 85.54 135.38 86.46 132.46 Q 87.38 129.54 87.23 127.08 Q 87.08 124.62 85.69 117.54 Q 84.31 110.46 84.38 107.62 Q 84.46 104.77 86.23 111.31 Q 88.00 117.85 91.00 124.23 Q 94.00 130.62 95.00 129.77 Q 96.00 128.92 96.77 127.23 Q 97.54 125.54 97.54 123.38 Q 97.54 121.23 97.08 119.85 Q 96.62 118.46 93.38 113.54 Q 90.15 108.62 88.77 105.54 Q 87.38 102.46 87.23 100.77 Q 87.08 99.08 88.00 97.38 Q 88.92 95.69 90.08 94.69 Q 91.23 93.69 93.23 92.92 Q 95.23 92.15 97.54 92.15 Q 99.85 92.15 107.08 93.69 Q 114.31 95.23 118.31 95.23 Q 122.31 95.23 126.31 94.15 Q 130.31 93.08 133.08 91.38 Q 135.85 89.69 138.69 86.54 Q 141.54 83.38 142.69 80.38 Q 143.85 77.38 139.08 79.54 Q 134.31 81.69 132.62 82.00 Q 130.92 82.31 128.23 82.23 Q 125.54 82.15 129.00 81.15 Q 132.46 80.15 135.54 78.62 Q 138.62 77.08 140.31 75.85 Q 142.00 74.62 144.69 71.77 Q 147.38 68.92 148.77 66.46 Q 150.15 64.00 150.92 61.54 Q 151.69 59.08 151.85 55.08 Q 152.00 51.08 151.54 49.08 Q 151.08 47.08 150.77 47.08 Q 150.46 47.08 147.85 51.08 Q 145.23 55.08 140.69 59.15 Q 136.15 63.23 131.08 66.00 Q 126.00 68.77 119.69 70.92 Q 113.38 73.08 109.69 74.77 Q 106.00 76.46 101.85 79.85 Q 97.69 83.23 97.46 83.15 Q 97.23 83.08 98.77 80.92 Q 100.31 78.77 103.62 75.92 Q 106.92 73.08 110.62 71.08 Q 114.31 69.08 119.54 67.08 Q 124.77 65.08 129.54 62.46 Q 134.31 59.85 137.31 57.15 Q 140.31 54.46 141.85 52.31 Q 143.38 50.15 144.77 46.31 Q 146.15 42.46 146.15 38.62 Q 146.15 34.77 145.38 32.00 Q 144.62 29.23 143.54 26.92 Q 142.46 24.62 139.92 21.46 Q 137.38 18.31 136.54 22.69 Q 135.69 27.08 134.62 29.85 Q 133.54 32.62 130.00 38.00 Q 126.46 43.38 121.62 48.08 Q 116.77 52.77 108.15 59.38 Q 99.54 66.00 95.08 70.77 Q 90.62 75.54 89.92 75.00 Q 89.23 74.46 88.46 73.08 Q 87.69 71.69 87.38 68.92 Q 87.08 66.15 88.15 63.69 Q 89.23 61.23 90.54 60.08 Q 91.85 58.92 93.15 58.54 Q 94.46 58.15 93.77 57.15 Q 93.08 56.15 88.92 56.31 Q 84.77 56.46 82.62 57.69 Q 80.46 58.92 78.69 60.85 Q 76.92 62.77 77.85 62.77 Q 78.77 62.77 76.62 66.77 Q 74.46 70.77 72.85 72.38 Q 71.23 74.00 70.15 74.46 Q 69.08 74.92 64.46 70.15 Q 59.85 65.38 51.23 58.77 Q 42.62 52.15 38.08 47.77 Q 33.54 43.38 31.54 40.77 Q 29.54 38.15 27.85 35.08 Q 26.15 32.00 25.08 28.92 Q 24.00 25.85 23.31 22.08 Q 22.62 18.31 20.23 21.31 Q 17.85 24.31 16.77 26.46 Q 15.69 28.62 14.77 31.85 Q 13.85 35.08 13.85 38.77 Q 13.85 42.46 15.23 46.31 Q 16.62 50.15 18.15 52.31 Q 19.69 54.46 23.62 57.77 Q 27.54 61.08 30.77 62.77 Q 34.00 64.46 40.00 66.77 Q 46.00 69.08 50.46 71.54 Q 54.92 74.00 57.77 76.69 Q 60.62 79.38 61.77 81.46 Q 62.92 83.54 60.46 81.23 Q 58.00 78.92 55.23 77.08 Q 52.46 75.23 49.69 74.00 Q 46.92 72.77 39.85 70.46 Q 32.77 68.15 27.69 65.23 Q 22.62 62.31 19.00 59.00 Q 15.38 55.69 12.38 51.31 Q 9.38 46.92 9.00 47.46 Q 8.62 48.00 8.31 49.69 Z"/>
 </svg>

package/templates/admin/src/features/router/routeTree.gen.ts

@@ -18,6 +18,9 @@ import { Route as authLoginOutRouteImport } from './../../pages/(auth)/login-out
 import { Route as authLoginLayoutRouteImport } from './../../pages/(auth)/login/layout'
 import { Route as authLoginIndexRouteImport } from './../../pages/(auth)/login/index'
 import { Route as adminHomeIndexRouteImport } from './../../pages/(admin)/home/index'
+import { Route as authLoginResetPwdRouteImport } from './../../pages/(auth)/login/reset-pwd'
+import { Route as authLoginRegisterRouteImport } from './../../pages/(auth)/login/register'
+import { Route as authLoginCodeLoginRouteImport } from './../../pages/(auth)/login/code-login'
 
 const adminLayoutRoute = adminLayoutRouteImport.update({
   id: '/(admin)',
@@ -63,6 +66,21 @@ const adminHomeIndexRoute = adminHomeIndexRouteImport.update({
   path: '/home/',
   getParentRoute: () => adminLayoutRoute,
 } as any)
+const authLoginResetPwdRoute = authLoginResetPwdRouteImport.update({
+  id: '/reset-pwd',
+  path: '/reset-pwd',
+  getParentRoute: () => authLoginLayoutRoute,
+} as any)
+const authLoginRegisterRoute = authLoginRegisterRouteImport.update({
+  id: '/register',
+  path: '/register',
+  getParentRoute: () => authLoginLayoutRoute,
+} as any)
+const authLoginCodeLoginRoute = authLoginCodeLoginRouteImport.update({
+  id: '/code-login',
+  path: '/code-login',
+  getParentRoute: () => authLoginLayoutRoute,
+} as any)
 
 export interface FileRoutesByFullPath {
   '/': typeof IndexRoute
@@ -71,6 +89,9 @@ export interface FileRoutesByFullPath {
   '/403': typeof errors403Route
   '/404': typeof errors404Route
   '/500': typeof errors500Route
+  '/login/code-login': typeof authLoginCodeLoginRoute
+  '/login/register': typeof authLoginRegisterRoute
+  '/login/reset-pwd': typeof authLoginResetPwdRoute
   '/home/': typeof adminHomeIndexRoute
   '/login/': typeof authLoginIndexRoute
 }
@@ -80,6 +101,9 @@ export interface FileRoutesByTo {
   '/403': typeof errors403Route
   '/404': typeof errors404Route
   '/500': typeof errors500Route
+  '/login/code-login': typeof authLoginCodeLoginRoute
+  '/login/register': typeof authLoginRegisterRoute
+  '/login/reset-pwd': typeof authLoginResetPwdRoute
   '/home': typeof adminHomeIndexRoute
   '/login': typeof authLoginIndexRoute
 }
@@ -92,6 +116,9 @@ export interface FileRoutesById {
   '/(errors)/403': typeof errors403Route
   '/(errors)/404': typeof errors404Route
   '/(errors)/500': typeof errors500Route
+  '/(auth)/login/code-login': typeof authLoginCodeLoginRoute
+  '/(auth)/login/register': typeof authLoginRegisterRoute
+  '/(auth)/login/reset-pwd': typeof authLoginResetPwdRoute
   '/(admin)/home/': typeof adminHomeIndexRoute
   '/(auth)/login/': typeof authLoginIndexRoute
 }
@@ -104,10 +131,23 @@ export interface FileRouteTypes {
     | '/403'
     | '/404'
     | '/500'
+    | '/login/code-login'
+    | '/login/register'
+    | '/login/reset-pwd'
     | '/home/'
     | '/login/'
   fileRoutesByTo: FileRoutesByTo
-  to: '/' | '/login-out' | '/403' | '/404' | '/500' | '/home' | '/login'
+  to:
+    | '/'
+    | '/login-out'
+    | '/403'
+    | '/404'
+    | '/500'
+    | '/login/code-login'
+    | '/login/register'
+    | '/login/reset-pwd'
+    | '/home'
+    | '/login'
   id:
     | '__root__'
     | '/'
@@ -117,6 +157,9 @@ export interface FileRouteTypes {
     | '/(errors)/403'
     | '/(errors)/404'
     | '/(errors)/500'
+    | '/(auth)/login/code-login'
+    | '/(auth)/login/register'
+    | '/(auth)/login/reset-pwd'
     | '/(admin)/home/'
     | '/(auth)/login/'
   fileRoutesById: FileRoutesById
@@ -196,6 +239,27 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof adminHomeIndexRouteImport
       parentRoute: typeof adminLayoutRoute
     }
+    '/(auth)/login/reset-pwd': {
+      id: '/(auth)/login/reset-pwd'
+      path: '/reset-pwd'
+      fullPath: '/login/reset-pwd'
+      preLoaderRoute: typeof authLoginResetPwdRouteImport
+      parentRoute: typeof authLoginLayoutRoute
+    }
+    '/(auth)/login/register': {
+      id: '/(auth)/login/register'
+      path: '/register'
+      fullPath: '/login/register'
+      preLoaderRoute: typeof authLoginRegisterRouteImport
+      parentRoute: typeof authLoginLayoutRoute
+    }
+    '/(auth)/login/code-login': {
+      id: '/(auth)/login/code-login'
+      path: '/code-login'
+      fullPath: '/login/code-login'
+      preLoaderRoute: typeof authLoginCodeLoginRouteImport
+      parentRoute: typeof authLoginLayoutRoute
+    }
   }
 }
 
@@ -212,10 +276,16 @@ const adminLayoutRouteWithChildren = adminLayoutRoute._addFileChildren(
 )
 
 interface authLoginLayoutRouteChildren {
+  authLoginCodeLoginRoute: typeof authLoginCodeLoginRoute
+  authLoginRegisterRoute: typeof authLoginRegisterRoute
+  authLoginResetPwdRoute: typeof authLoginResetPwdRoute
   authLoginIndexRoute: typeof authLoginIndexRoute
 }
 
 const authLoginLayoutRouteChildren: authLoginLayoutRouteChildren = {
+  authLoginCodeLoginRoute: authLoginCodeLoginRoute,
+  authLoginRegisterRoute: authLoginRegisterRoute,
+  authLoginResetPwdRoute: authLoginResetPwdRoute,
   authLoginIndexRoute: authLoginIndexRoute,
 }
 

package/templates/admin/src/pages/(auth)/login/code-login.tsx

@@ -0,0 +1,79 @@
+import { useCaptcha } from '@skyroc/hooks';
+import { ButtonLink } from '@shell/ui/antd';
+import { REG_PHONE } from '@skyroc/utils';
+import { createFileRoute } from '@tanstack/react-router';
+
+import { useAuthFormRules } from '@/features/auth/use-auth-form-rules';
+
+type FormValues = {
+  code: string;
+  phone: string;
+};
+
+const CodeLogin = () => {
+  const [form] = AForm.useForm<FormValues>();
+
+  const { t } = useTranslation();
+
+  const { getCaptcha, isCounting, label, loading } = useCaptcha(t('page.login.codeLogin.getCode'), getCountingLabel);
+
+  const { formRules } = useAuthFormRules();
+
+  const phone = AForm.useWatch('phone', form);
+
+  const isValidPhone = REG_PHONE.test(phone);
+
+  function handleSubmit(_params: FormValues) {
+    // request to reset password
+    showSuccessMessage(t('page.login.common.validateSuccess'));
+  }
+
+  function getCountingLabel(count: number) {
+    return t('page.login.codeLogin.reGetCode', { time: count });
+  }
+
+  function sendCaptcha() {
+    getCaptcha(phone);
+  }
+
+  useKeyPress('enter', () => {
+    form.submit();
+  });
+
+  return (
+    <>
+      <h3 className="text-18px text-primary font-medium">{t('page.login.codeLogin.title')}</h3>
+      <AForm className="pt-24px" form={form} onFinish={handleSubmit}>
+        <AForm.Item name="phone" rules={formRules.phone}>
+          <AInput placeholder={t('page.login.common.phonePlaceholder')} />
+        </AForm.Item>
+
+        <AForm.Item name="code" rules={formRules.code}>
+          <div className="w-full flex-y-center gap-16px">
+            <AInput placeholder={t('page.login.common.codePlaceholder')} />
+            <AButton disabled={!isValidPhone || isCounting} loading={loading} size="large" onClick={sendCaptcha}>
+              {label}
+            </AButton>
+          </div>
+        </AForm.Item>
+        <ASpace className="w-full" orientation="vertical" size={18}>
+          <AButton block htmlType="submit" shape="round" size="large" type="primary">
+            {t('common.confirm')}
+          </AButton>
+
+          <ButtonLink block shape="round" size="large" to="..">
+            {t('page.login.common.back')}
+          </ButtonLink>
+        </ASpace>
+      </AForm>
+    </>
+  );
+};
+
+export const Route = createFileRoute('/(auth)/login/code-login')({
+  component: CodeLogin,
+  staticData: {
+    title: 'code-login',
+    i18nKey: 'route.login_code-login'
+  }
+});

package/templates/admin/src/pages/(auth)/login/index.tsx

@@ -1,7 +1,8 @@
+import { ButtonLink } from '@shell/ui/antd';
 import { createFileRoute } from '@tanstack/react-router';
 
-import { useAuthFormRules } from '@/features/auth/use-auth-form-rules';
 import { useInitLogin } from '@/features/auth/use-login';
+import { useAuthFormRules } from '@/features/auth/use-auth-form-rules';
 
 type AccountKey = 'admin' | 'super' | 'user';
 
@@ -19,6 +20,11 @@ const INITIAL_VALUES = {
   userName: 'Soybean'
 };
 
+const LOGIN_ACTION_I18N_KEYS = {
+  codeLogin: 'page.login.codeLogin.title',
+  register: 'page.login.register.title'
+} as const satisfies Record<'codeLogin' | 'register', I18n.I18nKey>;
+
 const Login = () => {
   const { t } = useTranslation();
 
@@ -74,9 +80,24 @@ const Login = () => {
           <AInput.Password autoComplete="password" size="large" />
         </AForm.Item>
         <ASpace className="w-full" orientation="vertical" size={24}>
+          <div className="flex-y-center justify-between">
+            <ACheckbox>{t('page.login.pwdLogin.rememberMe')}</ACheckbox>
+
+            <ButtonLink btnType="text" to="/login/reset-pwd">
+              {t('page.login.pwdLogin.forgetPassword')}
+            </ButtonLink>
+          </div>
           <AButton block color="primary" htmlType="submit" loading={loading} shape="round" size="large" type="primary">
             {t('common.confirm')}
           </AButton>
+          <div className="flex-y-center justify-between gap-12px">
+            <ButtonLink block className="flex-1" to="/login/code-login">
+              {t(LOGIN_ACTION_I18N_KEYS.codeLogin) as string}
+            </ButtonLink>
+            <ButtonLink block className="flex-1" to="/login/register">
+              {t(LOGIN_ACTION_I18N_KEYS.register) as string}
+            </ButtonLink>
+          </div>
           <ADivider className="!m-0 !text-14px !text-#666">{t('page.login.pwdLogin.otherAccountLogin')}</ADivider>
           <div className="flex-center gap-12px">
             {accounts.map(item => {

package/templates/admin/src/pages/(auth)/login/layout.tsx

@@ -1,20 +1,37 @@
-import { mixColor } from '@skyroc/color';
+import { getPaletteColorByNumber, mixColor } from '@skyroc/color';
+import { WaveBg } from '@shell/ui/compose';
 import { useSettingsTheme } from '@shell/theme';
 import { Outlet, createFileRoute, redirect, useLocation } from '@tanstack/react-router';
 import { AnimatePresence, motion } from 'motion/react';
 import { z } from 'zod';
 
+import Header from './modules/Header';
+
 const COLOR_WHITE = '#ffffff';
 
 const LoginSearchSchema = z.object({
   redirect: z.string().startsWith('/').optional()
 });
 
-const LoginLayout = () => {
-  const { t } = useTranslation();
+export const Route = createFileRoute('/(auth)/login')({
+  component: LoginLayout,
+  validateSearch: LoginSearchSchema,
+  beforeLoad: async ({ context, search }) => {
+    if (context.isLoggedIn) {
+      throw redirect({ to: search.redirect || context.getHomeRoute() });
+    }
+  },
+  staticData: {
+    title: 'login',
+    i18nKey: 'route.login'
+  }
+});
 
+function LoginLayout() {
   const { darkMode, themeColor } = useSettingsTheme();
 
+  const bgThemeColor = darkMode ? getPaletteColorByNumber(themeColor, 600) : themeColor;
+
   const ratio = darkMode ? 0.5 : 0.2;
 
   const location = useLocation();
@@ -23,12 +40,11 @@ const LoginLayout = () => {
 
   return (
     <div className="relative size-full flex-center overflow-hidden bg-layout" style={{ backgroundColor: bgColor }}>
-      <ACard className="relative z-4 w-auto rd-8px" variant="borderless">
+      <WaveBg themeColor={bgThemeColor} />
+
+      <ACard className="relative z-4 w-auto rd-12px" variant="borderless">
         <div className="w-400px lt-sm:w-300px">
-          <div className="text-center">
-            <h1 className="m-0 text-28px font-600 text-primary">{t('system.title')}</h1>
-            <p className="m-0 mt-8px text-14px text-text-2">{t('page.login.common.loginOrRegister')}</p>
-          </div>
+          <Header />
 
           <AnimatePresence initial={false} mode="wait">
             <motion.main
@@ -54,18 +70,4 @@ const LoginLayout = () => {
       </ACard>
     </div>
   );
-};
-
-export const Route = createFileRoute('/(auth)/login')({
-  component: LoginLayout,
-  validateSearch: LoginSearchSchema,
-  beforeLoad: async ({ context, search }) => {
-    if (context.isLoggedIn) {
-      throw redirect({ to: search.redirect || context.getHomeRoute() });
-    }
-  },
-  staticData: {
-    title: 'login',
-    i18nKey: 'route.login'
-  }
-});
+}