Merge pull request #474 from aliyun/csg/fix/develop/53081334

fix: unable to load more objects after setting the maximum number of listed objects

Author: elwing63

app/components/services/oss2.js

@@ -1615,8 +1615,11 @@ angular.module('web').factory('ossSvs2', [
     }
 
     function _listFilesOrigion(region, bucket, key, marker = '', length) {
-      if (!length) length = localStorage.getItem("listObjectNum") || 500;
-      console.log('list-object-max-length', length);
+      if (!length) {
+        const lcount = localStorage.getItem("listObjectNum");
+        if (lcount) length = parseInt(lcount, 10);
+        else length = 500;
+      }
       const client = getClient3({
         region,
         bucket
@@ -1626,7 +1629,7 @@ angular.module('web').factory('ossSvs2', [
         nextContinuationToken: '',
         objects: [],
         prefixes: [],
-        keyCount: [],
+        keyCount: 0,
         isTruncated: true
       };
 

app/main/modals/settings.html

@@ -395,16 +395,17 @@ <h5 class="text-primary">{{'settings.other'|translate}}</h5>
           {{'settings.other.list.object.max.number'|translate}}:
         </label>
         <div class="col-sm-7">
+          <!-- min="30" 不能小于30，小了后会因为高度不够，第一页没有滚动条，就没法触发加载第二页 -->
           <input
             type="number"
             name="listObjectNum"
             ng-model="set.listObjectNum"
             ng-change="setChange(form1,'listObjectNum')"
             max="1000"
-            min="20"
+            min="30"
             required
             class="form-control"
-            placeholder="20-1000"
+            placeholder="30-1000"
           />
         </div>
       </div>