moyan-mfw-cli 1.1.4 → 1.1.6

package/dist/index.cjs

@@ -60,6 +60,15 @@ var fsSync = __toESM(require("fs"), 1);
 var path2 = __toESM(require("path"), 1);
 var import_node_url = require("url");
 var import_meta = {};
+var _currentDir = path2.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+function getCliVersion() {
+  const pkgPathProd = path2.resolve(_currentDir, "../package.json");
+  const pkgPathDev = path2.resolve(_currentDir, "../../package.json");
+  const pkgPath = fsSync.existsSync(pkgPathProd) ? pkgPathProd : pkgPathDev;
+  const raw = fsSync.readFileSync(pkgPath, "utf-8");
+  const pkg = JSON.parse(raw);
+  return pkg.version;
+}
 import_handlebars.default.registerHelper(
   "pascalCase",
   (str) => str.replace(/(^\w|-\w)/g, (c) => c.slice(-1).toUpperCase())
@@ -74,9 +83,8 @@ import_handlebars.default.registerHelper("pascalCaseUpper", (str) => {
 });
 import_handlebars.default.registerHelper("snakeCase", (str) => str.replace(/-/g, "_"));
 function getTemplateDir(type) {
-  const currentDir = path2.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
-  const distTemplate = path2.resolve(currentDir, `templates/${type}`);
-  const srcTemplate = path2.resolve(currentDir, `../templates/${type}`);
+  const distTemplate = path2.resolve(_currentDir, `templates/${type}`);
+  const srcTemplate = path2.resolve(_currentDir, `../templates/${type}`);
   if (fsSync.existsSync(distTemplate)) return distTemplate;
   if (fsSync.existsSync(srcTemplate)) return srcTemplate;
   return distTemplate;
@@ -208,6 +216,7 @@ Use --force to overwrite.`));
     hasFrontend: answers.hasFrontend,
     hasShared: answers.hasShared,
     version: "0.1.0",
+    baseVersion: getCliVersion(),
     year: (/* @__PURE__ */ new Date()).getFullYear()
   };
   const templateDir = getTemplateDir("extension");
@@ -303,6 +312,7 @@ Use --force to overwrite.`));
     frontendPort: Number(answers.frontendPort),
     className,
     version: "0.1.0",
+    baseVersion: getCliVersion(),
     year: (/* @__PURE__ */ new Date()).getFullYear()
   };
   const templateDir = getTemplateDir("business");
@@ -336,7 +346,7 @@ ${import_chalk2.default.yellow("\u26A0 \u9996\u6B21\u5B89\u88C5\u8BF7\u4F7F\u752
 
 // src/index.ts
 var program = new import_commander3.Command();
-program.name("mfw").description("Moyan MFW Framework CLI").version("0.1.0");
+program.name("mfw").description("Moyan MFW Framework CLI").version(getCliVersion());
 var createCmd = new import_commander3.Command("create").description("Create a new extension or resource");
 createCmd.addCommand(createCommand);
 createCmd.addCommand(createBusinessCommand);

package/dist/index.js

@@ -36,6 +36,15 @@ import * as fs2 from "fs/promises";
 import * as fsSync from "fs";
 import * as path2 from "path";
 import { fileURLToPath } from "url";
+var _currentDir = path2.dirname(fileURLToPath(import.meta.url));
+function getCliVersion() {
+  const pkgPathProd = path2.resolve(_currentDir, "../package.json");
+  const pkgPathDev = path2.resolve(_currentDir, "../../package.json");
+  const pkgPath = fsSync.existsSync(pkgPathProd) ? pkgPathProd : pkgPathDev;
+  const raw = fsSync.readFileSync(pkgPath, "utf-8");
+  const pkg = JSON.parse(raw);
+  return pkg.version;
+}
 Handlebars.registerHelper(
   "pascalCase",
   (str) => str.replace(/(^\w|-\w)/g, (c) => c.slice(-1).toUpperCase())
@@ -50,9 +59,8 @@ Handlebars.registerHelper("pascalCaseUpper", (str) => {
 });
 Handlebars.registerHelper("snakeCase", (str) => str.replace(/-/g, "_"));
 function getTemplateDir(type) {
-  const currentDir = path2.dirname(fileURLToPath(import.meta.url));
-  const distTemplate = path2.resolve(currentDir, `templates/${type}`);
-  const srcTemplate = path2.resolve(currentDir, `../templates/${type}`);
+  const distTemplate = path2.resolve(_currentDir, `templates/${type}`);
+  const srcTemplate = path2.resolve(_currentDir, `../templates/${type}`);
   if (fsSync.existsSync(distTemplate)) return distTemplate;
   if (fsSync.existsSync(srcTemplate)) return srcTemplate;
   return distTemplate;
@@ -184,6 +192,7 @@ Use --force to overwrite.`));
     hasFrontend: answers.hasFrontend,
     hasShared: answers.hasShared,
     version: "0.1.0",
+    baseVersion: getCliVersion(),
     year: (/* @__PURE__ */ new Date()).getFullYear()
   };
   const templateDir = getTemplateDir("extension");
@@ -279,6 +288,7 @@ Use --force to overwrite.`));
     frontendPort: Number(answers.frontendPort),
     className,
     version: "0.1.0",
+    baseVersion: getCliVersion(),
     year: (/* @__PURE__ */ new Date()).getFullYear()
   };
   const templateDir = getTemplateDir("business");
@@ -312,7 +322,7 @@ ${chalk2.yellow("\u26A0 \u9996\u6B21\u5B89\u88C5\u8BF7\u4F7F\u7528 --no-frozen-l
 
 // src/index.ts
 var program = new Command3();
-program.name("mfw").description("Moyan MFW Framework CLI").version("0.1.0");
+program.name("mfw").description("Moyan MFW Framework CLI").version(getCliVersion());
 var createCmd = new Command3("create").description("Create a new extension or resource");
 createCmd.addCommand(createCommand);
 createCmd.addCommand(createBusinessCommand);

package/dist/templates/business/backend/package.json.hbs

@@ -28,8 +28,8 @@
     "reflect-metadata": "catalog:",
     "rxjs": "catalog:",
     "typeorm": "catalog:",
-    "moyan-mfw-base": "^1.0.0",
-    "moyan-mfw-extension-ad": "^0.1.0",
+    "moyan-mfw-base": "^{{baseVersion}}",
+    "moyan-mfw-extension-ad": "^{{baseVersion}}",
     "{{name}}-shared": "workspace:*"
   },
   "devDependencies": {

package/dist/templates/business/frontend/package.json.hbs

@@ -15,8 +15,8 @@
     "axios": "catalog:",
     "element-plus": "catalog:",
     "md-editor-v3": "catalog:",
-    "moyan-mfw-base": "^1.0.0",
-    "moyan-mfw-extension-ad": "^0.1.0",
+    "moyan-mfw-base": "^{{baseVersion}}",
+    "moyan-mfw-extension-ad": "^{{baseVersion}}",
     "pinia": "catalog:",
     "quill": "catalog:",
     "vue": "catalog:",

package/dist/templates/business/frontend/src/components/Layout/components/HeaderCommonActions.vue.hbs

@@ -0,0 +1,93 @@
+<template>
+  <div class="header-actions">
+    <el-space :size="2">
+      <!-- 主题切换 -->
+      <div class="action-icon-btn" data-testid="header-theme-btn" @click="toggleTheme">
+        <el-icon :size="18">
+          <component :is="isDark ? Sunny : Moon" />
+        </el-icon>
+      </div>
+
+      <!-- 全屏切换 -->
+      <div class="action-icon-btn" data-testid="header-fullscreen-btn" @click="toggleFullscreen">
+        <el-icon :size="18">
+          <component :is="isFullscreen ? ScaleToOriginal : FullScreen" />
+        </el-icon>
+      </div>
+
+      <!-- 布局设置 -->
+      <div class="action-icon-btn" data-testid="header-settings-btn" @click="openLayoutSettings">
+        <el-icon :size="18"><Setting /></el-icon>
+      </div>
+    </el-space>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Setting, Moon, Sunny, FullScreen, ScaleToOriginal } from '@element-plus/icons-vue';
+import { ref, onMounted, onUnmounted } from 'vue';
+
+const isDark = ref(false);
+const isFullscreen = ref(false);
+
+const toggleTheme = () => {
+  isDark.value = !isDark.value;
+  document.documentElement.classList.toggle('dark', isDark.value);
+};
+
+const toggleFullscreen = async () => {
+  if (!document.fullscreenElement) {
+    await document.documentElement.requestFullscreen();
+    isFullscreen.value = true;
+  } else {
+    await document.exitFullscreen();
+    isFullscreen.value = false;
+  }
+};
+
+const openLayoutSettings = () => {
+  console.log('Open layout settings');
+};
+
+const handleKeydown = (e: KeyboardEvent) => {
+  if ((e.ctrlKey || e.metaKey) && e.key === 'k') {
+    e.preventDefault();
+  }
+};
+
+onMounted(() => {
+  document.addEventListener('keydown', handleKeydown);
+});
+
+onUnmounted(() => {
+  document.removeEventListener('keydown', handleKeydown);
+});
+</script>
+
+<style scoped lang="scss">
+.header-actions {
+  display: flex;
+  align-items: center;
+}
+
+.action-icon-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: rgba(255, 255, 255, 0.85);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border-radius: 4px;
+  padding: 4px;
+  font-weight: 600;
+
+  &:hover {
+    background: rgba(255, 255, 255, 0.12);
+    color: #fff;
+  }
+
+  &:active {
+    background: rgba(255, 255, 255, 0.18);
+  }
+}
+</style>

package/dist/templates/business/frontend/src/components/Layout/index.ts.hbs

@@ -0,0 +1 @@
+export { default as HeaderCommonActions } from './components/HeaderCommonActions.vue';

package/dist/templates/business/frontend/src/env.d.ts.hbs

@@ -0,0 +1,28 @@
+/// <reference types="vite/client" />
+import type { RouteRecordRaw } from 'vue-router'
+
+declare module 'moyan-mfw-base/frontend' {
+  export function createBaseAdminApp(options: unknown): {
+    fetchPermissionValues(): Promise<unknown[]>
+    initPermissionCache(values: unknown[]): void
+    initPermissionValues(values: unknown[]): void
+    mount(selector: string): Promise<void>
+  }
+  export function registerPermissionValues(values: unknown[]): void
+  export function definePageConfig(config: unknown): unknown
+  export function buildRoutesFromConfigs(configs: unknown[], ctx?: unknown): RouteRecordRaw[]
+  export function createBusinessPageConfigFn(permPrefix: string): (page: unknown) => unknown
+}
+
+declare module 'moyan-mfw-base/frontend/style.css' {
+  const content: string
+  export default content
+}
+
+declare module 'moyan-mfw-extension-ad/frontend' {
+  export const adRoutes: RouteRecordRaw[]
+}
+
+declare module 'moyan-mfw-extension-ad/shared' {
+  export const AD_EXTENSION_PERMISSION_VALUES: bigint[]
+}

package/dist/templates/business/frontend/src/main.ts.hbs

@@ -1,10 +1,15 @@
-import { createBaseAdminApp } from 'moyan-mfw-base/frontend'
+import { createBaseAdminApp, registerPermissionValues } from 'moyan-mfw-base/frontend'
+import { HeaderCommonActions } from './components/Layout'
 import { businessRoutes } from './router'
+import { adRoutes } from 'moyan-mfw-extension-ad/frontend'
+import { AD_EXTENSION_PERMISSION_VALUES } from 'moyan-mfw-extension-ad/shared'
 import './permissions'
 
+registerPermissionValues([...AD_EXTENSION_PERMISSION_VALUES])
+
 const admin = createBaseAdminApp({
   title: '{{displayName}}',
-  routes: [...businessRoutes],
+  routes: [...businessRoutes, ...adRoutes],
   layout: {
     layoutMode: 'dual',
     showTabs: true,
@@ -16,6 +21,9 @@ const admin = createBaseAdminApp({
     brandTagline: '{{description}}',
     homePath: '/dashboard',
   },
+  layoutExtensions: {
+    headerCommon: HeaderCommonActions,
+  },
 })
 
 const values = await admin.fetchPermissionValues()

package/dist/templates/business/package.json.hbs

@@ -13,5 +13,13 @@
   "engines": {
     "node": ">=20.0.0",
     "pnpm": ">=8.0.0"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "@nestjs/core",
+      "@parcel/watcher",
+      "esbuild",
+      "vue-demi"
+    ]
   }
 }

package/dist/templates/business/shared/package.json.hbs

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "reflect-metadata": "catalog:",
-    "moyan-mfw-base": "^1.0.0"
+    "moyan-mfw-base": "^{{baseVersion}}"
   },
   "devDependencies": {
     "typescript": "catalog:"

package/dist/templates/extension/frontend/src/main.ts.hbs

@@ -1,7 +1,7 @@
 /**
  * @fileoverview {{displayName}}扩展包前端自启动入口
  */
-import 'moyan-mfw-base/frontend/styles/base-admin.scss'
+import 'moyan-mfw-base/frontend/style.css'
 import { createExtensionFrontendApp } from 'moyan-mfw-base/frontend'
 import { {{pascalCase name}}Routes } from './index'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moyan-mfw-cli",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "MFW framework CLI — extension scaffolding, validation, and publishing tools",
   "type": "module",
   "bin": {