ol-base-components 2.6.0 → 2.7.1

package/src/api/api.js

@@ -5,9 +5,7 @@ const SwaggerClient = require("swagger-client");
 
 // eg：node api http://220.179.249.140:20019 ./modules
 
-const swaggerUrl = process.argv[2]
-  ? `${process.argv[2]}/swagger/v1/swagger.json`
-  : "";
+const swaggerUrl = process.argv[2] ? `${process.argv[2]}/swagger/v1/swagger.json` : "";
 const modulesDir = process.argv[3] ? process.argv[3] : "src/api/modules";
 
 let defaultRemark = `/**
@@ -39,7 +37,7 @@ function setFileReadOnly(filePath) {
 }
 
 SwaggerClient(swaggerUrl)
-  .then((client) => {
+  .then(client => {
     const swaggerData = client.spec; // 获取 Swagger 数据
 
     const apiModules = generateApiModules(swaggerData);
@@ -49,7 +47,7 @@ SwaggerClient(swaggerUrl)
       console.log(`创建了文件夹: ${modulesDir}`);
     }
 
-    Object.keys(apiModules).forEach((fileName) => {
+    Object.keys(apiModules).forEach(fileName => {
       const outputPath = path.join(modulesDir, `${fileName}.js`);
       fs.writeFileSync(outputPath, apiModules[fileName], "utf-8");
       setFileReadOnly(outputPath);
@@ -59,7 +57,7 @@ SwaggerClient(swaggerUrl)
     // 生成index.js入口文件
     createIndexFile(apiModules);
   })
-  .catch((err) => {
+  .catch(err => {
     console.error("获取 Swagger 数据时出错:", err);
   })
   .finally(() => {
@@ -69,7 +67,7 @@ SwaggerClient(swaggerUrl)
 
 function createIndexFile(apiModules) {
   let str = defaultRemark;
-  Object.keys(apiModules).forEach((fileName) => {
+  Object.keys(apiModules).forEach(fileName => {
     str += `export * from "./${fileName}";\n`;
   });
   const outputPath = path.join(modulesDir, `index.js`);
@@ -87,12 +85,9 @@ function generateKeyName(url, method) {
 
   // 处理 {xxx} 转换为 ByXxx
   const processedArr = arr.map(
-    (item) =>
+    item =>
       item
-        .replace(
-          /{(.*?)}/,
-          (_, param) => `By${param.charAt(0).toUpperCase() + param.slice(1)}`
-        ) // 处理 {xxx}
+        .replace(/{(.*?)}/, (_, param) => `By${param.charAt(0).toUpperCase() + param.slice(1)}`) // 处理 {xxx}
         .replace(/[-_]/g, "") // 去除 - 和 _
   );
 
@@ -106,8 +101,7 @@ function generateKeyName(url, method) {
   for (let i = 0; i < processedArr.length; i++) {
     if (i === 0 || processedArr[i] !== processedArr[i - 1]) {
       // 将每项首字母大写
-      const capitalizedItem =
-        processedArr[i].charAt(0).toUpperCase() + processedArr[i].slice(1);
+      const capitalizedItem = processedArr[i].charAt(0).toUpperCase() + processedArr[i].slice(1);
       resultArr.push(capitalizedItem);
     }
   }
@@ -116,7 +110,7 @@ function generateKeyName(url, method) {
 }
 
 // java数据类型转成js数据类型
-const javaTypeToJsType = (javaType) => {
+const javaTypeToJsType = javaType => {
   switch (javaType) {
     case "integer":
       return "number";
@@ -130,11 +124,11 @@ const javaTypeToJsType = (javaType) => {
 };
 
 // 根据parameters参数返回path对应的接口参数，path参数都是必填的
-const getPathParameters = (parameters) => {
+const getPathParameters = parameters => {
   if (!parameters && !Array.isArray(parameters)) return [];
   return parameters
-    .filter((param) => param.in === "path") // 过滤出路径参数
-    .map((param) => param.name); // 提取name属性
+    .filter(param => param.in === "path") // 过滤出路径参数
+    .map(param => param.name); // 提取name属性
 };
 
 const MethodEnum = {
@@ -143,14 +137,12 @@ const MethodEnum = {
   put: "put",
   delete: "del",
 };
-const generateApiModules = (swagger) => {
+const generateApiModules = swagger => {
   const { tags, paths } = swagger;
   const apiModules = {};
   // 初始化模块对象
-  tags.forEach((tag) => {
-    apiModules[
-      tag.name
-    ] = `${defaultRemark}import { api } from "@/api/request/sendRuest"\n`;
+  tags.forEach(tag => {
+    apiModules[tag.name] = `${defaultRemark}import { api } from "@/api/request/sendRuest"\n`;
   });
 
   for (const [url, methods] of Object.entries(paths)) {
@@ -158,7 +150,7 @@ const generateApiModules = (swagger) => {
       const tags = details.tags || [];
       const parameters = details.parameters || [];
       const requestBody = details.requestBody || {};
-      tags.forEach((tag) => {
+      tags.forEach(tag => {
         if (Object.keys(apiModules).includes(tag)) {
           // 生成 JSDoc 注释
           let functionDoc = ``;
@@ -171,21 +163,15 @@ const generateApiModules = (swagger) => {
           //parameters此参数
           if (Object.keys(details).includes("parameters")) {
             functionDoc += ` * @param {Object} params - 请求参数\n`;
-            parameters.forEach((param) => {
-              const paramType = param.schema
-                ? javaTypeToJsType(param.schema.type)
-                : "any";
+            parameters.forEach(param => {
+              const paramType = param.schema ? javaTypeToJsType(param.schema.type) : "any";
               const paramName = param.name;
-              const temp = param.required
-                ? `params.${paramName}`
-                : `[params.${paramName}]`;
-              functionDoc += ` * @param {${paramType}} ${temp} - ${
-                param.description || ""
-              }\n`;
+              const temp = param.required ? `params.${paramName}` : `[params.${paramName}]`;
+              functionDoc += ` * @param {${paramType}} ${temp} - ${param.description || ""}\n`;
             });
             pathParameters = getPathParameters(parameters);
             // 是否有query参数
-            hasQuery = parameters.some((e) => e.in === "query");
+            hasQuery = parameters.some(e => e.in === "query");
           }
 
           //   如果有requestBody
@@ -201,7 +187,7 @@ const generateApiModules = (swagger) => {
             if (type === "object") {
               functionDoc += ` * @param {Object} body - 请求参数\n`;
 
-              Object.keys(properties).forEach((key) => {
+              Object.keys(properties).forEach(key => {
                 // 是否必填
                 const isRequired =
                   schema.required &&
@@ -209,9 +195,9 @@ const generateApiModules = (swagger) => {
                   schema.required.includes(key);
 
                 const temp = isRequired ? `body.${key}` : `[body.${key}]`;
-                functionDoc += ` * @param {${javaTypeToJsType(
-                  properties[key].type
-                )}} ${temp} - ${properties[key].description || ""}\n`;
+                functionDoc += ` * @param {${javaTypeToJsType(properties[key].type)}} ${temp} - ${
+                  properties[key].description || ""
+                }\n`;
               });
               if (Object.keys(properties).length > 1) hasBody = true;
             } else if (type === "array") {
@@ -226,13 +212,13 @@ const generateApiModules = (swagger) => {
           let functionParams = [];
           if (hasQuery) functionParams.push("params");
           if (hasBody) functionParams.push("body");
-          Object.assign(functionParams, pathParameters);
+          // Object.assign(functionParams, pathParameters);
+          functionParams = [...pathParameters, ...functionParams];
           functionParams.push("options = {}");
           // 函数
-          functionDoc += `export const ${generateKeyName(
-            url,
-            method
-          )} = (${functionParams.join(", ")}) => {\n`;
+          functionDoc += `export const ${generateKeyName(url, method)} = (${functionParams.join(
+            ", "
+          )}) => {\n`;
 
           functionDoc += ` return api({\n`;
           functionDoc += `  url: \`${url.replace(/{/g, "${")}\`,\n`;

package/src/api/run.js

@@ -5,9 +5,7 @@ const path = require("path");
 
 // eg：node api http://220.179.249.140:20019 swagger.js
 
-const swaggerUrl = process.argv[2]
-  ? `${process.argv[2]}/swagger/v1/swagger.json`
-  : "";
+const swaggerUrl = process.argv[2] ? `${process.argv[2]}/swagger/v1/swagger.json` : "";
 const outputPath = process.argv[3] || "src/api/swagger.js";
 
 let defaultRemark = `/**
@@ -38,11 +36,11 @@ function setFileReadOnly(filePath) {
 }
 
 http
-  .get(swaggerUrl, (response) => {
+  .get(swaggerUrl, response => {
     let data = "";
 
     // 监听数据事件
-    response.on("data", (chunk) => {
+    response.on("data", chunk => {
       data += chunk;
     });
 
@@ -61,7 +59,7 @@ http
       setFileReadOnly(outputPath);
     });
   })
-  .on("error", (err) => {
+  .on("error", err => {
     clearInterval(spinner);
     process.stdout.write("\r");
     console.error("获取swagger.json时出错:", err);
@@ -75,12 +73,9 @@ function generateKeyName(url, method) {
 
   // 处理 {xxx} 转换为 ByXxx
   const processedArr = arr.map(
-    (item) =>
+    item =>
       item
-        .replace(
-          /{(.*?)}/,
-          (_, param) => `By${param.charAt(0).toUpperCase() + param.slice(1)}`
-        ) // 处理 {xxx}
+        .replace(/{(.*?)}/, (_, param) => `By${param.charAt(0).toUpperCase() + param.slice(1)}`) // 处理 {xxx}
         .replace(/[-_]/g, "") // 去除 - 和 _
   );
 
@@ -94,8 +89,7 @@ function generateKeyName(url, method) {
   for (let i = 0; i < processedArr.length; i++) {
     if (i === 0 || processedArr[i] !== processedArr[i - 1]) {
       // 将每项首字母大写
-      const capitalizedItem =
-        processedArr[i].charAt(0).toUpperCase() + processedArr[i].slice(1);
+      const capitalizedItem = processedArr[i].charAt(0).toUpperCase() + processedArr[i].slice(1);
       resultArr.push(capitalizedItem);
     }
   }
@@ -110,11 +104,11 @@ function removeCurlyBraces(url) {
 }
 
 // 生成API模块
-const generateApiModules = (swagger) => {
+const generateApiModules = swagger => {
   const { tags, paths } = swagger;
   const apiModules = {};
   // 初始化模块对象
-  tags.forEach((tag) => {
+  tags.forEach(tag => {
     apiModules[tag.name] = {};
   });
 
@@ -123,13 +117,11 @@ const generateApiModules = (swagger) => {
     for (const [method, details] of Object.entries(methods)) {
       // 获取接口的tags
       const tags = details.tags || [];
-      tags.forEach((tag) => {
+      tags.forEach(tag => {
         const key = generateKeyName(url, method);
         if (apiModules[tag]) {
           const summary = details.summary || "";
-          apiModules[tag][key] = `${key}: "${removeCurlyBraces(
-            url
-          )}", //${method} ${summary}\n`;
+          apiModules[tag][key] = `${key}: "${removeCurlyBraces(url)}", //${method} ${summary}\n`;
         }
       });
     }
@@ -138,7 +130,7 @@ const generateApiModules = (swagger) => {
   // 生成最终的输出字符串
   let output = defaultRemark;
   for (const [moduleName, methods] of Object.entries(apiModules)) {
-    const description = tags.find((e) => e.name === moduleName).description;
+    const description = tags.find(e => e.name === moduleName).description;
     output += `// ${description}\n`;
     output += `export const ${moduleName} = {\n`;
     for (const method of Object.values(methods)) {

package/src/bin/add.js

@@ -1,7 +1,8 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 const { Command } = require("commander");
 const fs = require("fs");
 const path = require("path");
+const inquirer = require("inquirer");
 const vue2Template = require("./initTemplate");
 const program = new Command();
 
@@ -9,12 +10,25 @@ const spinnerChars = ["|", "/", "-", "\\"];
 let spinnerIndex = 0;
 let dotCount = 0;
 const maxDots = 3;
-const spinner = setInterval(() => {
-  const dots = ".".repeat(dotCount);
-  process.stdout.write(`\r${spinnerChars[spinnerIndex]} 正在玩命加载中${dots}`);
-  spinnerIndex = (spinnerIndex + 1) % spinnerChars.length;
-  dotCount = (dotCount + 1) % (maxDots + 1);
-}, 300);
+let spinner;
+
+// 启动加载动画
+const startSpinner = () => {
+  spinner = setInterval(() => {
+    const dots = ".".repeat(dotCount);
+    process.stdout.write(`\r${spinnerChars[spinnerIndex]} 正在玩命加载中${dots}`);
+    spinnerIndex = (spinnerIndex + 1) % spinnerChars.length;
+    dotCount = (dotCount + 1) % (maxDots + 1);
+  }, 300);
+};
+
+// 停止加载动画
+const stopSpinner = () => {
+  if (spinner) {
+    clearInterval(spinner);
+    process.stdout.write("\r");
+  }
+};
 
 // 自定义错误处理 - 必须在使用 program.parse() 之前调用
 program.exitOverride();
@@ -24,41 +38,221 @@ try {
     .version("0.1.0")
     .argument("<moduleName>", "name of the module to create")
     .option("-p, --path <customPath>", "文件路径")
-    .option(
-      "-u, --url <pageUrl>",
-      "分页接口URL (可选)",
-      "/api/app/business-report/stock-bIPaged-result"
-    )
-    .option(
-      "-e, --export <exportUrl>",
-      "分页接口导出URL (可选)",
-      "/api/app/business-report/export-stock-bI"
-    )
-    .option(
-      "-m, --swaggerModule <swaggerModule>",
-      "swagger.js模块名称 (可选)",
-      "BusinessReport"
-    )
-    .action((moduleName, options) => {
-      const dir = path.join(options.path || process.cwd(), moduleName);
-      // 启动加载动画
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir);
-        // console.log(`创建文件夹: ${dir}`);
-        const templateContent = vue2Template(moduleName, options);
-        const outputPath = path.join(dir, `index.vue`)
+    .action(async (moduleName, options) => {
+      try {
+        console.log("🎉 欢迎使用Vue页面模板生成器！");
+        console.log(` 模块名称: ${moduleName}`);
+        console.log(`📂 保存路径: ${options.path || process.cwd()}`);
+        console.log("请按照提示配置页面功能：\n");
+
+        // 1. 分页接口地址（必填）
+        const pageUrlAnswer = await inquirer.prompt([
+          {
+            type: "input",
+            name: "pageUrl",
+            message: "请输入分页接口地址（必填）:",
+            default: "/api/app/admission-info/admission-info",
+            validate: input => {
+              if (!input.trim()) {
+                return "分页接口地址不能为空";
+              }
+              return true;
+            },
+          },
+        ]);
+
+        // 2. 询问是否有导出接口
+        const exportAnswer = await inquirer.prompt([
+          {
+            type: "confirm",
+            name: "hasExport",
+            message: "是否有导出接口?",
+            default: true,
+          },
+        ]);
+
+        let exportUrl = "";
+        if (exportAnswer.hasExport) {
+          const exportUrlAnswer = await inquirer.prompt([
+            {
+              type: "input",
+              name: "exportUrl",
+              message: "请输入导出接口地址:",
+              default: "/api/app/admission-info/paged-result",
+              validate: input => {
+                if (!input.trim()) {
+                  return "导出接口地址不能为空";
+                }
+                return true;
+              },
+            },
+          ]);
+          exportUrl = exportUrlAnswer.exportUrl;
+        }
+
+        // 3. 询问是否有新增/编辑/删除功能
+        const operationsAnswer = await inquirer.prompt([
+          {
+            type: "checkbox",
+            name: "operations",
+            message: "请选择需要的功能:",
+            choices: [
+              { name: "新增功能", value: "add" },
+              { name: "编辑功能", value: "edit" },
+              { name: "删除功能", value: "delete" },
+              { name: "详情功能", value: "detail" },
+            ],
+            default: [],
+          },
+        ]);
+
+        let idField = "id";
+        let addUrl = "";
+        let editUrl = "";
+        let deleteUrl = "";
+        let detailUrl = "";
+
+        // 如果有新增/编辑/删除/详情功能，直接使用分页接口地址
+        if (operationsAnswer.operations.length > 0) {
+          // 从分页接口地址中提取基础路径
+          // 假设分页接口格式为 /api/app/xxx/xxx-paged-result
+          // 我们需要提取 /api/app/xxx 部分
+          const pageUrl = pageUrlAnswer.pageUrl;
+          // const baseUrl = pageUrl.replace(/-paged-result.*$/, "").replace(/\/[^\/]*$/, "");
+          const baseUrl = pageUrl;
+
+          // 询问ID字段名
+          const idFieldAnswer = await inquirer.prompt([
+            {
+              type: "input",
+              name: "idField",
+              message: "请输入ID字段名:",
+              default: "admissionInfoId",
+              validate: input => {
+                if (!input.trim()) {
+                  return "ID字段名不能为空";
+                }
+                return true;
+              },
+            },
+          ]);
+          idField = idFieldAnswer.idField;
+
+          // 根据选择的功能构建对应的接口地址
+          if (operationsAnswer.operations.includes("add")) {
+            addUrl = baseUrl;
+          }
+          if (operationsAnswer.operations.includes("edit")) {
+            editUrl = `${baseUrl}/{${idField}}`;
+          }
+          if (operationsAnswer.operations.includes("delete")) {
+            deleteUrl = `${baseUrl}/{${idField}}`;
+          }
+          if (operationsAnswer.operations.includes("detail")) {
+            detailUrl = `${baseUrl}/{${idField}}`;
+          }
+        }
+
+        // 4. 询问所有接口的模块名
+        const moduleAnswer = await inquirer.prompt([
+          {
+            type: "input",
+            name: "swaggerModule",
+            message: "请输入所有接口的模块名:",
+            default: "AdmissionInfo",
+            validate: input => {
+              if (!input.trim()) {
+                return "模块名不能为空";
+              }
+              return true;
+            },
+          },
+        ]);
+
+        // 启动加载动画
+        startSpinner();
+
+        const dir = path.join(options.path || process.cwd(), moduleName);
+
+        // 检查目录是否存在
+        if (fs.existsSync(dir)) {
+          stopSpinner();
+          console.log(`❌ 创建失败，文件夹 ${dir} 已存在`);
+          return;
+        }
+
+        // 创建目录
+        fs.mkdirSync(dir, { recursive: true });
+
+        // 合并所有配置
+        const config = {
+          moduleName,
+          path: options.path || process.cwd(),
+          pageUrl: pageUrlAnswer.pageUrl,
+          hasExport: exportAnswer.hasExport,
+          exportUrl: exportUrl,
+          hasAdd: operationsAnswer.operations.includes("add"),
+          addUrl: addUrl,
+          hasEdit: operationsAnswer.operations.includes("edit"),
+          editUrl: editUrl,
+          hasDelete: operationsAnswer.operations.includes("delete"),
+          deleteUrl: deleteUrl,
+          hasDetail: operationsAnswer.operations.includes("detail"),
+          detailUrl: detailUrl,
+          swaggerModule: moduleAnswer.swaggerModule,
+          idField: idField,
+        };
+
+        // 生成模板内容
+        const templateContent = vue2Template(moduleName, config);
+
+        // 保存文件
+        const outputPath = path.join(dir, `index.vue`);
         fs.writeFileSync(outputPath, templateContent);
-        console.log(`✅ 模板 已生成并保存到 ${outputPath}`);
 
-      } else {
-        console.log(`❌ 创建失败，文件夹 ${dir} 已存在`);
-      }
-      if (options.debug) {
-        console.log("调试信息:", options);
+        // 停止加载动画
+        stopSpinner();
+
+        // 输出成功信息
+        console.log(`✅ 模板已生成并保存到 ${outputPath}`);
+        console.log(` 文件路径: ${outputPath}`);
+
+        // 输出功能总结
+        const features = [];
+        if (exportAnswer.hasExport) features.push("导出功能");
+        if (operationsAnswer.operations.includes("add")) features.push("新增功能");
+        if (operationsAnswer.operations.includes("edit")) features.push("编辑功能");
+        if (operationsAnswer.operations.includes("delete")) features.push("删除功能");
+        if (operationsAnswer.operations.includes("detail")) features.push("详情功能");
+
+        if (features.length > 0) {
+          console.log(`🔧 已添加功能: ${features.join(", ")}`);
+        }
+
+        console.log(`📚 模块名: ${moduleAnswer.swaggerModule}`);
+        if (idField) {
+          console.log(`🆔 ID字段: ${idField}`);
+        }
+
+        // 显示接口地址预览
+        if (operationsAnswer.operations.length > 0) {
+          const pageUrl = pageUrlAnswer.pageUrl;
+          const baseUrl = pageUrl.replace(/-paged-result.*$/, "").replace(/\/[^\/]*$/, "");
+          console.log(`🔗 基础接口: ${baseUrl}`);
+          if (addUrl) console.log(`➕ 新增接口: ${addUrl}`);
+          if (editUrl) console.log(`✏️ 编辑接口: ${editUrl}`);
+          if (deleteUrl) console.log(`��️ 删除接口: ${deleteUrl}`);
+          if (detailUrl) console.log(`��️ 详情接口: ${detailUrl}`);
+        }
+
+        console.log("\n 模板生成完成！");
+      } catch (error) {
+        stopSpinner();
+        console.error("❌ 发生错误：", error.message);
+        process.exit(1);
       }
-      clearInterval(spinner);
-      process.stdout.write("\r");
     });
+
   program.parse(process.argv);
 } catch (err) {
   // 捕获 commander 的错误
@@ -66,13 +260,13 @@ try {
     console.log("❌ 错误：缺少必需的文件名称");
     console.log("📖 使用方法：");
     console.log("  npx add <文件名> -p <路径>");
-    console.log("�� 示例：");
+    console.log(" 示例：");
     console.log("  npx add demo -p src/view");
     process.exit(1);
   } else {
     // 处理其他错误
-    // console.error("❌ 发生错误：", err.message);
+    stopSpinner();
+    console.error("❌ 发生错误：", err.message);
     process.exit(1);
   }
 }
-// program.parse(process.argv);