Skip to content

Commit

Permalink
fix(front): 配置检查表达式过滤范围没有准确带入任务启动参数(closed #243)
Browse files Browse the repository at this point in the history
  • Loading branch information
GONGONGONG authored and ZhuoZhuoCrayon committed Oct 28, 2022
1 parent 7d7461c commit 9523544
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions web/src/components/ConfigDistribute/InstanceTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<bk-popover
v-if="isConfigCheck"
:disabled="row.status === 'generated' && row.config_instance_id"
:content="row.status === 'not_generated' ? $t('未生成配置,请先生成并下发配置再进行配置检查 ') : $t('请先下发配置再进行配置检查')">
:content="row.status === 'not_generated' ? $t('未生成配置,请先生成并下发配置再进行配置检查 ') : $t('请先下发配置再进行配置检查')">
<bk-button
theme="primary"
text
Expand Down Expand Up @@ -235,8 +235,8 @@ export default {
},
maxHeight: {
type: Number,
default: 464
}
default: 464,
},
},
data() {
return {
Expand Down Expand Up @@ -731,14 +731,10 @@ export default {
const actionMethod = `configTemplate/${this.isConfigCheck ? 'ajaxSetDiffConfig' : 'ajaxSetReleaseConfig'}`;
const data = {
config_template_id: this.templateId,
[this.isDropdownMode ? 'scope' : 'expression_scope']: this.selectedScope,
};
if (this.isConfigCheck) {
data.scope = this.selectedScope;
} else {
Object.assign(data, {
[this.isDropdownMode ? 'scope' : 'expression_scope']: this.selectedScope,
config_version_ids: this.selectedVersionIds,
});
if (!this.isConfigCheck) {
data.config_version_ids = this.selectedVersionIds;
}
const res = await this.$store.dispatch(actionMethod, { data });
resolve({ jobId: res.data.job_id });
Expand Down

0 comments on commit 9523544

Please sign in to comment.