yapi-plugin-api-doc - npm Package Compare versions

Comparing version 0.0.3 to 0.0.4

controller.js

@@ -78,3 +78,3 @@ const baseController = require('controllers/base.js');
     let groupData = await this.groupModel.get(group_id);
-    let tp = '';
+    let tp = '', wikInst = null;
     try {
@@ -87,5 +87,12 @@ let htmlBody = '';
       }
+
+      try {
+        const wikiModel = require('../yapi-plugin-wiki/wikiModel.js');
+        wikInst = await yapi.getInst(wikiModel);
+      } catch (error) {
+      }
       
       let result = await this.projectModel.list(group_id);
-      let projects = [];
+      let projects = [], wikiDatas = [];
+      
       for (let i = 0, item, list; i < result.length; i++) {
@@ -95,2 +102,5 @@ item = result[i].toObject();
         if (list.length > 0) {
+          if (wikInst) {
+            wikiDatas.push(await wikInst.get(item._id));
+          }
           projects.push({
@@ -103,3 +113,3 @@ item,
 
-      tp = await createHtml.bind(this)(projects);
+      tp = await createHtml.bind(this)(projects, wikiDatas);
       return (ctx.body = tp);
@@ -127,4 +137,4 @@ } catch (error) {
 
-    async function createHtml(projects) {
-      let md = await createMarkdown.bind(this)(projects, true);
+    async function createHtml(projects, wikiDatas) {
+      let md = await createMarkdown.bind(this)(projects, wikiDatas);
       let markdown = markdownIt({ html: true, breaks: true });
@@ -185,3 +195,3 @@ markdown.use(markdownItAnchor); // Optional, but makes sense as you really want to link to something
 
-    function createMarkdown(projects, isToc) {
+    function createMarkdown(projects, wikiDatas) {
       //拼接markdown
@@ -195,5 +205,5 @@ //模板
           const project = projects[index];
-          mdTemplate += md.createProjectMarkdown(project.item);
+          mdTemplate += md.createProjectMarkdown(project.item, wikiDatas[index]);
           // 分类信息
-          mdTemplate += md.createClassMarkdown(groupData, project.list, isToc);
+          mdTemplate += md.createClassMarkdown(groupData, project.list, true);
         }
@@ -223,3 +233,2 @@ return mdTemplate;
     let pid = ctx.request.query.pid;
-    let isWiki = ctx.request.query.isWiki;
 
@@ -235,6 +244,9 @@ status = status || ctx.request.query.status;
       curProject = await this.projectModel.get(pid);
-      if (isWiki === 'true') {
+
+      try {
         const wikiModel = require('../yapi-plugin-wiki/wikiModel.js');
         wikiData = await yapi.getInst(wikiModel).get(pid);
+      } catch (error) {
       }
+
       ctx.set('Content-Type', 'text/html');
@@ -241,0 +253,0 @@ const list = await this.handleListClass(pid, status);

package.json

 {
   "name": "yapi-plugin-api-doc",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "在标签页中加入查看接口文档",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

38362

0.85%

Lines of code

993

0.81%

No dependency changes