Skip to content

Commit b3752b7

Browse files
authored
fix: deleteMarker太多导致文件列表显示不出来 (#345)
1 parent c861b83 commit b3752b7

File tree

1 file changed

+28
-2
lines changed

1 file changed

+28
-2
lines changed

app/components/services/oss2.js

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ angular.module("web").factory("ossSvs2", [
13031303
}
13041304

13051305
function setMeta2(region, bucket, key, headers, meta) {
1306-
const client = getClient2({ region, bucket });
1306+
const client = getClient3({ region, bucket });
13071307
return client
13081308
.copy(key, key, {
13091309
headers,
@@ -1339,7 +1339,30 @@ angular.module("web").factory("ossSvs2", [
13391339

13401340
function listFiles(region, bucket, key, marker) {
13411341
return new Promise(function (a, b) {
1342-
_listFilesOrigion(region, bucket, key, marker).then(
1342+
let ready = [];
1343+
1344+
function get(m) {
1345+
return _listFilesOrigion(region, bucket, key, m).then((result) => {
1346+
if (result.data) {
1347+
ready = ready.concat(result.data);
1348+
if (
1349+
ready.length < result.maxKeys &&
1350+
result.truncated &&
1351+
result.marker
1352+
) {
1353+
return get(result.marker);
1354+
}
1355+
}
1356+
return {
1357+
data: ready,
1358+
marker: result.marker,
1359+
truncated: result.truncated,
1360+
maxKeys: result.maxKeys,
1361+
};
1362+
});
1363+
}
1364+
1365+
get(marker).then(
13431366
function (result) {
13441367
var arr = result.data;
13451368
if (arr && arr.length) {
@@ -1469,6 +1492,8 @@ angular.module("web").factory("ossSvs2", [
14691492
resolve({
14701493
data: t_pre.concat(t),
14711494
marker: result.NextMarker,
1495+
truncated: result.IsTruncated,
1496+
maxKeys: result.MaxKeys,
14721497
});
14731498
});
14741499
});
@@ -1663,6 +1688,7 @@ angular.module("web").factory("ossSvs2", [
16631688
} else
16641689
Toast.error(err.code + ": " + err.message, undefined, err.requestId);
16651690
}
1691+
return Promise.reject(err);
16661692
}
16671693

16681694
/**

0 commit comments

Comments
 (0)