diff --git a/src/models/volume.js b/src/models/volume.js index 1be16bca..332c13d5 100755 --- a/src/models/volume.js +++ b/src/models/volume.js @@ -472,7 +472,15 @@ export default { *bulkBackup({ payload, }, { put }) { - yield payload.actions.map(item => put({ type: 'snapshotCreateThenBackup', payload: { snapshotCreateUrl: item.snapshotCreateUrl, snapshotBackupUrl: item.snapshotBackupUrl, labels: payload.labels } })) + yield payload.actions.map(item => put({ + type: 'snapshotCreateThenBackup', + payload: { + snapshotCreateUrl: item.snapshotCreateUrl, + snapshotBackupUrl: item.snapshotBackupUrl, + labels: payload.labels, + backupMode: payload.backupMode, + }, + })) yield put({ type: 'query' }) }, *createPVAndPVC({ @@ -571,7 +579,7 @@ export default { payload, }, { call }) { const snapshot = yield call(execAction, payload.snapshotCreateUrl, {}) - yield call(execAction, payload.snapshotBackupUrl, { name: snapshot.name, labels: payload.labels }) + yield call(execAction, payload.snapshotBackupUrl, { name: snapshot.name, labels: payload.labels, backupMode: payload.backupMode }) }, *createRecurringJob({ payload, diff --git a/src/routes/volume/index.js b/src/routes/volume/index.js index 5bdd7775..e7c894af 100644 --- a/src/routes/volume/index.js +++ b/src/routes/volume/index.js @@ -1046,11 +1046,6 @@ class Volume extends React.Component { }) }, bulkBackup(actions) { - // bulkBackup(actions.map(item => { return { snapshotCreateUrl: item.actions.snapshotCreate, snapshotBackupUrl: item.actions.snapshotBackup } })) - // dispatch({ - // type: 'volume/bulkBackup', - // payload: actions, - // }) me.setState({ ...me.state, createBackModalKey: Math.random(), @@ -1189,7 +1184,7 @@ class Volume extends React.Component { type: 'volume/bulkBackup', payload: { actions: me.state.selectedRows.map(item => { return { snapshotCreateUrl: item.actions.snapshotCreate, snapshotBackupUrl: item.actions.snapshotBackup } }), - labels: obj, + ...obj, }, }) me.setState({