feat: show form stat results; (zh) 显示表单统计结果

ly525 · ly525 · commit f5e138518f77 · 2019-12-21T19:41:10.000+08:00
diff --git a/back-end/h5-api/api/work/config/routes.json b/back-end/h5-api/api/work/config/routes.json
@@ -8,6 +8,14 @@
         "policies": []
       }
     },
+    {
+      "method": "GET",
+      "path": "/works/has-forms",
+      "handler": "Work.queryWorksWithForms",
+      "config": {
+        "policies": []
+      }
+    },
     {
       "method": "GET",
       "path": "/works",
diff --git a/back-end/h5-api/api/work/controllers/Work.js b/back-end/h5-api/api/work/controllers/Work.js
@@ -1,15 +1,16 @@
 /*
  * @Author: ly525
  * @Date: 2019-12-04 19:55:24
- * @LastEditors: ly525
- * @LastEditTime: 2019-12-15 18:56:44
+ * @LastEditors  : ly525
+ * @LastEditTime : 2019-12-21 19:32:05
  * @FilePath: /luban-h5/back-end/h5-api/api/work/controllers/Work.js
  * @Github: https://github.com/ly525/luban-h5
  * @Description:
  * @Copyright 2018 - 2019 luban-h5. All Rights Reserved
  */
 'use strict';
 const request = require('request');
+const _ = require('lodash');
 
 /**
  * Read the documentation (https://strapi.io/documentation/3.0.0-beta.x/guides/controllers.html#core-controllers)
@@ -52,8 +53,7 @@ module.exports = {
     const work = await strapi.services.work.findOne(ctx.params);
 
     // learn the query from: https://github.com/strapi/foodadvisor/blob/master/api/api/restaurant/controllers/Restaurant.js#L40
-    // eslint-disable-next-line no-undef
-    let formRecords = await Workform.query(qb => {
+    let formRecords = await strapi.services.workform.query(qb => {
       qb.where('work', '=', work.id);
     }).fetchAll();
     formRecords = formRecords.toJSON();
@@ -62,6 +62,26 @@ module.exports = {
     // eslint-disable-next-line require-atomic-updates
     return ctx.body = { uuidMap2Name, formRecords };
   },
+  queryWorksWithForms: async (ctx) => {
+    let formRecords = await strapi.services.workform.fetchAll({
+      withRelated: [
+        {'work': qb => qb.column('id') }
+      ],
+      columns: ['id', 'work']
+    });
+    formRecords = formRecords.toJSON();
+    const groupedFormRecords = _.groupBy(formRecords, 'work.id');
+
+    let workRecords = await strapi.services.work.fetchAll({
+      columns: ['id', 'title']
+    });
+    workRecords = workRecords.toJSON().map(work => ({
+      ...work,
+      form_count: groupedFormRecords[work.id].length
+    })).filter(work => work.form_count);
+
+    return ctx.body = workRecords;
+  },
   setAsTemplate: async (ctx) => {
     const work = await strapi.services.work.findOne(ctx.params);
 
diff --git a/back-end/h5-api/api/work/documentation/1.0.0/work.json b/back-end/h5-api/api/work/documentation/1.0.0/work.json
@@ -57,6 +57,63 @@
         "parameters": []
       }
     },
+    "/works/has-forms": {
+      "get": {
+        "deprecated": false,
+        "description": "",
+        "responses": {
+          "200": {
+            "description": "response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "foo": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "unexpected error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Work"
+        ],
+        "parameters": []
+      }
+    },
     "/works": {
       "get": {
         "deprecated": false,
diff --git a/back-end/h5-api/extensions/documentation/documentation/1.0.0/full_documentation.json b/back-end/h5-api/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "12/16/2019 8:50:56 AM"
+    "x-generation-date": "12/16/2019 10:29:14 PM"
   },
   "x-strapi-config": {
     "path": "/documentation",
@@ -101,6 +101,63 @@
         "parameters": []
       }
     },
+    "/works/has-forms": {
+      "get": {
+        "deprecated": false,
+        "description": "",
+        "responses": {
+          "200": {
+            "description": "response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "foo": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "unexpected error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Work"
+        ],
+        "parameters": []
+      }
+    },
     "/works": {
       "get": {
         "deprecated": false,
diff --git a/back-end/h5-api/extensions/documentation/public/index.html b/back-end/h5-api/extensions/documentation/public/index.html
diff --git a/front-end/h5/src/store/modules/work.js b/front-end/h5/src/store/modules/work.js
@@ -79,6 +79,16 @@ export const actions = {
       customRequest: strapi.getEntries.bind(strapi)
     }).get('works', { is_template: false })
   },
+  fetchWorksWithForms ({ commit, dispatch, state }, workId) {
+    new AxiosWrapper({
+      dispatch,
+      commit,
+      name: 'editor/setWorks',
+      loading_name: 'fetchWorks_loading',
+      successMsg: '获取作品列表成功',
+      customRequest: strapi.getEntries.bind(strapi)
+    }).get('works/has-forms', { is_template: false })
+  },
   fetchWorkTemplates ({ commit, dispatch, state }, workId) {
     new AxiosWrapper({
       dispatch,
diff --git a/front-end/h5/src/views/work-manager/form-stat/column.js b/front-end/h5/src/views/work-manager/form-stat/column.js
@@ -10,21 +10,22 @@ export const columns = [
     dataIndex: 'title',
     key: 'title'
   },
-  {
-    title: 'PV',
-    dataIndex: 'pv',
-    key: 'pv'
-  },
-  {
-    title: 'Uv',
-    dataIndex: 'uv',
-    key: 'uv'
-  },
+  // {
+  //   title: 'PV',
+  //   dataIndex: 'pv',
+  //   key: 'pv'
+  // },
+  // {
+  //   title: 'Uv',
+  //   dataIndex: 'uv',
+  //   key: 'uv'
+  // },
   {
     // i18n for title
-    title: 'Form Count',
+    title: 'Forms',
     key: 'formCount',
-    dataIndex: 'formCount'
+    dataIndex: 'formCount',
+    align: 'center'
   },
   {
     title: 'Action',
diff --git a/front-end/h5/src/views/work-manager/form-stat/index.vue b/front-end/h5/src/views/work-manager/form-stat/index.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: ly525
  * @Date: 2019-11-24 18:51:58
- * @LastEditors: ly525
- * @LastEditTime: 2019-12-08 15:28:33
+ * @LastEditors  : ly525
+ * @LastEditTime : 2019-12-21 19:19:38
  * @FilePath: /luban-h5/front-end/h5/src/views/work-manager/form-stat/index.vue
  * @Github: https://github.com/ly525/luban-h5
  * @Copyright 2018 - 2019 luban-h5. All Rights Reserved
@@ -28,13 +28,13 @@ export default {
         title: w.title,
         pv: w.pv || 0,
         uv: w.uv || 0,
-        formCount: w.formCount || 0
+        formCount: w.form_count || 0
       }))
     }
   },
   methods: {
     ...mapActions('editor', [
-      'fetchWorks'
+      'fetchWorksWithForms'
     ])
   },
   render (h) {
@@ -60,7 +60,7 @@ export default {
     )
   },
   created () {
-    this.fetchWorks()
+    this.fetchWorksWithForms()
   }
 }
 </script>
diff --git a/front-end/h5/src/views/work-manager/list.vue b/front-end/h5/src/views/work-manager/list.vue
@@ -84,7 +84,7 @@ const AddNewCard = {
   render (h, { props, parent }) {
     return (
       <a-card hoverable>
-        <div slot="cover" class="flex-center" style="height: 415px;background: #f7f5f557;" onClick={props.handleCreate}>
+        <div slot="cover" class="flex-center" style="height: 405px;background: #f7f5f557;" onClick={props.handleCreate}>
           <a-icon type="plus" />
         </div>
         <template class="ant-card-actions" slot="actions">
