Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix: 变量是否为常量改为必选 --bug=120999984 #7627

Merged
merged 1 commit into from
Dec 2, 2024
Merged

fix: 变量是否为常量改为必选 --bug=120999984 #7627

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 frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,7 +1553,7 @@
source_tag: 'input.input',
source_type: 'custom',
validation: '^.+$',
pre_render_mako: false,
pre_render_mako: '',
value: '',
version: 'legacy'
}
Expand Down
5 changes: 4 additions & 1 deletion ...sktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,16 @@
</div>
<!-- 模板预渲染 -->
<div class="form-item clearfix" v-if="!isInternalVal">
<label class="form-label">
<label class="form-label required">
<span v-bk-tooltips.top="$t('常量在任务启动就完成变量值的计算，使用变量时不再重新计算保持值不变')" class="condition-tip">{{ $t('常量')}}</span>
</label>
<div class="form-content">
<bk-select
:value="String(theEditingData.pre_render_mako)"
:clearable="false"
:disabled="isViewMode"
name="preRenderMakoRule"
v-validate="{ required: true }"
@selected="onSelectPreRenderMako">
<bk-option
v-for="(option, index) in preRenderList"
Expand All @@ -176,6 +178,7 @@
:name="option.name">
</bk-option>
</bk-select>
<span v-show="veeErrors.has('preRenderMakoRule')" class="common-error-tip error-msg">{{ veeErrors.first('preRenderMakoRule') }}</span>
</div>
</div>
<!-- 描述 -->
Expand Down
2 changes: 1 addition & 1 deletion ...tend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
source_type: 'custom',
validation: '^.+$',
is_condition_hide: 'false',
pre_render_mako: false,
pre_render_mako: '',
value: '',
version: 'legacy'
}
Expand Down
Loading