From 5819a357519ef357731f5acf8943f6f2fc6e8eeb Mon Sep 17 00:00:00 2001
From: qxz <qxz@jieshitech.com>
Date: Fri, 29 May 2020 18:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=87=E6=8D=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=96=E6=B6=88=E6=9C=AA=E5=AE=8C=E6=88=90=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |   2 +-
 src/plugin/axios/index.js                     |  26 ++++
 src/router/index.js                           |  22 +--
 .../modules/acrou/modules/cancelToken.js      |  36 +++++
 src/utils/AcrouUtil.js                        |   2 +-
 src/utils/axios.js                            |   9 --
 src/views/page/GoList.vue                     | 135 ++++++++++--------
 7 files changed, 152 insertions(+), 80 deletions(-)
 create mode 100644 src/plugin/axios/index.js
 create mode 100644 src/store/modules/acrou/modules/cancelToken.js
 delete mode 100644 src/utils/axios.js

diff --git a/src/main.js b/src/main.js
index 180f42b..143a810 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,7 @@ import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/icon.css";
 import "element-ui/lib/theme-chalk/notification.css";
 import "element-ui/lib/theme-chalk/loading.css";
-import axios from "@utils/axios";
+import axios from "@/plugin/axios";
 import VueAxios from "vue-axios";
 import router from "./router";
 import i18n from "./i18n";
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
new file mode 100644
index 0000000..5d77136
--- /dev/null
+++ b/src/plugin/axios/index.js
@@ -0,0 +1,26 @@
+import axios from "axios";
+import store from '@/store'
+
+// 创建一个 axios 实例
+const service = axios.create({
+    baseURL: process.env.VUE_APP_API ? process.env.VUE_APP_API : "",
+    //   timeout: 30000,
+});
+
+// 请求拦截器
+service.interceptors.request.use(
+    config => {
+        // 在发送请求设置cancel token
+        config.cancelToken = new axios.CancelToken(cancel => {
+            store.dispatch("acrou/cancelToken/push", cancel)
+        })
+        return config
+    },
+    error => {
+        // 发送失败
+        console.log(error)
+        return Promise.reject(error)
+    }
+)
+
+export default service;
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index e0dc5ff..cf404fb 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,6 +3,7 @@ import febAlive from "feb-alive";
 import VueRouter from "vue-router";
 // 路由数据
 import routes from "./routes";
+import store from '@/store/index';
 
 // 在router实例化之前重写history
 febAlive.resetHistory();
@@ -22,16 +23,16 @@ Vue.use(VueRouter);
 // 导出路由 在 main.js 里使用
 const router = new VueRouter({
   mode: "history",
-  scrollBehavior(to, from, savePosition) {
-    if (savePosition) {
-      return savePosition;
-    } else {
-      return {
-        x: 0,
-        y: 0,
-      };
-    }
-  },
+  // scrollBehavior(to, from, savePosition) {
+  //   if (savePosition) {
+  //     return savePosition;
+  //   } else {
+  //     return {
+  //       x: 0,
+  //       y: 0,
+  //     };
+  //   }
+  // },
   routes,
 });
 
@@ -46,6 +47,7 @@ router.beforeEach(async (to, from, next) => {
     console.log("before:");
     console.log(to, from);
   }
+  store.dispatch("acrou/cancelToken/cancel")
   next();
 });
 
diff --git a/src/store/modules/acrou/modules/cancelToken.js b/src/store/modules/acrou/modules/cancelToken.js
new file mode 100644
index 0000000..ab26228
--- /dev/null
+++ b/src/store/modules/acrou/modules/cancelToken.js
@@ -0,0 +1,36 @@
+export default {
+    namespaced: true,
+    state: {
+        cancelToken: [],
+    },
+    actions: {
+        push({
+            commit
+        }, cancelToken) {
+            return new Promise(resolve => {
+                commit("push", cancelToken);
+                resolve()
+            })
+        },
+        cancel({
+            commit
+        }) {
+            return new Promise(resolve => {
+                commit("clear");
+                resolve()
+            })
+        },
+    },
+    mutations: {
+        push(state, cancelToken) {
+            state.cancelToken.push(cancelToken)
+        },
+        clear(state) {
+            console.log(state.cancelToken)
+            state.cancelToken.forEach(cancel => {
+                cancel('路由跳转取消请求');
+            });
+            state.cancelToken = [];
+        }
+    },
+};
\ No newline at end of file
diff --git a/src/utils/AcrouUtil.js b/src/utils/AcrouUtil.js
index fa7d0b2..bf1e3f9 100644
--- a/src/utils/AcrouUtil.js
+++ b/src/utils/AcrouUtil.js
@@ -1,4 +1,4 @@
-import axios from "@utils/axios";
+import axios from "@/plugin/axios";
 let Base64 = require("js-base64").Base64;
 
 const text_exts = [
diff --git a/src/utils/axios.js b/src/utils/axios.js
deleted file mode 100644
index 502acf2..0000000
--- a/src/utils/axios.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import axios from "axios";
-
-// 创建一个 axios 实例
-const service = axios.create({
-  baseURL: process.env.VUE_APP_API ? process.env.VUE_APP_API : "",
-//   timeout: 30000,
-});
-
-export default service;
diff --git a/src/views/page/GoList.vue b/src/views/page/GoList.vue
index c9c21eb..c03fed3 100644
--- a/src/views/page/GoList.vue
+++ b/src/views/page/GoList.vue
@@ -1,7 +1,13 @@
 <template>
   <div>
     <headmd :option="headmd" v-if="renderHeadMD && headmd.display"></headmd>
-    <div class="golist">
+    <div
+      class="golist"
+      v-loading="loading"
+      v-infinite-scroll="pageLoad"
+      infinite-scroll-disabled="busy"
+      infinite-scroll-distance="10"
+    >
       <list-view
         :data="files"
         v-if="mode === 'list'"
@@ -17,18 +23,13 @@
         :action="action"
         :thum="thum"
       />
-      <infinite-loading
-        :identifier="infiniteId"
-        @infinite="infiniteHandler"
-      ></infinite-loading>
-      <div
-        v-show="files.length === 0"
-        class="has-text-centered no-content"
-      ></div>
+      <!-- <infinite-loading :identifier="infiniteId" @infinite="infiniteHandler"></infinite-loading> -->
+      <div v-show="files.length === 0" class="has-text-centered no-content"></div>
       <center>
-        <!-- <span v-if="page.page_token === null && files.length !== 0" class="tag">
-          {{ $t("list.total") }} {{ files.length }} {{ $t("list.item") }}
-        </span>-->
+        <div :class="!busy ? 'is-hidden' : ''">
+          <i class="fa fa-spinner fa-pulse fa-2x fa-fw"></i>
+          <span class="sr-only">Loading...</span>
+        </div>
       </center>
     </div>
     <div
@@ -37,10 +38,7 @@
         $t('list.total') + ' ' + files.length + ' ' + $t('list.item')
       "
     ></div>
-    <readmemd
-      :option="readmemd"
-      v-if="renderReadMeMD && readmemd.display"
-    ></readmemd>
+    <readmemd :option="readmemd" v-if="renderReadMeMD && readmemd.display"></readmemd>
 
     <viewer
       v-if="viewer && images && images.length > 0"
@@ -70,7 +68,6 @@ import {
   checkView,
   checkExtends,
 } from "@utils/AcrouUtil";
-import axios from "@/utils/axios";
 import { mapState } from "vuex";
 import InfiniteLoading from "vue-infinite-loading";
 import ListView from "./components/list";
@@ -85,9 +82,11 @@ export default {
     Headmd: Markdown,
     Readmemd: Markdown,
   },
-  data: function() {
+  data: function () {
     return {
       infiniteId: +new Date(),
+      busy: false,
+      loading: true,
       page: {
         page_token: null,
         page_index: 0,
@@ -125,26 +124,40 @@ export default {
   },
   computed: {
     ...mapState("acrou/view", ["mode"]),
-    images() {
+    images () {
       return this.buildFiles.filter(
         (file) => file.mimeType.indexOf("image") != -1
       );
     },
-    renderHeadMD() {
+    renderHeadMD () {
       return window.themeOptions.render.head_md || false;
     },
-    renderReadMeMD() {
+    renderReadMeMD () {
       return window.themeOptions.render.readme_md || false;
     },
   },
+  created () {
+    this.render();
+  },
   methods: {
-    infiniteHandler($state) {
+    pageLoad () {
+      if (!this.page.page_token) return;
+      this.page.page_index++;
+      console.log("滚动加载了", this.page.page_index, this.$route.path);
+      this.render("scroll");
+    },
+    infiniteHandler ($state) {
       // TODO 异步请求的原因，导致数据响应在下个页面。需要终止上次请求
       this.page.page_index++;
       console.log("滚动加载了", this.page.page_index, this.$route.path);
       this.render($state);
     },
-    render($state) {
+    render (scroll) {
+      if (scroll) {
+        this.busy = true;
+      } else {
+        this.loading = true;
+      }
       this.headmd = { display: false, file: {}, path: "" };
       this.readmemd = { display: false, file: {}, path: "" };
       var path = this.$route.path;
@@ -180,43 +193,47 @@ export default {
               this.renderMd(data.files, path);
             }
           }
-          if (body.nextPageToken) {
-            $state.loaded();
-          } else {
-            $state.complete();
-          }
+          // if (body.nextPageToken) {
+          //   $state.loaded();
+          // } else {
+          //   $state.complete();
+          // }
+          this.loading = false;
+          this.busy = false;
         })
         .catch((e) => {
-          $state.loaded();
+          // $state.loaded();
+          this.loading = false;
+          this.busy = false;
           console.log(e);
         });
     },
-    buildFiles(files) {
+    buildFiles (files) {
       var path = this.$route.path;
       return !files
         ? []
         : files
-            .map((item) => {
-              var p = path + checkoutPath(item.name, item);
-              let isFolder =
-                item.mimeType === "application/vnd.google-apps.folder";
-              let size = isFolder ? "-" : formatFileSize(item.size);
-              return {
-                path: p,
-                ...item,
-                modifiedTime: formatDate(item.modifiedTime),
-                size: size,
-                isFolder: isFolder,
-              };
-            })
-            .sort((a, b) => {
-              if (a.isFolder && b.isFolder) {
-                return 0;
-              }
-              return a.isFolder ? -1 : 1;
-            });
+          .map((item) => {
+            var p = path + checkoutPath(item.name, item);
+            let isFolder =
+              item.mimeType === "application/vnd.google-apps.folder";
+            let size = isFolder ? "-" : formatFileSize(item.size);
+            return {
+              path: p,
+              ...item,
+              modifiedTime: formatDate(item.modifiedTime),
+              size: size,
+              isFolder: isFolder,
+            };
+          })
+          .sort((a, b) => {
+            if (a.isFolder && b.isFolder) {
+              return 0;
+            }
+            return a.isFolder ? -1 : 1;
+          });
     },
-    checkPassword(path) {
+    checkPassword (path) {
       var pass = prompt(this.$t("list.auth"), "");
       localStorage.setItem("password" + path, pass);
       if (pass != null && pass != "") {
@@ -225,7 +242,7 @@ export default {
         this.$router.go(-1);
       }
     },
-    copy(path) {
+    copy (path) {
       let origin = window.location.origin;
       console.log(path);
       path = origin + encodeURI(path);
@@ -244,13 +261,13 @@ export default {
           });
         });
     },
-    thum(url) {
+    thum (url) {
       return url ? `/${this.$route.params.id}:view?url=${url}` : "";
     },
-    inited(viewer) {
+    inited (viewer) {
       this.$viewer = viewer;
     },
-    action(file, target) {
+    action (file, target) {
       if (file.mimeType.indexOf("image") != -1) {
         this.viewer = true;
         this.$nextTick(() => {
@@ -266,7 +283,7 @@ export default {
       }
       this.target(file, target);
     },
-    target(file, target) {
+    target (file, target) {
       let path = file.path;
       if (target === "_blank") {
         window.open(path);
@@ -293,7 +310,7 @@ export default {
         return;
       }
     },
-    renderMd(files, path) {
+    renderMd (files, path) {
       var cmd = this.$route.params.cmd;
       if (cmd) {
         return;
@@ -317,10 +334,10 @@ export default {
         }
       });
     },
-    goSearchResult(file, target) {
+    goSearchResult (file, target) {
       this.loading = true;
       let id = this.$route.params.id;
-      axios
+      this.axios
         .post(`/${id}:id2path`, { id: file.id })
         .then((res) => {
           this.loading = false;
@@ -335,7 +352,7 @@ export default {
           console.log(e);
         });
     },
-    getIcon(type) {
+    getIcon (type) {
       return "#" + (this.icon[type] ? this.icon[type] : "icon-weizhi");
     },
   },