diff --git a/src/views/ops/Adhoc/QuickJob.vue b/src/views/ops/Adhoc/QuickJob.vue index fa34c66e0..0754f579d 100644 --- a/src/views/ops/Adhoc/QuickJob.vue +++ b/src/views/ops/Adhoc/QuickJob.vue @@ -331,6 +331,7 @@ export default { skipped: [] }, selectAssets: [], + selectNodes: [], lastRequestPayload: null } }, @@ -495,7 +496,7 @@ export default { runas_policy: this.runasPolicy } if (!this.shouldReRequest(payload)) { - this.onConfirmRunAsset(this.selectAssets, nodes) + this.onConfirmRunAsset(this.selectAssets, this.selectNodes) return } @@ -537,8 +538,9 @@ export default { this.setCostTimeInterval() this.writeExecutionOutput() this.setBtn() + this.selectAssets = assets + this.selectNodes = nodes }) - this.selectAssets = assets }, viewConfirmRunAssets() { this.showConfirmRunAssetsDialog = true diff --git a/src/views/ops/Adhoc/components/ConfirmRunAssetsDialog.vue b/src/views/ops/Adhoc/components/ConfirmRunAssetsDialog.vue index dab2b6826..0d6fbc589 100644 --- a/src/views/ops/Adhoc/components/ConfirmRunAssetsDialog.vue +++ b/src/views/ops/Adhoc/components/ConfirmRunAssetsDialog.vue @@ -102,8 +102,15 @@ export default { watch: { visible(val) { if (val === true && this.selectedAssets.length === 0) { + // 首次打开时,默认选中所有可运行的资产 this.selectedAssets = this.runnableAssets.map((item) => item.id) } + }, + runnableAssets(val) { + // 去掉 selectedAssets 中不存在的 id + this.selectedAssets = this.selectedAssets.filter((item) => { + return val.some((asset) => asset.id === item) + }) } }, methods: {