zhixuan-plugin-cli 1.0.3 → 1.0.4

package/bin/index.js

@@ -32,6 +32,16 @@ program
     require('../commands/pull')(options);
   });
 
+// 注册 createPage 命令 - 支持name和page参数
+program
+  .command('createPage')
+  .description('添加应该新页面')
+  .option('--name <pageName>', '页面名称')
+  .option('--path <pagePath>', '页面路径')
+  .action((options) => {
+    require('../commands/createPage')(options);
+  });
+
 // 注册 push 命令 - 支持pluginId、version和token参数
 program
   .command('push')
@@ -63,6 +73,9 @@ program.on('--help', () => {
   console.log(chalk.cyan('    # 拉取插件到指定目录'));
   console.log(chalk.white('    $ zx-cli pull --versionId <version-id> --token <token> --dir ./my-plugins'));
   console.log();
+  console.log(chalk.cyan('    # 添加页面（使用页面名称、页面路径）'));
+  console.log(chalk.white('    $ zx-cli createPage --name <pageName> --path <pagePath>'));
+  console.log();
   console.log(chalk.cyan('    # 推送插件（使用插件ID、插件版本、token）'));
   console.log(chalk.white('    $ zx-cli push --pluginId <plugin-id> --versionNum <version> -vDesc <versionDescription> --token <token>'));
   console.log();

package/commands/createPage.js

@@ -0,0 +1,226 @@
+// commands/createPage.js
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const fs = require('fs-extra');
+const path = require('path');
+
+module.exports = async function createPage(options) {
+  let { name: pageName, path: pagePath } = options;
+
+  console.log();
+  console.log(chalk.cyan('✨ 开始创建页面'));
+
+  // 验证参数
+  if (!pageName || !pagePath) {
+    if (!pageName) {
+      const nameAnswer = await inquirer.prompt([
+        {
+          name: 'pageName',
+          type: 'input',
+          message: '请输入页面名称:',
+          validate: input => {
+            if (!input.trim()) {
+              return '页面名称不能为空';
+            }
+            return true;
+          }
+        }
+      ]);
+      pageName = nameAnswer.pageName;
+    }
+
+    if (!pagePath) {
+      const pageAnswer = await inquirer.prompt([
+        {
+          name: 'pagePath',
+          type: 'input',
+          message: '请输入页面路径:',
+          default: `/${pageName.toLowerCase()}`,
+          validate: input => {
+            if (!input.trim()) {
+              return '页面路径不能为空';
+            }
+            return true;
+          }
+        }
+      ]);
+      pagePath = pageAnswer.pagePath;
+    }
+  }
+
+  // 获取当前工作目录
+  const projectRoot = process.cwd();
+  
+  // 查找页面目录位置
+  let pagesDir = null;
+  const possiblePagesDirs = ['src/pages', 'src/views', 'pages', 'views'];
+  
+  for (const dir of possiblePagesDirs) {
+    const fullPath = path.join(projectRoot, dir);
+    if (await fs.pathExists(fullPath)) {
+      pagesDir = fullPath;
+      break;
+    }
+  }
+
+  if (!pagesDir) {
+    console.log(chalk.red('❌ 未找到页面目录 (src/pages, src/views, pages, views)'));
+    return;
+  }
+
+  // 创建页面目录
+  const pageDir = path.join(pagesDir, pagePath);
+  if (await fs.pathExists(pageDir)) {
+    const { confirm } = await inquirer.prompt([
+      {
+        name: 'confirm',
+        type: 'confirm',
+        message: `页面目录 ${chalk.cyan(pageName)} 已存在，是否覆盖?`
+      }
+    ]);
+    
+    if (!confirm) {
+      console.log(chalk.yellow('操作已取消'));
+      return;
+    }
+  } else {
+    await fs.ensureDir(pageDir);
+  }
+
+  // 创建页面文件
+  const pageFileName = `index.vue`;
+  const pageFilePath = path.join(pageDir, pageFileName);
+
+  // 页面模板内容
+  const relativePath = path.relative(path.join(projectRoot, 'src'), pageDir).replace(/\\/g, '/');
+  const pageContent = `<!-- ${relativePath}/index.vue -->
+<template>
+  <div class="${pagePath.toLowerCase()}">
+    <h1>${pageName}</h1>
+    <p>欢迎来到 ${pageName} 页面</p>
+    userInfo：
+    <json-viewer :value="userInfo"></json-viewer>
+    <div>getModelList 结果：</div>
+    <json-viewer :value="modelListData"></json-viewer>
+    <div>getFormConfig 结果：</div>
+    <json-viewer :value="formConfigData"></json-viewer>
+  </div>
+</template>
+
+<script>
+import JsonViewer from 'vue-json-viewer';
+export default {
+  name: '${pagePath.charAt(0).toUpperCase() + pagePath.slice(1)}Index',
+  components: { JsonViewer },
+    data() {
+    return {
+      modelListData: {},
+      formConfigData: {}
+    }
+  },
+  computed: {
+    userInfo() {
+      return this.$zxUtils?.userInfo ?? {}
+    }
+  },
+  mounted() {
+    console.log('@@@zxUtils', this.$zxUtils);
+    this.fetchModelList();
+    this.fetchFormConfig();
+  },
+  methods: {
+    async fetchModelList() {
+      const getModelList = this.$zxUtils?.viewApi?.getModelList;
+      if (!getModelList || typeof getModelList !== 'function') {
+        this.modelListData = { error: '未接入主应用 viewApi.getModelList' };
+        return;
+      }
+      try {
+        const res = await getModelList({ currentPage: 1, pageSize: 20 });
+        this.modelListData = res;
+      } catch (e) {
+        this.modelListData = { error: e?.message || '获取列表失败', detail: e };
+      }
+    },
+    async fetchFormConfig() {
+      const getFormConfig = this.$zxUtils?.viewApi?.getFormConfig;
+      if (!getFormConfig || typeof getFormConfig !== 'function') {
+        this.formConfigData = { error: '未接入主应用 viewApi.getFormConfig' };
+        return;
+      }
+      try {
+        const res = await getFormConfig();
+        this.formConfigData = res;
+      } catch (e) {
+        this.formConfigData = { error: e?.message || '获取表单配置失败', detail: e };
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.${pagePath.toLowerCase()} {
+  padding: 20px;
+  overflow: auto;
+}
+</style>
+`;
+
+  await fs.writeFile(pageFilePath, pageContent);
+  console.log(chalk.green(`✅ 📁 页面文件创建成功: ${pageFilePath}`));
+  // 尝试更新页面配置
+  await updatePluginViews(projectRoot, pageName, pagePath, pagesDir);
+  console.log(chalk.green('✅ 页面创建完成!'));
+  console.log();
+};
+
+// 更新页面配置
+async function updatePluginViews(projectRoot, pageName, pagePath, pagesDir) {
+  // 查找 pluginViews.js 文件
+  const pluginViewsPath = path.join(projectRoot, 'src/pluginViews.js');
+
+  let routerFile = null;
+  let routerPath = null;
+
+  if (await fs.pathExists(pluginViewsPath)) {
+    routerFile = await fs.readFile(pluginViewsPath, 'utf8');
+    routerPath = pluginViewsPath;
+  } else {
+    console.log(chalk.yellow('⚠️  未找到 pluginViews.js 文件，无法自动添加路由'));
+    return;
+  }
+
+  // 检查是否已存在相同名称的页面
+  if (routerFile.includes(`name: '${pageName}'`) || 
+      routerFile.includes(`name: "${pageName}"`)) {
+    console.log(chalk.yellow(`⚠️  页面 ${pageName} 已存在，跳过添加`));
+    return;
+  }
+
+  try {
+    // 计算相对于 src 的路径，用于导入
+    const relativePagesPath = path.relative(path.join(projectRoot, 'src'), pagesDir);
+    let importPath = '';
+    if (relativePagesPath) {
+      importPath = `@/${relativePagesPath}/${pagePath}/index.vue`.replace(/\\/g, '/');
+    } else {
+      importPath = `@/views/${pagePath}/index.vue`.replace(/\\/g, '/'); // 默认路径
+    }
+
+    // 构建新页面配置
+    const newRoute = `  {
+    name: '${pageName}',
+    component: () => import('${importPath}')
+  }`;
+    
+    const updatedRouter = routerFile.replace(
+      /(\s*\]\s*;?\s*)$/,
+      `\n${newRoute},$1`
+    );
+    await fs.writeFile(routerPath, updatedRouter);
+    console.log(chalk.green(`✅ 页面配置已更新: ${routerPath}`));
+  } catch (error) {
+    console.log(chalk.yellow(`⚠️  更新页面配置失败: ${error.message}`));
+  }
+}

package/commands/pull.js

@@ -2,42 +2,22 @@ const chalk = require('chalk');
 const inquirer = require('inquirer');
 const fs = require('fs-extra');
 const path = require('path');
-const Conf = require('conf');
 const ora = require('ora');
 
 module.exports = async function pull(options) {
   console.log();
   console.log(chalk.cyan(`🔄  正在拉取插件`));
 
-  // 使用 Conf 管理配置
-  const config = new Conf({
-    configName: 'package',
-    fileExtension: 'json',
-    cwd: process.cwd(),
-    defaults: {
-      name: 'plugin',
-      version: '1.0.0',
-      pluginId: '',
-      versionDescription: '描述'
-    }
-  });
-
   try {
     // 获取服务器地址（优先使用命令行参数）
-    const serverUrl = options.server || config.get('settings.serverUrl');
+    const serverUrl = options.server || 'https://dev.zhixuan.cloud/';
     
     // 获取token（优先使用命令行参数）
     let token = options.token;
     if (!token) {
-      // 如果命令行没有提供token，尝试从配置中获取
-      const auth = config.get('auth');
-      if (auth.token) {
-        token = auth.token;
-      } else {
-        console.log(chalk.red('❌  未提供访问令牌'));
-        console.log(chalk.cyan('请使用 --token 参数提供访问令牌'));
-        return;
-      }
+      console.log(chalk.red('❌  未提供访问令牌'));
+      console.log(chalk.cyan('请使用 --token 参数提供访问令牌'));
+      return;
     }
 
     // 获取版本ID
@@ -100,7 +80,7 @@ module.exports = async function pull(options) {
 
     try {
       // 构建下载API端点 - 使用版本ID
-      const downloadUrl = `${serverUrl.replace(/\/$/, '')}/api/plugins/versions/${versionId}/download`;
+      const downloadUrl = `${serverUrl.replace(/\/$/, '')}/api/ViewPlugin/version/download/${versionId}`;
 
       // 下载插件
       await downloadPlugin(downloadUrl, token, targetDir, versionId);
@@ -124,42 +104,65 @@ module.exports = async function pull(options) {
   }
 };
 
+// 下载插件的函数
 // 下载插件的函数
 async function downloadPlugin(downloadUrl, token, targetDir, versionId) {
-  // 模拟下载过程，实际应用中应替换为真实的下载逻辑
-  return new Promise(async (resolve, reject) => {
-    try {
-      // 模拟网络请求，实际应用中应使用真实的HTTP客户端
-      console.log(chalk.yellow(`正在从 ${downloadUrl} 下载版本 ${versionId}...`));
-      
-      // 模拟等待时间
-      await new Promise(resolve => setTimeout(resolve, 1500));
-      
-      // 创建目标目录
-      await fs.ensureDir(targetDir);
-      
-      // 模拟创建插件文件结构
-      const packageJson = {
-        name: `version-${versionId}`,
-        version: '1.0.0',
-        description: 'A Zhixuan plugin version',
-        main: 'index.js',
-        scripts: {
-          dev: 'zx-cli serve',
-          build: 'zx-cli build'
-        }
-      };
+  const axios = require('axios');
+  const fs = require('fs-extra');
+  const path = require('path');
+  const AdmZip = require('adm-zip'); // 需要安装 adm-zip: npm install adm-zip
+
+  try {
+    console.log(chalk.yellow(`正在从 ${downloadUrl} 下载版本 ${versionId}...`));
+
+    // 发起下载请求
+    const response = await axios({
+      method: 'GET',
+      url: downloadUrl,
+      headers: {
+        'Authorization': `Bearer ${token}`
+      },
+      responseType: 'arraybuffer', // 接收二进制数据
+      timeout: 60000 // 设置超时时间为60秒
+    });
+
+    if (response.status !== 200) {
+      throw new Error(`下载失败: ${response.status} ${response.statusText}`);
+    }
 
-      // 写入文件
-      await fs.writeJson(path.join(targetDir, 'package.json'), packageJson, { spaces: 2 });
-      await fs.writeFile(path.join(targetDir, 'index.js'), '// Plugin entry point\nconsole.log("Plugin loaded");', 'utf8');
-      await fs.writeFile(path.join(targetDir, 'README.md'), `# Version ${versionId}\n\nThis is a Zhixuan plugin version.`, 'utf8');
-      await fs.ensureDir(path.join(targetDir, 'src'));
-      await fs.ensureDir(path.join(targetDir, 'public'));
+    // 确保目标目录存在
+    await fs.ensureDir(targetDir);
 
-      resolve();
-    } catch (error) {
-      reject(error);
+    // 获取响应中的文件数据
+    const zipData = response.data;
+    
+    // 创建临时ZIP文件
+    const tempZipPath = path.join(targetDir, `${versionId}.zip`);
+    await fs.writeFile(tempZipPath, zipData);
+
+    // 解压ZIP文件
+    const zip = new AdmZip(zipData);
+    
+    // 获取ZIP中的根目录（通常ZIP文件会有一个顶层目录）
+    const zipEntries = zip.getEntries();
+    if (zipEntries.length === 0) {
+      throw new Error('下载的文件为空或损坏');
     }
-  });
+
+    // 解压到目标目录
+    zip.extractAllTo(targetDir, true); // true表示覆盖已存在的文件
+
+    // 删除临时ZIP文件
+    await fs.remove(tempZipPath);
+
+    console.log(chalk.green(`插件已成功解压到: ${targetDir}`));
+  } catch (error) {
+    if (error.code === 'ECONNABORTED') {
+      throw new Error('下载超时，请检查网络连接');
+    } else if (error.response) {
+      throw new Error(`下载失败: ${error.response.status} ${error.response.statusText}`);
+    } else {
+      throw new Error(`下载过程中发生错误: ${error.message}`);
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhixuan-plugin-cli",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "zhixuan插件项目脚手架CLI工具",
   "main": "bin/index.js",
   "bin": {
@@ -21,6 +21,7 @@
   "author": "shituanquan",
   "license": "MIT",
   "dependencies": {
+    "adm-zip": "^0.5.16",
     "archiver": "^7.0.1",
     "axios": "^1.13.6",
     "chalk": "^4.1.2",