ol-base-components 2.7.0 → 2.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "private": false,
   "main": "src/package/index.js",
   "bin": {

package/src/bin/add.js

@@ -51,7 +51,7 @@ try {
             type: "input",
             name: "pageUrl",
             message: "请输入分页接口地址（必填）:",
-            default: "/api/app/admission-info/admission-info",
+            default: "/api/app/admission-info/paged-result",
             validate: input => {
               if (!input.trim()) {
                 return "分页接口地址不能为空";
@@ -106,6 +106,7 @@ try {
           },
         ]);
 
+        let baseUrl = "";
         let idField = "id";
         let addUrl = "";
         let editUrl = "";
@@ -114,12 +115,22 @@ try {
 
         // 如果有新增/编辑/删除/详情功能，直接使用分页接口地址
         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;
+          // baseUrl
+          const baseUrlAnswer = await inquirer.prompt([
+            {
+              type: "input",
+              name: "baseUrl",
+              message: "请输入操作接口的基础路径:",
+              default: "/api/app/admission-info/admission-info",
+              validate: input => {
+                if (!input.trim()) {
+                  return "操作接口的基础路径不能为空";
+                }
+                return true;
+              },
+            },
+          ]);
+          baseUrl = baseUrlAnswer.baseUrl;
 
           // 询问ID字段名
           const idFieldAnswer = await inquirer.prompt([
@@ -191,6 +202,7 @@ try {
           pageUrl: pageUrlAnswer.pageUrl,
           hasExport: exportAnswer.hasExport,
           exportUrl: exportUrl,
+          baseUrl,
           hasAdd: operationsAnswer.operations.includes("add"),
           addUrl: addUrl,
           hasEdit: operationsAnswer.operations.includes("edit"),

package/src/bin/initTemplate.js

@@ -38,6 +38,7 @@ const vue2Template = (moduleName, config = {}) => {
   let editUrlKey = "";
   let deleteUrlKey = "";
   let detailUrlKey = "";
+  let baseUrlKey = "";
 
   if (config.pageUrl) pageUrlKey = generateKeyName(config.pageUrl, "get");
   if (config.exportUrl) exportUrlKey = generateKeyName(config.exportUrl, "post");
@@ -45,12 +46,12 @@ const vue2Template = (moduleName, config = {}) => {
   if (config.editUrl) editUrlKey = generateKeyName(config.editUrl, "put");
   if (config.deleteUrl) deleteUrlKey = generateKeyName(config.deleteUrl, "delete");
   if (config.detailUrl) detailUrlKey = generateKeyName(config.detailUrl, "get");
-
+  if (config.baseUrl) baseUrlKey = generateKeyName(config.baseUrl, "post"); //这里先直接用新增接口的,后期可改为各自接口
   // 生成导入语句
   const generateImports = () => {
     const imports = [];
     if (config.pageUrl) imports.push(`${pageUrlKey}`);
-    if (config.addUrl) imports.push(`${addUrlKey}`);
+    if (config.addUrl || config.baseUrl) imports.push(`${addUrlKey}`);
     if (config.editUrl) imports.push(`${editUrlKey}`);
     if (config.deleteUrl) imports.push(`${deleteUrlKey}`);
     if (config.detailUrl) imports.push(`${detailUrlKey}`);
@@ -178,7 +179,7 @@ const vue2Template = (moduleName, config = {}) => {
         ? `<el-dialog :title="this.form.title" :visible.sync="dialogVisible" width="80%">
       <ol-form
         v-if="dialogVisible"
-        :url="swaggerUrl.${pageUrlKey}"
+        :url="swaggerUrl.${baseUrlKey}"
         :form="form"
         @onCancel="onCancel"
         @onSubmit="onSubmit"
@@ -244,6 +245,9 @@ export default {
      }
    }
   },
+  created() {
+    this.init()
+  },
   methods: {
     async init() {
       const params = {
@@ -304,6 +308,7 @@ export default {
     }${generateMethods()}
   }
 }
+</script>
 `;
 };