From 98fd18ede2b0cbe65c3d99a8a0c4c246e2f3597f Mon Sep 17 00:00:00 2001
From: Aicirou <2643053021@qq.com>
Date: Fri, 29 May 2020 02:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9loading?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=A7=A3=E5=86=B3=E5=8A=A0=E8=BD=BD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json         |   5 ++
 package.json              |   1 +
 src/views/page/GoList.vue | 125 ++++++++++++++++++--------------------
 3 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d0cf47c..77f62aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12533,6 +12533,11 @@
         }
       }
     },
+    "vue-infinite-loading": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npm.taobao.org/vue-infinite-loading/download/vue-infinite-loading-2.4.5.tgz",
+      "integrity": "sha1-zCD9QK9/IBiABkQ8mbYEcM8d4bM="
+    },
     "vue-infinite-scroll": {
       "version": "2.0.2",
       "resolved": "https://registry.npm.taobao.org/vue-infinite-scroll/download/vue-infinite-scroll-2.0.2.tgz",
diff --git a/package.json b/package.json
index 6ca7f95..46286e0 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "vue-clipboard2": "^0.3.1",
     "vue-codemirror": "^4.0.6",
     "vue-i18n": "^8.17.3",
+    "vue-infinite-loading": "^2.4.5",
     "vue-infinite-scroll": "^2.0.2",
     "vue-lazyload": "^1.3.3",
     "vue-router": "^3.1.6",
diff --git a/src/views/page/GoList.vue b/src/views/page/GoList.vue
index ab07c88..c9c21eb 100644
--- a/src/views/page/GoList.vue
+++ b/src/views/page/GoList.vue
@@ -1,15 +1,9 @@
 <template>
   <div>
     <headmd :option="headmd" v-if="renderHeadMD && headmd.display"></headmd>
-    <div
-      class="golist"
-      v-loading="loading"
-      v-infinite-scroll="pageLoad"
-      infinite-scroll-disabled="busy"
-      infinite-scroll-distance="10"
-    >
+    <div class="golist">
       <list-view
-        :data="buildFiles"
+        :data="files"
         v-if="mode === 'list'"
         :icons="getIcon"
         :action="action"
@@ -17,21 +11,21 @@
       />
       <grid-view
         class="g2-content"
-        :data="buildFiles"
+        :data="files"
         v-if="mode !== 'list'"
         :getIcon="getIcon"
         :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>
       <center>
-        <div :class="!busy ? 'is-hidden' : ''">
-          <i class="fa fa-spinner fa-pulse fa-2x fa-fw"></i>
-          <span class="sr-only">Loading...</span>
-        </div>
         <!-- <span v-if="page.page_token === null && files.length !== 0" class="tag">
           {{ $t("list.total") }} {{ files.length }} {{ $t("list.item") }}
         </span>-->
@@ -78,12 +72,14 @@ import {
 } from "@utils/AcrouUtil";
 import axios from "@/utils/axios";
 import { mapState } from "vuex";
+import InfiniteLoading from "vue-infinite-loading";
 import ListView from "./components/list";
 import GridView from "./components/grid";
 import Markdown from "../common/Markdown";
 export default {
   name: "GoList",
   components: {
+    InfiniteLoading,
     ListView,
     GridView,
     Headmd: Markdown,
@@ -91,13 +87,12 @@ export default {
   },
   data: function() {
     return {
-      busy: false,
+      infiniteId: +new Date(),
       page: {
         page_token: null,
         page_index: 0,
       },
       files: [],
-      loading: true,
       viewer: false,
       icon: {
         "application/vnd.google-apps.folder": "icon-morenwenjianjia",
@@ -130,28 +125,6 @@ export default {
   },
   computed: {
     ...mapState("acrou/view", ["mode"]),
-    buildFiles() {
-      var path = this.$route.path;
-      return this.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;
-        });
-    },
     images() {
       return this.buildFiles.filter(
         (file) => file.mimeType.indexOf("image") != -1
@@ -164,21 +137,14 @@ export default {
       return window.themeOptions.render.readme_md || false;
     },
   },
-  created() {
-    this.render();
-  },
   methods: {
-    pageLoad() {
-      if (!this.page.page_token) return;
+    infiniteHandler($state) {
+      // TODO 异步请求的原因，导致数据响应在下个页面。需要终止上次请求
       this.page.page_index++;
-      this.render("scroll");
+      console.log("滚动加载了", this.page.page_index, this.$route.path);
+      this.render($state);
     },
-    render(scroll) {
-      if (scroll) {
-        this.busy = true;
-      } else {
-        this.loading = true;
-      }
+    render($state) {
       this.headmd = { display: false, file: {}, path: "" };
       this.readmemd = { display: false, file: {}, path: "" };
       var path = this.$route.path;
@@ -205,26 +171,51 @@ export default {
               page_token: body.nextPageToken,
               page_index: body.curPageIndex,
             };
-            try {
-              if (scroll) {
-                this.files = this.files.concat(data.files);
-              } else {
-                this.files = data.files;
-              }
+            if (scroll) {
+              this.files = this.buildFiles(this.files.concat(data.files));
+            } else {
+              this.files = this.buildFiles(data.files);
+            }
+            if (data.files) {
               this.renderMd(data.files, path);
-            } catch (e) {
-              console.log(e);
             }
           }
-          this.loading = false;
-          this.busy = false;
+          if (body.nextPageToken) {
+            $state.loaded();
+          } else {
+            $state.complete();
+          }
         })
-        .catch(() => {
-          this.loading = false;
-          this.busy = false;
-          this.$router.go(-1);
+        .catch((e) => {
+          $state.loaded();
+          console.log(e);
         });
     },
+    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;
+            });
+    },
     checkPassword(path) {
       var pass = prompt(this.$t("list.auth"), "");
       localStorage.setItem("password" + path, pass);
@@ -236,7 +227,7 @@ export default {
     },
     copy(path) {
       let origin = window.location.origin;
-      console.log(path)
+      console.log(path);
       path = origin + encodeURI(path);
       this.$copyText(path)
         .then(() => {
@@ -282,11 +273,11 @@ export default {
         return;
       }
       if (target === "copy") {
-        this.copy(path)
+        this.copy(path);
         return;
       }
       if (target === "down" || (!checkExtends(path) && !file.isFolder)) {
-        location.href = path.replace(/^\/(\d+:)\//,"/$1down/");
+        location.href = path.replace(/^\/(\d+:)\//, "/$1down/");
         return;
       }
       if (target === "view") {
@@ -336,7 +327,7 @@ export default {
           let data = res.data;
           if (data) {
             file.path = `/${id}:${data}`;
-            this.target(file, target)
+            this.target(file, target);
           }
         })
         .catch((e) => {