ol-base-components 2.7.1 → 2.7.3

package/.prettierrc

@@ -6,9 +6,8 @@
   "trailingComma": "es5",
   "bracketSpacing": true,
   "arrowParens": "avoid",
-  "endOfLine": "lf",
+  "endOfLine": "crlf",
   "vueIndentScriptAndStyle": true,
   "htmlWhitespaceSensitivity": "css",
-  "singleAttributePerLine": false,
-  "trimTrailingWhitespace": true
+  "singleAttributePerLine": false
 }

package/package.json

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

package/src/api/run.js

@@ -122,6 +122,12 @@ const generateApiModules = swagger => {
         if (apiModules[tag]) {
           const summary = details.summary || "";
           apiModules[tag][key] = `${key}: "${removeCurlyBraces(url)}", //${method} ${summary}\n`;
+          // 不去出带花括号的，键名加上特殊字段
+          if (url.includes("{")) {
+            apiModules[tag][
+              `${key}CompleteUrl`
+            ] = `${key}CompleteUrl: "${url}", //${method} ${summary}\n`;
+          }
         }
       });
     }

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

@@ -32,25 +32,26 @@ const vue2Template = (moduleName, config = {}) => {
   console.log(888, config);
 
   // 生成各种接口的key名称
-  let pageUrlKey = "";
-  let exportUrlKey = "";
-  let addUrlKey = "";
-  let editUrlKey = "";
-  let deleteUrlKey = "";
-  let detailUrlKey = "";
+  let pageUrlKey = "",
+    exportUrlKey = "",
+    addUrlKey = "",
+    editUrlKey = "",
+    deleteUrlKey = "",
+    detailUrlKey = "",
+    baseUrlKey = ""; //接口选择优先级：新增 > 编辑 > 详,
 
   if (config.pageUrl) pageUrlKey = generateKeyName(config.pageUrl, "get");
   if (config.exportUrl) exportUrlKey = generateKeyName(config.exportUrl, "post");
-  if (config.addUrl) addUrlKey = generateKeyName(config.addUrl, "post");
-  if (config.editUrl) editUrlKey = generateKeyName(config.editUrl, "put");
+  if (config.detailUrl) baseUrlKey = detailUrlKey = generateKeyName(config.detailUrl, "get");
+  if (config.editUrl) baseUrlKey = editUrlKey = generateKeyName(config.editUrl, "put");
+  if (config.addUrl) baseUrlKey = addUrlKey = generateKeyName(config.addUrl, "post");
   if (config.deleteUrl) deleteUrlKey = generateKeyName(config.deleteUrl, "delete");
-  if (config.detailUrl) detailUrlKey = generateKeyName(config.detailUrl, "get");
 
   // 生成导入语句
   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}`);
@@ -103,8 +104,6 @@ const vue2Template = (moduleName, config = {}) => {
 
     // onSubmit
     if (config.hasAdd || config.hasEdit) {
-      // editUrlKey
-      // addUrlKey
       methods.push(`
     async onSubmit({ form, data }) {
       if(form.type === 1){
@@ -178,7 +177,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"

package/src/utils/initData.js

@@ -29,11 +29,15 @@ const javaTypeToformType = javaType => {
 export const initForm = options => {
   const { url, form } = options;
   getData().then(swaggerData => {
-    const entity = swaggerData.paths[url].post;
+    // swagger数据可以来源于，新增接口/编辑接口/详情接口（优先级：新增接口>编辑接口>详情接口）
+    let entity = {},
+      schema = {},
+      properties = {};
+    entity = swaggerData.paths[url].post;
     // 添加title
     // if (!form.title) form.title = entity.summary;
-    const schema = entity.requestBody.content["application/json"].schema;
-    const properties = schema.properties;
+    schema = entity.requestBody.content["application/json"].schema;
+    properties = schema.properties;
     // 生成model
     // 1.循环model，将properties中prop相同的匹配，属性合并，model权限大，properties权限小，且保持响应式
     form.model.forEach(item => {