Merge branch 'import-export'

# Conflicts: # src/languages/it-IT.js # src/languages/nl-NL.js
2025-08-22 14:42:51 +08:00 · 2021-09-16 00:18:07 +08:00
parent 76db55b657 f679c1cbaf
commit 80322cbfe7
20 changed files with 136 additions and 65 deletions
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -284,8 +284,8 @@ export default {
            this.importantHeartbeatList = {}
        },

-        uploadBackup(uploadedJSON, callback) {
-            socket.emit("uploadBackup", uploadedJSON, callback)
+        uploadBackup(uploadedJSON, importHandle, callback) {
+            socket.emit("uploadBackup", uploadedJSON, importHandle, callback)
        },

        clearEvents(monitorID, callback) {