Merge pull request #4176 from jumpserver/pr@dev@fix_cloud_sync

fixed: Online synchronous import
This commit is contained in:
ZhaoJiSen 2024-07-03 15:09:09 +08:00 committed by GitHub
commit c569d0c21c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions

View File

@ -92,6 +92,10 @@ export default {
disableImportBtn: { disableImportBtn: {
type: Boolean, type: Boolean,
default: false default: false
},
origin: {
type: String,
default: ''
} }
}, },
data() { data() {
@ -419,6 +423,13 @@ export default {
} }
} }
this.importTaskStatus = 'done' this.importTaskStatus = 'done'
// 使
if (this.origin === 'cloudSync') {
this.tableConfig.totalData = this.pendingData
this.importTaskStatus = 'pending'
}
if (this.failedCount > 0) { if (this.failedCount > 0) {
this.$message.error(this.$tc('HasImportErrorItemMsg') + '') this.$message.error(this.$tc('HasImportErrorItemMsg') + '')
} }

View File

@ -10,6 +10,7 @@
<ImportTable <ImportTable
ref="importTable" ref="importTable"
v-bind="settings" v-bind="settings"
origin="cloudSync"
@cancel="closeDialog" @cancel="closeDialog"
@finish="showResult" @finish="showResult"
/> />