From ca5472d78ec18b9ff06cd57a7c03dceeb30e0da4 Mon Sep 17 00:00:00 2001 From: sdjdd Date: Tue, 20 Apr 2021 15:00:04 +0800 Subject: [PATCH] upgrade open-leancloud-storage to v0.0.25 --- modules/CustomerService/Tickets.js | 5 ++--- package-lock.json | 18 +++++++++--------- package.json | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/modules/CustomerService/Tickets.js b/modules/CustomerService/Tickets.js index 6565c06e6..614c0675f 100644 --- a/modules/CustomerService/Tickets.js +++ b/modules/CustomerService/Tickets.js @@ -578,15 +578,14 @@ export function useTickets() { query = query.where('objectId', 'in', searchMatchedTicketIds) } - const ticketObjects = await query + const [ticketObjects, count] = await query .include('author', 'assignee') .limit(PAGE_SIZE) .skip(parseInt(page) * PAGE_SIZE) .orderBy('latestReply.updatedAt', 'desc') .orderBy('updatedAt', 'desc') - .find() + .findAndCount() setTickets(ticketObjects.map((t) => t.toJSON())) - const count = await query.count() setTotalCount(count) }, [filters]) diff --git a/package-lock.json b/package-lock.json index c1b55c8e6..525efe717 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1839,9 +1839,9 @@ "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI=" }, "@types/ws": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.0.tgz", - "integrity": "sha512-Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.1.tgz", + "integrity": "sha512-ISCK1iFnR+jYv7+jLNX0wDqesZ/5RAeY3wUx6QaphmocphU61h+b+PHjS18TF4WIPTu/MMzxIq2PHr32o2TS5Q==", "requires": { "@types/node": "*" } @@ -9362,9 +9362,9 @@ } }, "open-leancloud-storage": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/open-leancloud-storage/-/open-leancloud-storage-0.0.24.tgz", - "integrity": "sha512-E/E6DWiNbc/74ExIfC6Kxc6qs8KwMkMJqOFp0EcG/oC1fFmUTOEvSV0jiGdqG8VarOZExqYlStWZxBU59lh8tQ==", + "version": "0.0.25", + "resolved": "https://registry.npmjs.org/open-leancloud-storage/-/open-leancloud-storage-0.0.25.tgz", + "integrity": "sha512-9Mf/l5W1kdTmyVxp/aG4eXD2Ad0Qw4aLTfmhXduNXxzO+7Nqb7uyGhZqsfjYsoQ2tdSm8vJ23ATVPR188h88vw==", "requires": { "@leancloud/adapter-types": "^5.0.0", "@leancloud/platform-adapters-browser": "^1.5.2", @@ -13744,9 +13744,9 @@ }, "dependencies": { "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==" + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz", + "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==" } } }, diff --git a/package.json b/package.json index 1db983ffb..96a0487ea 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "mailgun-js": "^0.18.0", "mini-css-extract-plugin": "^1.3.5", "moment": "^2.29.1", - "open-leancloud-storage": "0.0.24", + "open-leancloud-storage": "0.0.25", "query-string": "^6.14.0", "randomcolor": "^0.5.3", "randomstring": "^1.1.5",