From 4d619c30ac0a9f8716634e4cae82d98589ee51fe Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 2 Dec 2024 11:15:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=98=E9=87=8F=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=B8=BA=E5=B8=B8=E9=87=8F=E6=94=B9=E4=B8=BA=E5=BF=85=E9=80=89?=
 =?UTF-8?q?=20--bug=3D120999984=20#=20Reviewed,=20transaction=20id:=202546?=
 =?UTF-8?q?8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/template/TemplateEdit/NodeConfig/NodeConfig.vue    | 2 +-
 .../TemplateSetting/TabGlobalVariables/VariableEdit.vue      | 5 ++++-
 .../TemplateSetting/TabGlobalVariables/index.vue             | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index 8479f2d09f..951253a3c8 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -1553,7 +1553,7 @@
                         source_tag: 'input.input',
                         source_type: 'custom',
                         validation: '^.+$',
-                        pre_render_mako: false,
+                        pre_render_mako: '',
                         value: '',
                         version: 'legacy'
                     }
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
index 65cdf9e1d4..5dc8fa80d2 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
@@ -160,7 +160,7 @@
                 </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">
@@ -168,6 +168,8 @@
                             :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"
@@ -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>
                 <!-- 描述 -->
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
index fd3242d79d..6992b47a7c 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
@@ -508,7 +508,7 @@
                     source_type: 'custom',
                     validation: '^.+$',
                     is_condition_hide: 'false',
-                    pre_render_mako: false,
+                    pre_render_mako: '',
                     value: '',
                     version: 'legacy'
                 }