ol-base-components 2.7.2 → 2.7.4

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.2",
+  "version": "2.7.4",
   "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/initTemplate.js

@@ -32,29 +32,30 @@ const vue2Template = (moduleName, config = {}) => {
   console.log(888, config);
 
   // 生成各种接口的key名称
-  let pageUrlKey = "";
-  let exportUrlKey = "";
-  let addUrlKey = "";
-  let editUrlKey = "";
-  let deleteUrlKey = "";
-  let detailUrlKey = "";
-  let baseUrlKey = "";
+  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");
-  if (config.baseUrl) baseUrlKey = generateKeyName(config.baseUrl, "post"); //这里先直接用新增接口的,后期可改为各自接口
+
   // 生成导入语句
   const generateImports = () => {
     const imports = [];
     if (config.pageUrl) imports.push(`${pageUrlKey}`);
-    if (config.addUrl || config.baseUrl) imports.push(`${addUrlKey}`);
+    if (config.baseUrl) imports.push(`${baseUrlKey}`);
+    if (config.addUrl) imports.push(`${addUrlKey}`);
     if (config.editUrl) imports.push(`${editUrlKey}`);
-    if (config.deleteUrl) imports.push(`${deleteUrlKey}`);
     if (config.detailUrl) imports.push(`${detailUrlKey}`);
+    if (config.deleteUrl) imports.push(`${deleteUrlKey}`);
     return imports.join(", ");
   };
 
@@ -104,8 +105,6 @@ const vue2Template = (moduleName, config = {}) => {
 
     // onSubmit
     if (config.hasAdd || config.hasEdit) {
-      // editUrlKey
-      // addUrlKey
       methods.push(`
     async onSubmit({ form, data }) {
       if(form.type === 1){

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 => {