Skip to content

perf: 修改作业模板的全局变量默认值，希望同步到执行方案 #3954 #4327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hLinx merged 1 commit into from
May 27, 2026
Merged

perf: 修改作业模板的全局变量默认值，希望同步到执行方案 #3954 #4327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/frontend/src/views/task-manage/common/plan/create.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
:list="globalVariableList"
mode="editOfPlan"
:select-value="selectedVariable"
:show-follow-template="(name) => selectedVariable.includes(name)"
:show-follow-template="() => true"
@on-change="handleVariableChange" />
</jb-form-item>
<jb-form-item
Expand Down
1 change: 1 addition & 0 deletions src/frontend/src/views/task-manage/common/plan/detail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
:default-field="$t('template.变量值')"
:list="unusedVariableList"
mode="viewOfPlan"
:show-follow-template="() => true"
style="margin-top: 18px;" />
</toggle-display>
</jb-form-item>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/views/task-manage/common/plan/edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
:list="globalVariableList"
mode="editOfPlan"
:select-value="selectedVariable"
:show-follow-template="(name) => selectedVariable.includes(name)"
:show-follow-template="() => true"
@on-change="handleVariableChange" />
</jb-form-item>
<jb-form-item
Expand Down
1 change: 1 addition & 0 deletions src/frontend/src/views/task-manage/common/render-global-var/batch-edit-of-plan/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
:key="variable.id"
ref="unused"
:data="variable"
:disabled="variable.followTemplate === 1"
:type="variable.type" />
</div>
</toggle-display>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/views/task-manage/common/render-global-var/edit-of-plan/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
},
computed: {
valDisabled() {
return this.data.disableEditVal;
return this.data.followTemplate === 1;
},
globalVarCom() {
const globalVarMap = {
Expand Down
4 changes: 1 addition & 3 deletions src/frontend/src/views/task-manage/common/render-global-var/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,6 @@
* @param {Index} index 点击变量的索引
*/
handlerOperation(variableInfo, index) {
// 当前不可更改全局变量值 在已经引用并且当前是跟随变量的情况下
variableInfo.disableEditVal = this.selectValue.includes(variableInfo.name) && variableInfo.followTemplate === 1;
this.currentData = variableInfo;
if (this.isView) {
this.detailMedia = variableInfo.type === VariableModel.TYPE_HOST ? [960] : [600, 660, 720, 780];
Expand Down Expand Up @@ -682,7 +680,7 @@

.variable-description {
height: 14px;
max-width: 138px;
max-width: 108px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
Expand Down
Loading