From 820410d340db96e0a20538947151138b99ee0856 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Thu, 15 Aug 2024 10:45:33 +0800
Subject: [PATCH 01/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2015341?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/devops-manage/package.json       |  10 +-
 .../src/components/dialectPopoverTable.vue    | 121 ++++++++++++++
 .../src/components/project-form.vue           |  19 +++
 .../devops-manage/src/css/svg/warninfo.svg    |   1 +
 .../devops-manage/src/views/apply-project.vue |   1 +
 .../src/views/manage/project/edit-project.vue |  75 ++++++++-
 .../src/views/manage/project/show-project.vue |  19 +++
 .../PipelineEditTabs/BaseSettingTab.vue       |   2 +-
 .../components/PipelineHeader/EditHeader.vue  |   8 +
 .../components/pipelineSetting/BaseInfo.vue   |  75 ++++++++-
 .../components/syntaxStyleConfiguration.vue   | 148 ++++++++++++++++++
 .../modules/pipelines/pipelinesTemplate.js    |   6 +-
 .../src/views/CreatePipeline.vue              |  46 +++++-
 src/frontend/locale/manage/en-US.json         |  37 ++++-
 src/frontend/locale/manage/zh-CN.json         |  41 ++++-
 src/frontend/locale/pipeline/en-US.json       |  37 ++++-
 src/frontend/locale/pipeline/zh-CN.json       |  37 ++++-
 17 files changed, 667 insertions(+), 16 deletions(-)
 create mode 100644 src/frontend/devops-manage/src/components/dialectPopoverTable.vue
 create mode 100644 src/frontend/devops-manage/src/css/svg/warninfo.svg
 create mode 100644 src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue

diff --git a/src/frontend/devops-manage/package.json b/src/frontend/devops-manage/package.json
index 8ab4ee1959d..d5df2f849ae 100644
--- a/src/frontend/devops-manage/package.json
+++ b/src/frontend/devops-manage/package.json
@@ -23,12 +23,14 @@
   "license": "ISC",
   "dependencies": {
     "bk-permission": "^0.0.28",
-    "bkui-vue": "0.0.1-beta.456",
+    "bkui-vue": "2.0.1-beta.43",
     "dayjs": "^1.11.2",
     "pinia": "^2.0.23",
     "vue": "^3.2.41",
     "vue-i18n": "^9.1.10",
-    "vue-router": "^4.1.6"
+    "vue-router": "^4.1.6",
+    "lodash.throttle": "^4.1.1",
+    "@icon-cool/bk-icon-bk-biz-components": "0.0.4"
   },
   "devDependencies": {
     "@blueking/babel-preset-bk": "^2.1.0-beta7",
@@ -45,6 +47,8 @@
     "postcss-preset-env": "^7.8.2",
     "postcss-simple-vars": "^7.0.0",
     "postcss-url": "^10.1.3",
-    "typescript": "^4.8.4"
+    "typescript": "^4.8.4",
+    "less": "^4.2.0",
+    "less-loader": "^12.2.0"
   }
 }
diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
new file mode 100644
index 00000000000..59efacebf2e
--- /dev/null
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -0,0 +1,121 @@
+<template>
+  <bk-popover
+    theme="light"
+    :width="900"
+    :placement="placement"
+    extCls="dialect-popover"
+  >
+    <label class="label">{{ t('变量语法风格') }}</label>
+    <template #content>
+      <h3 class="title">{{ t('语法差异') }}</h3>
+      <bk-table :data="namingConventionData" show-overflow-tooltip>
+        <bk-table-column :label="$t('差异项')" prop="difference" :width="140" />
+        <bk-table-column :label="$t('传统风格')" prop="classIc" :width="290">
+          <template #default="{ row }">
+            <div
+              class="label-column"
+              v-bk-tooltips="{
+                content: row.classIcExample ? `${row.classIc};  ${row.classIcExample}` : row.classIc
+              }"
+            >
+              <p>{{ row.classIc }}</p>
+              <p>{{ row.classIcExample }}</p>
+            </div>
+          </template>
+        </bk-table-column>
+        <bk-table-column :label="$t('制约风格')" prop="constrained">
+          <template #default="{ row }">
+            <div
+              class="label-column"
+              v-bk-tooltips="{
+                content: row.constrainedExample ? `${row.constrained};  ${row.constrainedExample}` : row.constrained
+              }"
+            >
+              <p>{{ row.constrained }}</p>
+              <p>{{ row.constrainedExample }}</p>
+            </div>
+          </template>
+        </bk-table-column>
+      </bk-table>
+    </template>
+  </bk-popover>
+</template>
+
+<script setup name="DialectPopoverTable">
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+defineProps({
+  placement: {
+    type: String,
+    default: 'top-start'
+  }
+})
+const namingConventionData = [
+    {
+        difference: t('表达式格式'),
+        classIc: t('单花括号或双花括号'),
+        classIcExample: t('如：${var}、${{var}}'),
+        constrained: t('仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题'),
+        constrainedExample: t('如：${{variables.var}}'),
+    },
+    {
+        difference: t('引用方式'),
+        classIc: t('直接引用变量名或上下文方式引用'),
+        constrained: t('仅支持上下文方式引用'),
+        constrainedExample: t('如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}'),
+    },
+    {
+        difference: t('环境变量'),
+        classIc: t('流水线变量、插件输出变量会自动设置为环境变量'),
+        constrained: t('需要时通过在 Job/Step 上按需指定，降低环境污染风险'),
+    },
+    {
+        difference: t('重置内置只读变量'),
+        classIc: t('不生效，仅警告未报错'),
+        constrained: t('将报错，运行失败'),
+    },
+    {
+        difference: t('变量值超长'),
+        classIc: t('仅警告未报错'),
+        constrained: t('将报错，运行失败'),
+    },
+    {
+        difference: t('变量不存在'),
+        classIc: t('未报错，继续执行，依赖执行逻辑自行检查'),
+        constrained: t('将报错，运行失败'),
+    },
+    {
+        difference: t('变量 ID 规范'),
+        classIc: t('未限制'),
+        constrained: t('不支持中文 ID，减少不同构建环境下的兼容问题'),
+    }
+]
+</script>
+
+<style lang="scss" scoped>
+.dialect-popover {
+  padding: 16px !important;
+}  
+.label {
+  font-size: 12px;
+  padding: 4px 0;
+  border-bottom: 1px dashed #979BA5;
+}
+.title {
+  margin-bottom: 16px;
+  font-weight: 700;
+  font-size: 14px;
+  color: #63656E;
+}
+.label-column {
+  padding: 4px 0;
+  p {
+    line-height: 20px;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+}
+  
+</style>
\ No newline at end of file
diff --git a/src/frontend/devops-manage/src/components/project-form.vue b/src/frontend/devops-manage/src/components/project-form.vue
index 576775210ee..5cf22e15728 100644
--- a/src/frontend/devops-manage/src/components/project-form.vue
+++ b/src/frontend/devops-manage/src/components/project-form.vue
@@ -14,6 +14,7 @@ import IAMIframe from './IAM-Iframe';
 import { useI18n } from 'vue-i18n';
 import { Message, Popover } from 'bkui-vue';
 import http from '@/http/api';
+import DialectPopoverTable from "@/components/dialectPopoverTable";
 const {
   t,
 } = useI18n();
@@ -468,6 +469,24 @@ onBeforeUnmount(() => {
         @click="showMemberDialog"
       />
     </bk-form-item>
+    <bk-form-item
+      property="pipelineDialect"
+    >
+    <template #label>
+      <dialect-popover-table />
+    </template>
+    <bk-radio-group
+      v-model="projectData.pipelineDialect"
+      @change="handleChangeForm"
+    >
+        <bk-radio label="CLASSIC">
+          <span>{{ t('传统风格') }}</span>
+        </bk-radio>
+        <bk-radio label="CONSTRAINED">
+          <span>{{ t('制约风格') }}</span>
+        </bk-radio>
+      </bk-radio-group>
+    </bk-form-item>
     <div>
       <slot></slot>
     </div>
diff --git a/src/frontend/devops-manage/src/css/svg/warninfo.svg b/src/frontend/devops-manage/src/css/svg/warninfo.svg
new file mode 100644
index 00000000000..58c9074d22e
--- /dev/null
+++ b/src/frontend/devops-manage/src/css/svg/warninfo.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path fill="#FFE8C3" d="M512 0C229.25714285714287 0 0 229.25714285714287 0 512 0 794.742857142857 229.25714285714287 1024 512 1024 794.742857142857 1024 1024 794.742857142857 1024 512 1024 229.25714285714287 794.742857142857 0 512 0L512 0Z"></path><path fill="#FF9C01" d="M516.5714285714286 649.1428571428571C539.2939995428571 649.1428571428571 557.7142857142857 667.5631433142856 557.7142857142857 690.2857142857142 557.7142857142857 713.0082852571428 539.2939995428571 731.4285714285713 516.5714285714286 731.4285714285713 493.8488576 731.4285714285713 475.4285714285714 713.0082852571428 475.4285714285714 690.2857142857142 475.4285714285714 667.5631433142856 493.8488576 649.1428571428571 516.5714285714286 649.1428571428571ZM516.8375917714285 292.57142857142856C539.4131675428571 292.57142857142856 557.7142857142857 308.71668297142855 557.7142857142857 328.6328649142857 557.7142857142857 330.54788388571427 557.5450806857143 332.4280356571428 557.2191414857143 334.26232685714285L545.7541010285714 568.7755593142857C545.7541010285714 582.8644278857142 532.8077385142857 594.2857142857142 516.8375917714285 594.2857142857142 500.8674450285714 594.2857142857142 487.9210825142857 582.8644278857142 487.9210825142857 568.7755593142857L487.9210825142857 568.7755593142857 475.4285714285714 326.4290706285714 476.0379940571428 326.3997769142857C477.3451922285714 307.52369737142857 495.1120859428571 292.57142857142856 516.8375917714285 292.57142857142856Z"></path></g></svg>
\ No newline at end of file
diff --git a/src/frontend/devops-manage/src/views/apply-project.vue b/src/frontend/devops-manage/src/views/apply-project.vue
index aa68f94e86e..b7c101c7258 100644
--- a/src/frontend/devops-manage/src/views/apply-project.vue
+++ b/src/frontend/devops-manage/src/views/apply-project.vue
@@ -28,6 +28,7 @@ const projectData = ref({
   subjectScopes: [],
   secrecy: false,
   authSecrecy: 0,
+  pipelineDialect: 'CLASSIC',
 });
 const projectForm = ref(null);
 const btnLoading = ref(false);
diff --git a/src/frontend/devops-manage/src/views/manage/project/edit-project.vue b/src/frontend/devops-manage/src/views/manage/project/edit-project.vue
index 69c89613235..73019a3afd2 100644
--- a/src/frontend/devops-manage/src/views/manage/project/edit-project.vue
+++ b/src/frontend/devops-manage/src/views/manage/project/edit-project.vue
@@ -32,6 +32,8 @@ const statusDisabledTips = {
   1: t('新建项目申请审批中，暂不可修改'),
   4: t('更新项目信息审批中，暂不可修改'),
 };
+const currentDialect = ref();
+const isDialectDialog = ref(false);
 
 const fetchProjectData = async () => {
   isLoading.value = true;
@@ -39,6 +41,7 @@ const fetchProjectData = async () => {
     englishName: projectCode,
   }).then((res) => {
     projectData.value = res;
+    currentDialect.value = res.pipelineDialect;
     if (projectData.value.centerId === '0') projectData.value.centerId = ''
     if (projectData.value.projectType === 0) projectData.value.projectType = ''
   }).catch((err) => {
@@ -144,11 +147,28 @@ const showNeedApprovedTips = () => {
 /**
  * 更新项目
  */
-const handleUpdate = async () => {
+const handleUpdate = () => {
+  if(currentDialect.value === 'CLASSIC' && projectData.value.pipelineDialect === 'CONSTRAINED'){
+    isDialectDialog.value = true;
+    return
+  }
+  updateConfirm()
+};
+
+const updateConfirm = async () => {
   projectForm.value?.validate().then(async () => {
     await updateProject();
   })
-};
+}
+
+const handleConfirm = () => {
+  isDialectDialog.value = false;
+  updateConfirm()
+}
+
+const handleClosed = () => {
+  isDialectDialog.value = false;
+}
 
 const initProjectForm = (value) => {
   projectForm.value = value;
@@ -228,6 +248,27 @@ onMounted(() => {
       </bk-button>
     </bk-exception>
   </bk-loading>
+  <bk-dialog
+    :width="480"
+    header-align="center"
+    footer-align="center"
+    :is-show="isDialectDialog"
+    @confirm="handleConfirm"
+    @closed="handleClosed"
+  >
+    <template #header>
+      <img src="@/css/svg/warninfo.svg" class="manage-icon-tips">
+      <h2 class="dialog-header"> {{ t('确定升级变量语法风格为制约风格？')}}</h2>
+    </template>
+    <template #default>
+      <div class="project">
+        {{ t('项目：') }} <span class="project-name">{{ projectData.projectName }}</span>
+      </div>
+      <div class="description">
+        {{ t('升级后，该项目对变量引用方式将有更严格的要求。') }}
+      </div>
+    </template>
+  </bk-dialog>
 </template>
 
 <style lang="postcss" scoped>
@@ -269,4 +310,34 @@ onMounted(() => {
       width: 88px;
     }
   }
+  .manage-icon-tips {
+    width: 42px;
+    height: 42px;
+  }
+  .dialog-header {
+    font-family: MicrosoftYaHei;
+    font-size: 20px;
+    color: #313238;
+    letter-spacing: 0;
+  }
+  .progect {
+    font-size: 14px;
+    color: #63656E;
+    .project-name {
+      color: #313238;
+      font-weight: bold;
+    }
+  }
+  .description {
+    display: flex;
+    align-items: center;
+    width: 416px;
+    height: 46px;
+    padding: 0 16px;
+    margin: 16px 0;
+    background: #F5F6FA;
+    border-radius: 2px;
+    font-size: 14px;
+    color: #63656E;
+  }
 </style>
diff --git a/src/frontend/devops-manage/src/views/manage/project/show-project.vue b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
index 2c3ac980925..68c3814aa3b 100644
--- a/src/frontend/devops-manage/src/views/manage/project/show-project.vue
+++ b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
@@ -23,6 +23,7 @@ import {
   RESOURCE_ACTION,
   RESOURCE_TYPE,
 } from '@/utils/permission.js'
+import DialectPopoverTable from "@/components/dialectPopoverTable";
 
 const { t } = useI18n();
 const router = useRouter();
@@ -303,6 +304,10 @@ const projectTypeNameMap = {
   4: t('平台产品'),
   5: t('支撑产品'),
 }
+const pipelineDialectMap = {
+  'CLASSIC': t('传统风格'),
+  'CONSTRAINED': t('制约风格'),
+}
 watch(() => projectData.value.approvalStatus, (status) => {
   if (status === 4) fetchDiffProjectData();
 }, {
@@ -414,6 +419,20 @@ onMounted(async () => {
                     </bk-tag>
                   </div>
                 </bk-form-item>
+                <bk-form-item property="pipelineDialect">
+                  <template #label>
+                    <dialect-popover-table :placement="'bottom-end'"/>
+                  </template>
+                  <div>
+                    <span>{{ pipelineDialectMap[projectData.pipelineDialect] }}</span>
+                    <div class="diff-content" v-if="projectData.afterPipelineDialect">
+                      <p class="update-title">
+                        {{ t('本次更新：') }}
+                      </p>
+                      <span>{{ pipelineDialectMap[projectData.afterPipelineDialect] }}</span>
+                    </div>
+                  </div>
+                </bk-form-item>
                 <bk-form-item>
                   <!--
                     approvalStatus
diff --git a/src/frontend/devops-pipeline/src/components/PipelineEditTabs/BaseSettingTab.vue b/src/frontend/devops-pipeline/src/components/PipelineEditTabs/BaseSettingTab.vue
index 8584b28d825..7c8abf7e3ac 100755
--- a/src/frontend/devops-pipeline/src/components/PipelineEditTabs/BaseSettingTab.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineEditTabs/BaseSettingTab.vue
@@ -55,7 +55,7 @@
         },
         methods: {
             handleBaseInfoChange (name, value) {
-                if (this.pipelineSetting[name] !== value) {
+                if (this.pipelineSetting[name] !== value || name === 'pipelineAsCodeSettings') {
                     this.updatePipelineSetting({
                         setting: this.pipelineSetting,
                         param: {
diff --git a/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue b/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue
index e63499d3085..45bdac97245 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue
@@ -191,6 +191,9 @@
                 'setSaveStatus',
                 'updateContainer'
             ]),
+            ...mapActions('pipelines', [
+                'getPipelineDialect'
+            ]),
             async exec (debug) {
                 if (debug && this.isEditing) {
                     const result = await this.saveDraft()
@@ -242,6 +245,11 @@
                     // 清除流水线参数渲染过程中添加的key
                     this.formatParams(pipeline)
 
+                    if (!pipelineSetting.pipelineAsCodeSettings.pipelineDialect) {
+                        const { data } = await this.getPipelineDialect(this.projectId)
+                        pipelineSetting.pipelineAsCodeSettings.pipelineDialect = data
+                    }
+
                     // 请求执行构建
                     const { data: { version, versionName } } = await this.saveDraftPipeline({
                         projectId,
diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
index f20832876a1..059368feef3 100755
--- a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
+++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
@@ -58,6 +58,15 @@
             <bk-form-item :label="$t('desc')" :is-error="errors.has('desc')" :error-msg="errors.first('desc')">
                 <vuex-textarea :disabled="!editable" name="desc" :value="pipelineSetting.desc" :placeholder="$t('pipelineDescInputTips')" v-validate.initial="'max:100'" :handle-change="handleBaseInfoChange" />
             </bk-form-item>
+
+            <bk-form-item ext-cls="namingConvention">
+                <syntax-style-configuration
+                    :inherited-dialect="settings.inheritedDialect"
+                    :pipeline-dialect="settings.pipelineDialect"
+                    @inherited-change="inheritedChange"
+                    @pipeline-dialect-change="pipelineDialectChange"
+                />
+            </bk-form-item>
         </bk-form>
     </div>
 </template>
@@ -65,13 +74,15 @@
 <script>
     import VuexInput from '@/components/atomFormField/VuexInput/index.vue'
     import VuexTextarea from '@/components/atomFormField/VuexTextarea/index.vue'
-    import { mapGetters } from 'vuex'
+    import SyntaxStyleConfiguration from '@/components/syntaxStyleConfiguration'
+    import { mapGetters, mapActions } from 'vuex'
 
     export default {
         name: 'bkdevops-base-info-setting-tab',
         components: {
             VuexTextarea,
-            VuexInput
+            VuexInput,
+            SyntaxStyleConfiguration
         },
         props: {
             pipelineSetting: Object,
@@ -81,6 +92,16 @@
             },
             handleBaseInfoChange: Function
         },
+        data () {
+            return {
+                settings: {
+                    enable: null,
+                    inheritedDialect: true,
+                    pipelineDialect: ''
+                },
+                currentPipelineDialect: ''
+            }
+        },
         computed: {
             ...mapGetters({
                 tagGroupList: 'pipelines/getTagGroupList'
@@ -104,10 +125,24 @@
                 })
             }
         },
+        watch: {
+            pipelineSetting: {
+                handler (newVal) {
+                    if (newVal) {
+                        this.initializePipelineAsCodeSettings(newVal.pipelineAsCodeSettings)
+                    }
+                }
+
+            }
+        },
         created () {
             this.requestGrouptLists()
+            this.requestPipelineDialect()
         },
         methods: {
+            ...mapActions('pipelines', [
+                'getPipelineDialect'
+            ]),
             /** *
              * 获取标签及其分组
              */
@@ -136,6 +171,34 @@
             toManageLabel () {
                 const url = `${WEB_URL_PREFIX}/pipeline/${this.projectId}/list/group`
                 window.open(url, '_blank')
+            },
+            initializePipelineAsCodeSettings (settings) {
+                const { enable, inheritedDialect } = settings
+                this.settings = {
+                    ...this.settings,
+                    enable,
+                    inheritedDialect
+                }
+            },
+            async requestPipelineDialect () {
+                try {
+                    const { data } = await this.getPipelineDialect(this.projectId)
+                    this.currentPipelineDialect = data
+                    this.settings.pipelineDialect = data
+                } catch (err) {
+                    console.log(err)
+                }
+            },
+            inheritedChange (value) {
+                if (value) {
+                    this.settings.pipelineDialect = this.currentPipelineDialect
+                }
+                this.settings.inheritedDialect = value
+                this.handleBaseInfoChange('pipelineAsCodeSettings', this.settings)
+            },
+            pipelineDialectChange (value) {
+                this.settings.pipelineDialect = value
+                this.handleBaseInfoChange('pipelineAsCodeSettings', this.settings)
             }
         }
     }
@@ -200,5 +263,13 @@
                 font-size: 12px;
             }
         }
+        .namingConvention {
+            position: relative;
+            .bk-form-control {
+                display: flex;
+                grid-gap: 16px;
+                margin-top: 8px;
+            }
+        }
     }
 </style>
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
new file mode 100644
index 00000000000..fa2c2f12139
--- /dev/null
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -0,0 +1,148 @@
+<template>
+    <div>
+        <bk-popover theme="light" :width="892" placement="top-start">
+            <label class="label">{{$t('namingConvention')}}</label>
+            <div slot="content">
+                <h3>{{ $t('grammaticalDifferences') }}</h3>
+                <bk-table
+                    :data="namingConventionData"
+                    :outer-border="false"
+                    row-auto-height
+                    show-overflow-tooltip
+                >
+                    <bk-table-column :label="$t('differenceItem')" prop="difference" :width="140" />
+                    <bk-table-column :label="$t('traditionalStyle')" prop="classIc" :width="290">
+                        <template slot-scope="props">
+                            <div class="label-column">
+                                <p>{{ props.row.classIc }}</p>
+                                <p>{{ props.row.classIcExample }}</p>
+                            </div>
+                        </template>
+                    </bk-table-column>
+                    <bk-table-column :label="$t('constraintStyle')" prop="constrained">
+                        <template slot-scope="props">
+                            <div class="label-column">
+                                <p>{{ props.row.constrained }}</p>
+                                <p>{{ props.row.constrainedExample }}</p>
+                            </div>
+                        </template>
+                    </bk-table-column>
+                </bk-table>
+            </div>
+        </bk-popover>
+        <bk-checkbox
+            ext-cls="namingConvention-checkbox"
+            v-model="inheritedDialect"
+            @change="inheritedChange"
+        >
+            {{ $t('inheritedProject') }}
+        </bk-checkbox>
+        <bk-radio-group
+            class="pipelinte-template-type-group"
+            v-model="pipelineDialect"
+            @change="pipelineDialectChange"
+        >
+            <bk-radio :value="'CLASSIC'" :disabled="isDialectDisabled">
+                <span class="radio-label">{{ $t('traditionalStyle') }}</span>
+            </bk-radio>
+            <bk-radio :value="'CONSTRAINED'" :disabled="isDialectDisabled">
+                <span class="radio-label">{{ $t('constraintStyle') }}</span>
+            </bk-radio>
+        </bk-radio-group>
+    </div>
+</template>
+
+<script>
+
+    export default {
+        name: 'base-setting-tab',
+        props: {
+            inheritedDialect: Boolean,
+            pipelineDialect: String
+        },
+        computed: {
+            namingConventionData () {
+                return [
+                    {
+                        difference: this.$t('expressionFormat'),
+                        classIc: this.$t('traditionalFormat'),
+                        classIcExample: this.$t('traditionalFormatExample'),
+                        constrained: this.$t('constraintFormat'),
+                        constrainedExample: this.$t('constraintFormatExample')
+                    },
+                    {
+                        difference: this.$t('quoteMode'),
+                        classIc: this.$t('traditionalQuoteMode'),
+                        constrained: this.$t('constraintQuoteMode'),
+                        constrainedExample: this.$t('constraintQuoteModeExample')
+                    },
+                    {
+                        difference: this.$t('environmentVariable'),
+                        classIc: this.$t('traditionalEnvironmentVariableMode'),
+                        constrained: this.$t('constraintEnvironmentVariableMode')
+                    },
+                    {
+                        difference: this.$t('readOnlyVariable'),
+                        classIc: this.$t('traditionalReadOnlyMode'),
+                        constrained: this.$t('constraintReadOnlyMode')
+                    },
+                    {
+                        difference: this.$t('variableValueTooLong'),
+                        classIc: this.$t('traditionalValueTooLongMode'),
+                        constrained: this.$t('constraintReadOnlyMode')
+                    },
+                    {
+                        difference: this.$t('variableNotFound'),
+                        classIc: this.$t('traditionalNotFoundMode'),
+                        constrained: this.$t('constraintReadOnlyMode')
+                    },
+                    {
+                        difference: this.$t('variableStandard'),
+                        classIc: this.$t('traditionalStandardMode'),
+                        constrained: this.$t('constraintStandardMode')
+                    }
+                ]
+            },
+            isDialectDisabled () {
+                if (this.inheritedDialect) {
+                    return true
+                } else {
+                    return false
+                }
+            }
+        },
+        methods: {
+            inheritedChange (value) {
+                this.isDialectDisabled = !this.isDialectDisabled
+                this.$emit('inherited-change', value)
+            },
+            pipelineDialectChange (value) {
+                this.$emit('pipeline-dialect-change', value)
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+.label {
+    font-weight: bold;
+    font-size: 12px;
+    padding: 4px 0;
+    color: #63656E;
+    border-bottom: 1px dashed #63656E;
+}
+
+.label-column {
+    padding: 4px 0;
+}
+
+.namingConvention-checkbox{
+    position: absolute;
+    top: 4px;
+    margin-left: 16px;
+    height: 24px;
+    background: #F5F7FA;
+    border-radius: 12px;
+    padding: 4px 12px;
+}
+</style>
diff --git a/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js b/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js
index 288ad7307b4..8c641a2d74f 100755
--- a/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js
+++ b/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js
@@ -19,7 +19,8 @@
 
 import {
     PROCESS_API_URL_PREFIX,
-    STORE_API_URL_PREFIX
+    STORE_API_URL_PREFIX,
+    PROJECT_API_URL_PREFIX
 } from '@/store/constants'
 import ajax from '@/utils/request'
 
@@ -38,6 +39,9 @@ const mutations = {
 }
 
 const actions = {
+    async getPipelineDialect (_, projectId) {
+        return ajax.get(`${PROJECT_API_URL_PREFIX}/user/projects/${projectId}/pipelineDialect`)
+    },
     installPipelineTemplate (_, params) {
         return ajax.post(`${STORE_API_URL_PREFIX}/user/market/template/install`, params).then(response => {
         })
diff --git a/src/frontend/devops-pipeline/src/views/CreatePipeline.vue b/src/frontend/devops-pipeline/src/views/CreatePipeline.vue
index ffface6cae3..5687da316b9 100644
--- a/src/frontend/devops-pipeline/src/views/CreatePipeline.vue
+++ b/src/frontend/devops-pipeline/src/views/CreatePipeline.vue
@@ -79,6 +79,14 @@
                             </bk-checkbox-group>
                         </bk-form-item>
                     </template>
+                    <bk-form-item ext-cls="namingConvention">
+                        <syntax-style-configuration
+                            :inherited-dialect="inheritedDialect"
+                            :pipeline-dialect="pipelineDialect"
+                            @inherited-change="inheritedChange"
+                            @pipeline-dialect-change="pipelineDialectChange"
+                        />
+                    </bk-form-item>
                 </bk-form>
                 <footer style="margin-top: 24px;">
                     <bk-button
@@ -187,12 +195,14 @@
     import { templateTypeEnum } from '@/utils/pipelineConst'
     import { getCacheViewId } from '@/utils/util'
     import { mapActions, mapState } from 'vuex'
+    import SyntaxStyleConfiguration from '@/components/syntaxStyleConfiguration'
 
     export default {
         components: {
             pipelineHeader,
             PipelineTemplatePreview,
-            Logo
+            Logo,
+            SyntaxStyleConfiguration
         },
         data () {
             return {
@@ -201,6 +211,9 @@
                 isDisabled: false,
                 activeTempIndex: 0,
                 applySettings: [],
+                inheritedDialect: true,
+                pipelineDialect: 'CLASSIC',
+                currentPipelineDialect: '',
                 isLoading: false,
                 newPipelineName: '',
                 searchName: '',
@@ -332,6 +345,7 @@
             this.requestPipelineTemplate({
                 projectId: this.$route.params.projectId
             })
+            this.requestPipelineDialect()
         },
         mounted () {
             console.log(this.$refs.pipelineName)
@@ -346,7 +360,8 @@
             ]),
             ...mapActions('pipelines', [
                 'installPipelineTemplate',
-                'createPipelineWithTemplate'
+                'createPipelineWithTemplate',
+                'getPipelineDialect'
             ]),
             goList () {
                 this.$router.push(this.pipelineListRoute)
@@ -462,7 +477,9 @@
                             result[item] = true
                             return result
                         }, {}),
-                        instanceType: this.templateType
+                        instanceType: this.templateType,
+                        inheritedDialect: this.inheritedDialect,
+                        pipelineDialect: this.pipelineDialect
                     }
 
                     if (this.templateType === templateTypeEnum.CONSTRAIN) {
@@ -505,6 +522,25 @@
                 } finally {
                     this.isDisabled = false
                 }
+            },
+            async requestPipelineDialect () {
+                try {
+                    const projectId = this.$route.params.projectId
+                    const { data } = await this.getPipelineDialect(projectId)
+                    this.currentPipelineDialect = data
+                    this.pipelineDialect = data
+                } catch (err) {
+                    console.log(err)
+                }
+            },
+            inheritedChange (value) {
+                this.inheritedDialect = value
+                if (value) {
+                    this.pipelineDialect = this.currentPipelineDialect
+                }
+            },
+            pipelineDialectChange (value) {
+                this.pipelineDialect = value
             }
         }
     }
@@ -532,6 +568,10 @@
             padding: 24px;
             background: white;
             overflow: auto;
+            
+            .namingConvention {
+                position: relative;
+            }
 
             .pipeline-input {
                 position: relative;
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 47491935798..f51f3c44629 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -138,5 +138,40 @@
     "重命名": "Rename",
     "项目类型": "Project Type",
     "创建项目申请单已撤回": "Creation of project application has been withdrawn",
-    "全员": "EveryOne"
+    "全员": "EveryOne",
+    "变量语法风格": "Naming Convention",
+    "继承项目设置": "Inherited Project Settings",
+    "传统风格": "Traditional Style",
+    "制约风格": "Constraint Style",
+    "语法差异": "Grammatical Differences",
+    "差异项": "Difference Item",
+
+    "表达式格式": "Expression Format",
+    "单花括号或双花括号": "Single or Double Curly Braces",
+    "如：${var}、${{var}}": "e.g., {'${var}'}、{'${{var}}'}",
+    "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
+    "如：${{variables.var}}": "e.g., {'${{variables.var}}'}",
+
+    "引用方式": "Quote Mode",
+    "直接引用变量名或上下文方式引用": "Direct Variable Name or Contextual Reference",
+    "仅支持上下文方式引用": "Only Contextual Reference Supported",
+    "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}": "e.g., {'${{ci.pipeline_id}}'}、{'${{variables.a}}'}、{'${{steps.get_code.outputs.a}}'}",
+
+    "环境变量": "Environment Variable",
+    "流水线变量、插件输出变量会自动设置为环境变量": "Pipeline Variables and Plugin Output Variables are Automatically Set as Environment Variables",
+    "需要时通过在 Job/Step 上按需指定，降低环境污染风险": "Specify as Needed in Job/Step to Reduce Environment Pollution Risk",
+
+    "重置内置只读变量": "Reset Built-in Read-Only Variables",
+    "不生效，仅警告未报错": "Not Effective, Only Warning without Error",
+    "将报错，运行失败": "Will Cause Error and Run Failure",
+
+    "变量值超长": "Variable Value Too Long",
+    "仅警告未报错": "Only Warning without Error",
+
+    "变量不存在": "Variable Not Found",
+    "未报错，继续执行，依赖执行逻辑自行检查": "No Error, Continue Execution, Check Execution Logic as Needed",
+
+    "变量 ID 规范": "Variable ID Standard",
+    "未限制": "No Restriction",
+    "不支持中文 ID，减少不同构建环境下的兼容问题": "Chinese IDs Not Supported to Reduce Compatibility Issues in Different Build Environments"
 }
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 5635b9425e2..fcfb3920020 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -139,5 +139,44 @@
     "重命名": "重命名",
     "项目类型": "项目类型",
     "创建项目申请单已撤回": "创建项目申请单已撤回",
-    "全员": "全员"
+    "全员": "全员",
+    "变量语法风格": "变量语法风格",
+    "继承项目设置": "继承项目设置",
+    "传统风格": "传统风格",
+    "制约风格": "制约风格",
+    "语法差异": "语法差异",
+    "差异项": "差异项",
+
+    "表达式格式": "表达式格式",
+    "单花括号或双花括号": "单花括号或双花括号",
+    "如：${var}、${{var}}": "如：{'${var}'}、{'${{var}}'}",
+    "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
+    "如：${{variables.var}}":"如：{'${{variables.var}}'}",
+
+    "引用方式": "引用方式",
+    "直接引用变量名或上下文方式引用": "直接引用变量名或上下文方式引用",
+    "仅支持上下文方式引用": "仅支持上下文方式引用",
+    "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}": "如：{'${{ci.pipeline_id}}'}、{'${{variables.a}}'}、{'${{steps.get_code.outputs.a}}'}",
+
+    "环境变量": "环境变量",
+    "流水线变量、插件输出变量会自动设置为环境变量": "流水线变量、插件输出变量会自动设置为环境变量",
+    "需要时通过在 Job/Step 上按需指定，降低环境污染风险": "需要时通过在 Job/Step 上按需指定，降低环境污染风险",
+
+    "重置内置只读变量": "重置内置只读变量",
+    "不生效，仅警告未报错": "不生效，仅警告未报错",
+    "将报错，运行失败": "将报错，运行失败",
+
+    "变量值超长": "变量值超长",
+    "仅警告未报错": "仅警告未报错",
+
+    "变量不存在": "变量不存在",
+    "未报错，继续执行，依赖执行逻辑自行检查": "未报错，继续执行，依赖执行逻辑自行检查",
+
+    "变量 ID 规范": "变量 ID 规范",
+    "未限制": "未限制",
+    "不支持中文 ID，减少不同构建环境下的兼容问题": "不支持中文 ID，减少不同构建环境下的兼容问题",
+    "确定升级变量语法风格为制约风格？": "确定升级变量语法风格为制约风格？",
+    "项目:": "项目:",
+    "升级后，该项目对变量引用方式将有更严格的要求。": "升级后，该项目对变量引用方式将有更严格的要求。",
+    "影响流水线(X)": "影响流水线(0)"
 }
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index 0e852696bde..390c7cae755 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -1551,5 +1551,40 @@
   "completeness": "Completeness: ",
   "pacDesc": "Pipeline as Code mode, referred to as PAC mode. After enabling and submitting the pipeline file to the code base, you can maintain the pipeline by maintaining the code base file.",
   "debugHint": "Debugging and execution do not share build numbers, but they share concurrency control. Debug records are only valid during the draft version debugging period and will be automatically cleared after the version is released.",
-  "templateRollbackBackTips": "The current pipeline is in constraint mode (template instance). You need to jump to the template to roll back the version."
+  "templateRollbackBackTips": "The current pipeline is in constraint mode (template instance). You need to jump to the template to roll back the version.",
+  "namingConvention": "Naming Convention",
+  "inheritedProject": "Inherited Project Settings",
+  "traditionalStyle": "Traditional Style",
+  "constraintStyle": "Constraint Style",
+  "grammaticalDifferences": "Grammatical Differences",
+  "differenceItem": "Difference Item",
+
+  "expressionFormat": "Expression Format",
+  "traditionalFormat": "Single or Double Curly Braces",
+  "traditionalFormatExample": "e.g., ${var}, ${{var}}",
+  "constraintFormat": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
+  "constraintFormatExample": "e.g., ${{variables.var}}",
+
+  "quoteMode": "Quote Mode",
+  "traditionalQuoteMode": "Direct Variable Name or Contextual Reference",
+  "constraintQuoteMode": "Only Contextual Reference Supported",
+  "constraintQuoteModeExample": "e.g., ${{ci.pipeline_id}}, ${{variables.a}}, ${{steps.get_code.outputs.a}}",
+
+  "environmentVariable": "Environment Variable",
+  "traditionalEnvironmentVariableMode": "Pipeline Variables and Plugin Output Variables are Automatically Set as Environment Variables",
+  "constraintEnvironmentVariableMode": "Specify as Needed in Job/Step to Reduce Environment Pollution Risk",
+
+  "readOnlyVariable": "Reset Built-in Read-Only Variables",
+  "traditionalReadOnlyMode": "Not Effective, Only Warning without Error",
+  "constraintReadOnlyMode": "Will Cause Error and Run Failure",
+
+  "variableValueTooLong": "Variable Value Too Long",
+  "traditionalValueTooLongMode": "Only Warning without Error",
+
+  "variableNotFound": "Variable Not Found",
+  "traditionalNotFoundMode": "No Error, Continue Execution, Check Execution Logic as Needed",
+
+  "variableStandard": "Variable ID Standard",
+  "traditionalStandardMode": "No Restriction",
+  "constraintStandardMode": "Chinese IDs Not Supported to Reduce Compatibility Issues in Different Build Environments"
 }
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index 3a6509cc54e..919c38c952f 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -1552,5 +1552,40 @@
   "completeness": "完成度：",
   "pacDesc": "Pipeline as Code 模式，简称 PAC 模式。开启并将流水线文件提交到代码库后，可通过维护代码库文件的方式来维护流水线。",
   "debugHint": "调试和执行不共享构建号，但共享并发控制。调试记录仅在草稿版本调试期间有效，版本发布后将自动清理。",
-  "templateRollbackBackTips": "当前流水线为约束模式（模板实例），需要跳转到模板进行版本回滚。"
+  "templateRollbackBackTips": "当前流水线为约束模式（模板实例），需要跳转到模板进行版本回滚。",
+  "namingConvention": "变量语法风格",
+  "inheritedProject": "继承项目设置",
+  "traditionalStyle": "传统风格",
+  "constraintStyle": "制约风格",
+  "grammaticalDifferences": "语法差异",
+  "differenceItem": "差异项",
+
+  "expressionFormat": "表达式格式",
+  "traditionalFormat": "单花括号或双花括号",
+  "traditionalFormatExample": "如：${var}、${{var}}",
+  "constraintFormat": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
+  "constraintFormatExample": "如：${{variables.var}}",
+
+  "quoteMode": "引用方式",
+  "traditionalQuoteMode": "直接引用变量名或上下文方式引用",
+  "constraintQuoteMode": "仅支持上下文方式引用",
+  "constraintQuoteModeExample": "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}",
+
+  "environmentVariable": "环境变量",
+  "traditionalEnvironmentVariableMode": "流水线变量、插件输出变量会自动设置为环境变量",
+  "constraintEnvironmentVariableMode": "需要时通过在 Job/Step 上按需指定，降低环境污染风险",
+
+  "readOnlyVariable": "重置内置只读变量",
+  "traditionalReadOnlyMode": "不生效，仅警告未报错",
+  "constraintReadOnlyMode": "将报错，运行失败",
+
+  "variableValueTooLong": "变量值超长",
+  "traditionalValueTooLongMode": "仅警告未报错",
+
+  "variableNotFound": "变量不存在",
+  "traditionalNotFoundMode": "未报错，继续执行，依赖执行逻辑自行检查",
+
+  "variableStandard": "变量 ID 规范",
+  "traditionalStandardMode": "未限制",
+  "constraintStandardMode": "不支持中文 ID，减少不同构建环境下的兼容问题"
 }
\ No newline at end of file

From e00b1b7152beb4364c8f0fecf1b1082f8ae2fdd1 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 20 Aug 2024 14:19:10 +0800
Subject: [PATCH 02/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2015875?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pipelineSetting/BaseInfo.vue   | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
index 059368feef3..2d97e78974d 100755
--- a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
+++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
@@ -125,16 +125,6 @@
                 })
             }
         },
-        watch: {
-            pipelineSetting: {
-                handler (newVal) {
-                    if (newVal) {
-                        this.initializePipelineAsCodeSettings(newVal.pipelineAsCodeSettings)
-                    }
-                }
-
-            }
-        },
         created () {
             this.requestGrouptLists()
             this.requestPipelineDialect()
@@ -181,12 +171,19 @@
                 }
             },
             async requestPipelineDialect () {
-                try {
-                    const { data } = await this.getPipelineDialect(this.projectId)
-                    this.currentPipelineDialect = data
-                    this.settings.pipelineDialect = data
-                } catch (err) {
-                    console.log(err)
+                this.initializePipelineAsCodeSettings(this.pipelineSetting.pipelineAsCodeSettings)
+
+                const isInherited = this.pipelineSetting.pipelineAsCodeSettings.inheritedDialect
+                if (isInherited) {
+                    try {
+                        const { data } = await this.getPipelineDialect(this.projectId)
+                        this.currentPipelineDialect = data
+                        this.settings.pipelineDialect = data
+                    } catch (err) {
+                        console.log(err)
+                    }
+                } else {
+                    this.currentPipelineDialect = this.pipelineSetting.pipelineAsCodeSettings.pipelineDialect
                 }
             },
             inheritedChange (value) {

From ad1c1ea6239a750db09282d71c4a5697c61fbf8d Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 23 Aug 2024 09:56:30 +0800
Subject: [PATCH 03/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2016284?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PipelineHeader/EditHeader.vue  |  8 ---
 .../components/pipelineSetting/BaseInfo.vue   | 56 +++++++------------
 2 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue b/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue
index 45bdac97245..e63499d3085 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue
@@ -191,9 +191,6 @@
                 'setSaveStatus',
                 'updateContainer'
             ]),
-            ...mapActions('pipelines', [
-                'getPipelineDialect'
-            ]),
             async exec (debug) {
                 if (debug && this.isEditing) {
                     const result = await this.saveDraft()
@@ -245,11 +242,6 @@
                     // 清除流水线参数渲染过程中添加的key
                     this.formatParams(pipeline)
 
-                    if (!pipelineSetting.pipelineAsCodeSettings.pipelineDialect) {
-                        const { data } = await this.getPipelineDialect(this.projectId)
-                        pipelineSetting.pipelineAsCodeSettings.pipelineDialect = data
-                    }
-
                     // 请求执行构建
                     const { data: { version, versionName } } = await this.saveDraftPipeline({
                         projectId,
diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
index 2d97e78974d..0768ecdacd1 100755
--- a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
+++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
@@ -75,7 +75,7 @@
     import VuexInput from '@/components/atomFormField/VuexInput/index.vue'
     import VuexTextarea from '@/components/atomFormField/VuexTextarea/index.vue'
     import SyntaxStyleConfiguration from '@/components/syntaxStyleConfiguration'
-    import { mapGetters, mapActions } from 'vuex'
+    import { mapGetters } from 'vuex'
 
     export default {
         name: 'bkdevops-base-info-setting-tab',
@@ -94,11 +94,7 @@
         },
         data () {
             return {
-                settings: {
-                    enable: null,
-                    inheritedDialect: true,
-                    pipelineDialect: ''
-                },
+                settings: {},
                 currentPipelineDialect: ''
             }
         },
@@ -125,14 +121,25 @@
                 })
             }
         },
+        watch: {
+            'pipelineSetting.pipelineAsCodeSettings': {
+                handler (val) {
+                    if (val && !this.currentPipelineDialect) {
+                        const { inheritedDialect, projectDialect, pipelineDialect } = this.pipelineSetting.pipelineAsCodeSettings
+                        this.currentPipelineDialect = inheritedDialect ? projectDialect : pipelineDialect
+                        this.settings = {
+                            ...this.pipelineSetting.pipelineAsCodeSettings,
+                            pipelineDialect: this.currentPipelineDialect
+                        }
+                    }
+                },
+                immediate: true
+            }
+        },
         created () {
             this.requestGrouptLists()
-            this.requestPipelineDialect()
         },
         methods: {
-            ...mapActions('pipelines', [
-                'getPipelineDialect'
-            ]),
             /** *
              * 获取标签及其分组
              */
@@ -162,35 +169,12 @@
                 const url = `${WEB_URL_PREFIX}/pipeline/${this.projectId}/list/group`
                 window.open(url, '_blank')
             },
-            initializePipelineAsCodeSettings (settings) {
-                const { enable, inheritedDialect } = settings
+            inheritedChange (value) {
                 this.settings = {
                     ...this.settings,
-                    enable,
-                    inheritedDialect
-                }
-            },
-            async requestPipelineDialect () {
-                this.initializePipelineAsCodeSettings(this.pipelineSetting.pipelineAsCodeSettings)
-
-                const isInherited = this.pipelineSetting.pipelineAsCodeSettings.inheritedDialect
-                if (isInherited) {
-                    try {
-                        const { data } = await this.getPipelineDialect(this.projectId)
-                        this.currentPipelineDialect = data
-                        this.settings.pipelineDialect = data
-                    } catch (err) {
-                        console.log(err)
-                    }
-                } else {
-                    this.currentPipelineDialect = this.pipelineSetting.pipelineAsCodeSettings.pipelineDialect
-                }
-            },
-            inheritedChange (value) {
-                if (value) {
-                    this.settings.pipelineDialect = this.currentPipelineDialect
+                    inheritedDialect: value,
+                    ...value && { pipelineDialect: this.currentPipelineDialect }
                 }
-                this.settings.inheritedDialect = value
                 this.handleBaseInfoChange('pipelineAsCodeSettings', this.settings)
             },
             pipelineDialectChange (value) {

From c486ff59d55131b60a52fa8495f3cec8b5fea8a8 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 23 Aug 2024 15:15:55 +0800
Subject: [PATCH 04/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2016330?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialectPopoverTable.vue       |  2 +-
 .../src/components/project-form.vue              | 16 ++++++++--------
 .../src/views/manage/project/show-project.vue    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index 59efacebf2e..80b4fff9789 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -4,6 +4,7 @@
     :width="900"
     :placement="placement"
     extCls="dialect-popover"
+    :componentEventDelay="300"
   >
     <label class="label">{{ t('变量语法风格') }}</label>
     <template #content>
@@ -117,5 +118,4 @@ const namingConventionData = [
     overflow: hidden;
   }
 }
-  
 </style>
\ No newline at end of file
diff --git a/src/frontend/devops-manage/src/components/project-form.vue b/src/frontend/devops-manage/src/components/project-form.vue
index 5cf22e15728..4879b37cda4 100644
--- a/src/frontend/devops-manage/src/components/project-form.vue
+++ b/src/frontend/devops-manage/src/components/project-form.vue
@@ -14,7 +14,7 @@ import IAMIframe from './IAM-Iframe';
 import { useI18n } from 'vue-i18n';
 import { Message, Popover } from 'bkui-vue';
 import http from '@/http/api';
-import DialectPopoverTable from "@/components/dialectPopoverTable";
+import DialectPopoverTable from "@/components/dialectPopoverTable.vue";
 const {
   t,
 } = useI18n();
@@ -472,13 +472,13 @@ onBeforeUnmount(() => {
     <bk-form-item
       property="pipelineDialect"
     >
-    <template #label>
-      <dialect-popover-table />
-    </template>
-    <bk-radio-group
-      v-model="projectData.pipelineDialect"
-      @change="handleChangeForm"
-    >
+      <template #label>
+        <dialect-popover-table />
+      </template>
+      <bk-radio-group
+        v-model="projectData.pipelineDialect"
+        @change="handleChangeForm"
+      >
         <bk-radio label="CLASSIC">
           <span>{{ t('传统风格') }}</span>
         </bk-radio>
diff --git a/src/frontend/devops-manage/src/views/manage/project/show-project.vue b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
index 68c3814aa3b..74edc781420 100644
--- a/src/frontend/devops-manage/src/views/manage/project/show-project.vue
+++ b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
@@ -23,7 +23,7 @@ import {
   RESOURCE_ACTION,
   RESOURCE_TYPE,
 } from '@/utils/permission.js'
-import DialectPopoverTable from "@/components/dialectPopoverTable";
+import DialectPopoverTable from "@/components/dialectPopoverTable.vue";
 
 const { t } = useI18n();
 const router = useRouter();
@@ -421,7 +421,7 @@ onMounted(async () => {
                 </bk-form-item>
                 <bk-form-item property="pipelineDialect">
                   <template #label>
-                    <dialect-popover-table :placement="'bottom-end'"/>
+                    <dialect-popover-table :placement="'bottom-start'"/>
                   </template>
                   <div>
                     <span>{{ pipelineDialectMap[projectData.pipelineDialect] }}</span>

From ab39a3ee96e1b73a7e86af1f5255095aebe0eac2 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 26 Aug 2024 09:57:49 +0800
Subject: [PATCH 05/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2016388?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialectPopoverTable.vue    |  8 +----
 .../src/views/manage/project/show-project.vue |  2 +-
 .../PipelineDetailTabs/BaseConfig.vue         | 30 +++++++++++++++----
 src/frontend/locale/pipeline/en-US.json       |  2 ++
 src/frontend/locale/pipeline/zh-CN.json       |  2 ++
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index 80b4fff9789..f3ad219c05a 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -2,9 +2,9 @@
   <bk-popover
     theme="light"
     :width="900"
-    :placement="placement"
     extCls="dialect-popover"
     :componentEventDelay="300"
+    autoPlacement
   >
     <label class="label">{{ t('变量语法风格') }}</label>
     <template #content>
@@ -45,12 +45,6 @@
 <script setup name="DialectPopoverTable">
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
-defineProps({
-  placement: {
-    type: String,
-    default: 'top-start'
-  }
-})
 const namingConventionData = [
     {
         difference: t('表达式格式'),
diff --git a/src/frontend/devops-manage/src/views/manage/project/show-project.vue b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
index 74edc781420..ce429594e3e 100644
--- a/src/frontend/devops-manage/src/views/manage/project/show-project.vue
+++ b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
@@ -421,7 +421,7 @@ onMounted(async () => {
                 </bk-form-item>
                 <bk-form-item property="pipelineDialect">
                   <template #label>
-                    <dialect-popover-table :placement="'bottom-start'"/>
+                    <dialect-popover-table />
                   </template>
                   <div>
                     <span>{{ pipelineDialectMap[projectData.pipelineDialect] }}</span>
diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
index 0c552a636e4..b9b8f11be11 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
@@ -35,6 +35,10 @@
                                     --
                                 </template>
                             </template>
+                            <template v-else-if="['namingConvention', 'modificationDetail', 'creatorDetail'].includes(row.key)">
+                                <span>{{ row.value || '--' }}</span>
+                                <span class="base-info-block-row-value-gray">{{ row.grayDesc }}</span>
+                            </template>
                             <template v-else>
                                 {{ row.value || '--' }}
                             </template>
@@ -56,7 +60,11 @@
         },
         data () {
             return {
-                activeName: ['baseInfo', 'executeConfig']
+                activeName: ['baseInfo', 'executeConfig'],
+                namingStyle: {
+                    CLASSIC: this.$t('traditionalStyle'),
+                    CONSTRAINED: this.$t('constraintStyle')
+                }
             }
         },
         computed: {
@@ -71,6 +79,8 @@
             },
             baseInfoRows () {
                 const { basicInfo } = this
+                const { inheritedDialect, projectDialect, pipelineDialect } = basicInfo?.pipelineAsCodeSettings
+                const namingConvention = inheritedDialect ? this.namingStyle[projectDialect] : this.namingStyle[pipelineDialect]
                 return [
                     {
                         key: 'pipelineName',
@@ -89,12 +99,19 @@
                         value: basicInfo?.desc ?? '--'
                     },
                     {
-                        key: 'creator',
-                        value: basicInfo?.creator ?? '--'
+                        key: 'namingConvention',
+                        value: namingConvention ?? '--',
+                        grayDesc: ` ( ${this.$t('inheritedProject')} )`
+                    },
+                    {
+                        key: 'modificationDetail',
+                        value: basicInfo?.creator ?? '--',
+                        grayDesc: ` | ${convertTime(basicInfo?.updateTime)}`
                     },
                     {
-                        key: 'createTime',
-                        value: convertTime(basicInfo?.createTime) ?? '--'
+                        key: 'creatorDetail',
+                        value: basicInfo?.creator ?? '--',
+                        grayDesc: ` | ${convertTime(basicInfo?.createTime)}`
                     }
                 ]
             },
@@ -209,4 +226,7 @@
     }
 
 }
+.base-info-block-row-value-gray {
+    color: #979BA5;
+}
 </style>
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index 390c7cae755..d350ffbd733 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -56,6 +56,8 @@
   "success": "Success",
   "creator": "Creator",
   "created": "Created on",
+  "creatorDetail": "Creator/Time",
+  "modificationDetail": "Modifier/Time",
   "editSuc": "Edited successfully",
   "saveSuc": "Saved successfully",
   "releaseSuc": "Released successfully",
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index 919c38c952f..c38d0aaca53 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -56,6 +56,8 @@
   "success": "成功",
   "creator": "创建人",
   "created": "创建时间",
+  "creatorDetail": "创建人/时间",
+  "modificationDetail": "修改人/时间",
   "editSuc": "编辑成功",
   "saveSuc": "保存成功",
   "releaseSuc": "发布成功",

From b9cae051ded97e272cc14f89a14e55e2f801090a Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 27 Aug 2024 10:35:12 +0800
Subject: [PATCH 06/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2016545?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/PipelineDetailTabs/BaseConfig.vue         | 4 ++--
 .../devops-pipeline/src/store/modules/atom/actions.js        | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
index b9b8f11be11..abe43796f50 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
@@ -105,8 +105,8 @@
                     },
                     {
                         key: 'modificationDetail',
-                        value: basicInfo?.creator ?? '--',
-                        grayDesc: ` | ${convertTime(basicInfo?.updateTime)}`
+                        value: basicInfo?.versionUpdater ?? '--',
+                        grayDesc: ` | ${convertTime(basicInfo?.versionUpdateTime)}`
                     },
                     {
                         key: 'creatorDetail',
diff --git a/src/frontend/devops-pipeline/src/store/modules/atom/actions.js b/src/frontend/devops-pipeline/src/store/modules/atom/actions.js
index c5bb8702eeb..a411e6275bc 100755
--- a/src/frontend/devops-pipeline/src/store/modules/atom/actions.js
+++ b/src/frontend/devops-pipeline/src/store/modules/atom/actions.js
@@ -217,7 +217,10 @@ export default {
                 })
             }
 
-            commit(PIPELINE_SETTING_MUTATION, setting)
+            commit(PIPELINE_SETTING_MUTATION, Object.assign(setting, {
+                versionUpdater: pipelineRes.data.updater,
+                versionUpdateTime: pipelineRes.data.updateTime
+            }))
             if (!pipelineRes.data.yamlSupported) {
                 rootCommit(commit, UPDATE_PIPELINE_MODE, UI_MODE)
             }

From f74d2fe1b9d11cf90274d4b2d37aecbe3640882c Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 28 Aug 2024 16:05:54 +0800
Subject: [PATCH 07/26] Merge branch 'master' of
 https://github.com/TencentBlueKing/bk-ci into issue_10576 # Reviewed,
 transaction id: 16722


From a1100630c48d05aab9606c4c66ea27b13471c69c Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Thu, 29 Aug 2024 18:01:24 +0800
Subject: [PATCH 08/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2016875?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialectPopoverTable.vue    | 40 +++++++++----------
 .../PipelineDetailTabs/BaseConfig.vue         |  2 +-
 .../components/syntaxStyleConfiguration.vue   | 36 ++++++++---------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index f3ad219c05a..ae3a90e9e3a 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -11,28 +11,28 @@
       <h3 class="title">{{ t('语法差异') }}</h3>
       <bk-table :data="namingConventionData" show-overflow-tooltip>
         <bk-table-column :label="$t('差异项')" prop="difference" :width="140" />
-        <bk-table-column :label="$t('传统风格')" prop="classIc" :width="290">
+        <bk-table-column :label="$t('传统风格')" prop="classic" :width="290">
           <template #default="{ row }">
             <div
               class="label-column"
               v-bk-tooltips="{
-                content: row.classIcExample ? `${row.classIc};  ${row.classIcExample}` : row.classIc
+                content: row.classIcExample ? `${row.classic};  ${row.classIcExample}` : row.classic
               }"
             >
-              <p>{{ row.classIc }}</p>
+              <p>{{ row.classic }}</p>
               <p>{{ row.classIcExample }}</p>
             </div>
           </template>
         </bk-table-column>
-        <bk-table-column :label="$t('制约风格')" prop="constrained">
+        <bk-table-column :label="$t('制约风格')" prop="constrainedMode">
           <template #default="{ row }">
             <div
               class="label-column"
               v-bk-tooltips="{
-                content: row.constrainedExample ? `${row.constrained};  ${row.constrainedExample}` : row.constrained
+                content: row.constrainedExample ? `${row.constrainedMode};  ${row.constrainedExample}` : row.constrainedMode
               }"
             >
-              <p>{{ row.constrained }}</p>
+              <p>{{ row.constrainedMode }}</p>
               <p>{{ row.constrainedExample }}</p>
             </div>
           </template>
@@ -48,41 +48,41 @@ const { t } = useI18n();
 const namingConventionData = [
     {
         difference: t('表达式格式'),
-        classIc: t('单花括号或双花括号'),
+        classic: t('单花括号或双花括号'),
         classIcExample: t('如：${var}、${{var}}'),
-        constrained: t('仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题'),
+        constrainedMode: t('仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题'),
         constrainedExample: t('如：${{variables.var}}'),
     },
     {
         difference: t('引用方式'),
-        classIc: t('直接引用变量名或上下文方式引用'),
-        constrained: t('仅支持上下文方式引用'),
+        classic: t('直接引用变量名或上下文方式引用'),
+        constrainedMode: t('仅支持上下文方式引用'),
         constrainedExample: t('如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}'),
     },
     {
         difference: t('环境变量'),
-        classIc: t('流水线变量、插件输出变量会自动设置为环境变量'),
-        constrained: t('需要时通过在 Job/Step 上按需指定，降低环境污染风险'),
+        classic: t('流水线变量、插件输出变量会自动设置为环境变量'),
+        constrainedMode: t('需要时通过在 Job/Step 上按需指定，降低环境污染风险'),
     },
     {
         difference: t('重置内置只读变量'),
-        classIc: t('不生效，仅警告未报错'),
-        constrained: t('将报错，运行失败'),
+        classic: t('不生效，仅警告未报错'),
+        constrainedMode: t('将报错，运行失败'),
     },
     {
         difference: t('变量值超长'),
-        classIc: t('仅警告未报错'),
-        constrained: t('将报错，运行失败'),
+        classic: t('仅警告未报错'),
+        constrainedMode: t('将报错，运行失败'),
     },
     {
         difference: t('变量不存在'),
-        classIc: t('未报错，继续执行，依赖执行逻辑自行检查'),
-        constrained: t('将报错，运行失败'),
+        classic: t('未报错，继续执行，依赖执行逻辑自行检查'),
+        constrainedMode: t('将报错，运行失败'),
     },
     {
         difference: t('变量 ID 规范'),
-        classIc: t('未限制'),
-        constrained: t('不支持中文 ID，减少不同构建环境下的兼容问题'),
+        classic: t('未限制'),
+        constrainedMode: t('不支持中文 ID，减少不同构建环境下的兼容问题'),
     }
 ]
 </script>
diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
index abe43796f50..99d6202aaa6 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
@@ -79,7 +79,7 @@
             },
             baseInfoRows () {
                 const { basicInfo } = this
-                const { inheritedDialect, projectDialect, pipelineDialect } = basicInfo?.pipelineAsCodeSettings
+                const { inheritedDialect, projectDialect, pipelineDialect } = basicInfo?.pipelineAsCodeSettings ?? {}
                 const namingConvention = inheritedDialect ? this.namingStyle[projectDialect] : this.namingStyle[pipelineDialect]
                 return [
                     {
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index fa2c2f12139..329d24b4e15 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -11,18 +11,18 @@
                     show-overflow-tooltip
                 >
                     <bk-table-column :label="$t('differenceItem')" prop="difference" :width="140" />
-                    <bk-table-column :label="$t('traditionalStyle')" prop="classIc" :width="290">
+                    <bk-table-column :label="$t('traditionalStyle')" prop="classic" :width="290">
                         <template slot-scope="props">
                             <div class="label-column">
-                                <p>{{ props.row.classIc }}</p>
+                                <p>{{ props.row.classic }}</p>
                                 <p>{{ props.row.classIcExample }}</p>
                             </div>
                         </template>
                     </bk-table-column>
-                    <bk-table-column :label="$t('constraintStyle')" prop="constrained">
+                    <bk-table-column :label="$t('constraintStyle')" prop="constrainedMode">
                         <template slot-scope="props">
                             <div class="label-column">
-                                <p>{{ props.row.constrained }}</p>
+                                <p>{{ props.row.constrainedMode }}</p>
                                 <p>{{ props.row.constrainedExample }}</p>
                             </div>
                         </template>
@@ -65,41 +65,41 @@
                 return [
                     {
                         difference: this.$t('expressionFormat'),
-                        classIc: this.$t('traditionalFormat'),
+                        classic: this.$t('traditionalFormat'),
                         classIcExample: this.$t('traditionalFormatExample'),
-                        constrained: this.$t('constraintFormat'),
+                        constrainedMode: this.$t('constraintFormat'),
                         constrainedExample: this.$t('constraintFormatExample')
                     },
                     {
                         difference: this.$t('quoteMode'),
-                        classIc: this.$t('traditionalQuoteMode'),
-                        constrained: this.$t('constraintQuoteMode'),
+                        classic: this.$t('traditionalQuoteMode'),
+                        constrainedMode: this.$t('constraintQuoteMode'),
                         constrainedExample: this.$t('constraintQuoteModeExample')
                     },
                     {
                         difference: this.$t('environmentVariable'),
-                        classIc: this.$t('traditionalEnvironmentVariableMode'),
-                        constrained: this.$t('constraintEnvironmentVariableMode')
+                        classic: this.$t('traditionalEnvironmentVariableMode'),
+                        constrainedMode: this.$t('constraintEnvironmentVariableMode')
                     },
                     {
                         difference: this.$t('readOnlyVariable'),
-                        classIc: this.$t('traditionalReadOnlyMode'),
-                        constrained: this.$t('constraintReadOnlyMode')
+                        classic: this.$t('traditionalReadOnlyMode'),
+                        constrainedMode: this.$t('constraintReadOnlyMode')
                     },
                     {
                         difference: this.$t('variableValueTooLong'),
-                        classIc: this.$t('traditionalValueTooLongMode'),
-                        constrained: this.$t('constraintReadOnlyMode')
+                        classic: this.$t('traditionalValueTooLongMode'),
+                        constrainedMode: this.$t('constraintReadOnlyMode')
                     },
                     {
                         difference: this.$t('variableNotFound'),
-                        classIc: this.$t('traditionalNotFoundMode'),
-                        constrained: this.$t('constraintReadOnlyMode')
+                        classic: this.$t('traditionalNotFoundMode'),
+                        constrainedMode: this.$t('constraintReadOnlyMode')
                     },
                     {
                         difference: this.$t('variableStandard'),
-                        classIc: this.$t('traditionalStandardMode'),
-                        constrained: this.$t('constraintStandardMode')
+                        classic: this.$t('traditionalStandardMode'),
+                        constrainedMode: this.$t('constraintStandardMode')
                     }
                 ]
             },

From 84544c9471c6ac55381588bcd232dc250ef9caa9 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 30 Aug 2024 17:57:54 +0800
Subject: [PATCH 09/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2016998?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialectPopoverTable.vue             | 10 ----------
 .../src/components/syntaxStyleConfiguration.vue        | 10 ----------
 src/frontend/locale/manage/en-US.json                  |  8 --------
 src/frontend/locale/manage/zh-CN.json                  |  8 --------
 src/frontend/locale/pipeline/en-US.json                |  8 --------
 src/frontend/locale/pipeline/zh-CN.json                |  8 --------
 6 files changed, 52 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index ae3a90e9e3a..9e533d1afb5 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -59,16 +59,6 @@ const namingConventionData = [
         constrainedMode: t('仅支持上下文方式引用'),
         constrainedExample: t('如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}'),
     },
-    {
-        difference: t('环境变量'),
-        classic: t('流水线变量、插件输出变量会自动设置为环境变量'),
-        constrainedMode: t('需要时通过在 Job/Step 上按需指定，降低环境污染风险'),
-    },
-    {
-        difference: t('重置内置只读变量'),
-        classic: t('不生效，仅警告未报错'),
-        constrainedMode: t('将报错，运行失败'),
-    },
     {
         difference: t('变量值超长'),
         classic: t('仅警告未报错'),
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index 329d24b4e15..19d28b6fd23 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -76,16 +76,6 @@
                         constrainedMode: this.$t('constraintQuoteMode'),
                         constrainedExample: this.$t('constraintQuoteModeExample')
                     },
-                    {
-                        difference: this.$t('environmentVariable'),
-                        classic: this.$t('traditionalEnvironmentVariableMode'),
-                        constrainedMode: this.$t('constraintEnvironmentVariableMode')
-                    },
-                    {
-                        difference: this.$t('readOnlyVariable'),
-                        classic: this.$t('traditionalReadOnlyMode'),
-                        constrainedMode: this.$t('constraintReadOnlyMode')
-                    },
                     {
                         difference: this.$t('variableValueTooLong'),
                         classic: this.$t('traditionalValueTooLongMode'),
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 16617120a98..e5e70a38ffc 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -157,14 +157,6 @@
     "仅支持上下文方式引用": "Only Contextual Reference Supported",
     "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}": "e.g., {'${{ci.pipeline_id}}'}、{'${{variables.a}}'}、{'${{steps.get_code.outputs.a}}'}",
 
-    "环境变量": "Environment Variable",
-    "流水线变量、插件输出变量会自动设置为环境变量": "Pipeline Variables and Plugin Output Variables are Automatically Set as Environment Variables",
-    "需要时通过在 Job/Step 上按需指定，降低环境污染风险": "Specify as Needed in Job/Step to Reduce Environment Pollution Risk",
-
-    "重置内置只读变量": "Reset Built-in Read-Only Variables",
-    "不生效，仅警告未报错": "Not Effective, Only Warning without Error",
-    "将报错，运行失败": "Will Cause Error and Run Failure",
-
     "变量值超长": "Variable Value Too Long",
     "仅警告未报错": "Only Warning without Error",
 
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index abb4d0aa36e..23137a9b0bf 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -158,14 +158,6 @@
     "仅支持上下文方式引用": "仅支持上下文方式引用",
     "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}": "如：{'${{ci.pipeline_id}}'}、{'${{variables.a}}'}、{'${{steps.get_code.outputs.a}}'}",
 
-    "环境变量": "环境变量",
-    "流水线变量、插件输出变量会自动设置为环境变量": "流水线变量、插件输出变量会自动设置为环境变量",
-    "需要时通过在 Job/Step 上按需指定，降低环境污染风险": "需要时通过在 Job/Step 上按需指定，降低环境污染风险",
-
-    "重置内置只读变量": "重置内置只读变量",
-    "不生效，仅警告未报错": "不生效，仅警告未报错",
-    "将报错，运行失败": "将报错，运行失败",
-
     "变量值超长": "变量值超长",
     "仅警告未报错": "仅警告未报错",
 
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index 8ad47269dd1..9fefd7f3f8a 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -1595,14 +1595,6 @@
   "constraintQuoteMode": "Only Contextual Reference Supported",
   "constraintQuoteModeExample": "e.g., ${{ci.pipeline_id}}, ${{variables.a}}, ${{steps.get_code.outputs.a}}",
 
-  "environmentVariable": "Environment Variable",
-  "traditionalEnvironmentVariableMode": "Pipeline Variables and Plugin Output Variables are Automatically Set as Environment Variables",
-  "constraintEnvironmentVariableMode": "Specify as Needed in Job/Step to Reduce Environment Pollution Risk",
-
-  "readOnlyVariable": "Reset Built-in Read-Only Variables",
-  "traditionalReadOnlyMode": "Not Effective, Only Warning without Error",
-  "constraintReadOnlyMode": "Will Cause Error and Run Failure",
-
   "variableValueTooLong": "Variable Value Too Long",
   "traditionalValueTooLongMode": "Only Warning without Error",
 
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index d51cd629847..03ca8afa63e 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -1596,14 +1596,6 @@
   "constraintQuoteMode": "仅支持上下文方式引用",
   "constraintQuoteModeExample": "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}",
 
-  "environmentVariable": "环境变量",
-  "traditionalEnvironmentVariableMode": "流水线变量、插件输出变量会自动设置为环境变量",
-  "constraintEnvironmentVariableMode": "需要时通过在 Job/Step 上按需指定，降低环境污染风险",
-
-  "readOnlyVariable": "重置内置只读变量",
-  "traditionalReadOnlyMode": "不生效，仅警告未报错",
-  "constraintReadOnlyMode": "将报错，运行失败",
-
   "variableValueTooLong": "变量值超长",
   "traditionalValueTooLongMode": "仅警告未报错",
 

From cb4449884e1ca74e8f77f4fd82b55a9899b1d6e9 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 9 Sep 2024 16:19:37 +0800
Subject: [PATCH 10/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC#10576=20#=20Reviewed,=20transaction?=
 =?UTF-8?q?=20id:=2017780?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/PipelineDetailTabs/BaseConfig.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
index 99d6202aaa6..85f34929015 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
@@ -101,7 +101,7 @@
                     {
                         key: 'namingConvention',
                         value: namingConvention ?? '--',
-                        grayDesc: ` ( ${this.$t('inheritedProject')} )`
+                        grayDesc: inheritedDialect ? ` ( ${this.$t('inheritedProject')} )` : ''
                     },
                     {
                         key: 'modificationDetail',

From 213ab2991316c033048d1471ccbb928354daabff Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 9 Sep 2024 16:27:39 +0800
Subject: [PATCH 11/26] Merge branch 'master' of
 https://github.com/TencentBlueKing/bk-ci into issue_10576 # Reviewed,
 transaction id: 17783


From 636cb150fbcc81e2725f2621a175e3408b031a1a Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 9 Sep 2024 16:45:17 +0800
Subject: [PATCH 12/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC#10576=20#=20Reviewed,=20transaction?=
 =?UTF-8?q?=20id:=2017790?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-manage/src/components/dialectPopoverTable.vue    | 6 ------
 .../src/components/syntaxStyleConfiguration.vue             | 6 ------
 src/frontend/locale/manage/en-US.json                       | 5 -----
 src/frontend/locale/manage/zh-CN.json                       | 5 -----
 src/frontend/locale/pipeline/en-US.json                     | 5 -----
 src/frontend/locale/pipeline/zh-CN.json                     | 5 -----
 6 files changed, 32 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index 9e533d1afb5..3d5c3c00bda 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -53,12 +53,6 @@ const namingConventionData = [
         constrainedMode: t('仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题'),
         constrainedExample: t('如：${{variables.var}}'),
     },
-    {
-        difference: t('引用方式'),
-        classic: t('直接引用变量名或上下文方式引用'),
-        constrainedMode: t('仅支持上下文方式引用'),
-        constrainedExample: t('如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}'),
-    },
     {
         difference: t('变量值超长'),
         classic: t('仅警告未报错'),
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index 19d28b6fd23..7b1610c36c1 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -70,12 +70,6 @@
                         constrainedMode: this.$t('constraintFormat'),
                         constrainedExample: this.$t('constraintFormatExample')
                     },
-                    {
-                        difference: this.$t('quoteMode'),
-                        classic: this.$t('traditionalQuoteMode'),
-                        constrainedMode: this.$t('constraintQuoteMode'),
-                        constrainedExample: this.$t('constraintQuoteModeExample')
-                    },
                     {
                         difference: this.$t('variableValueTooLong'),
                         classic: this.$t('traditionalValueTooLongMode'),
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 522b3880a03..6887a63f9f1 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -152,11 +152,6 @@
     "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
     "如：${{variables.var}}": "e.g., {'${{variables.var}}'}",
 
-    "引用方式": "Quote Mode",
-    "直接引用变量名或上下文方式引用": "Direct Variable Name or Contextual Reference",
-    "仅支持上下文方式引用": "Only Contextual Reference Supported",
-    "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}": "e.g., {'${{ci.pipeline_id}}'}、{'${{variables.a}}'}、{'${{steps.get_code.outputs.a}}'}",
-
     "变量值超长": "Variable Value Too Long",
     "仅警告未报错": "Only Warning without Error",
 
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 0a1b2229190..581c86ace31 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -153,11 +153,6 @@
     "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
     "如：${{variables.var}}":"如：{'${{variables.var}}'}",
 
-    "引用方式": "引用方式",
-    "直接引用变量名或上下文方式引用": "直接引用变量名或上下文方式引用",
-    "仅支持上下文方式引用": "仅支持上下文方式引用",
-    "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}": "如：{'${{ci.pipeline_id}}'}、{'${{variables.a}}'}、{'${{steps.get_code.outputs.a}}'}",
-
     "变量值超长": "变量值超长",
     "仅警告未报错": "仅警告未报错",
 
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index 50447e9c9c8..c5eac7695d6 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -1592,11 +1592,6 @@
   "constraintFormat": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
   "constraintFormatExample": "e.g., ${{variables.var}}",
 
-  "quoteMode": "Quote Mode",
-  "traditionalQuoteMode": "Direct Variable Name or Contextual Reference",
-  "constraintQuoteMode": "Only Contextual Reference Supported",
-  "constraintQuoteModeExample": "e.g., ${{ci.pipeline_id}}, ${{variables.a}}, ${{steps.get_code.outputs.a}}",
-
   "variableValueTooLong": "Variable Value Too Long",
   "traditionalValueTooLongMode": "Only Warning without Error",
 
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index 5f3b6400faf..6efbe81516d 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -1593,11 +1593,6 @@
   "constraintFormat": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
   "constraintFormatExample": "如：${{variables.var}}",
 
-  "quoteMode": "引用方式",
-  "traditionalQuoteMode": "直接引用变量名或上下文方式引用",
-  "constraintQuoteMode": "仅支持上下文方式引用",
-  "constraintQuoteModeExample": "如：${{ci.pipeline_id}}、${{variables.a}}、${{steps.get_code.outputs.a}}",
-
   "variableValueTooLong": "变量值超长",
   "traditionalValueTooLongMode": "仅警告未报错",
 

From 669a346bbdeaac003266dfd0e48662433a8897a6 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 18 Sep 2024 10:42:48 +0800
Subject: [PATCH 13/26] Merge branch 'master' of
 https://github.com/TencentBlueKing/bk-ci into issue_10576 # Reviewed,
 transaction id: 18626


From 4ad3020eb46fc5cbdcf9d9f466b02e44abe16e3e Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 18 Sep 2024 10:54:33 +0800
Subject: [PATCH 14/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2018627?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/syntaxStyleConfiguration.vue   | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index 7b1610c36c1..53cc5b5f7e5 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -1,7 +1,11 @@
 <template>
     <div>
-        <bk-popover theme="light" :width="892" placement="top-start">
-            <label class="label">{{$t('namingConvention')}}</label>
+        <bk-popover
+            theme="light"
+            :width="892"
+            placement="top-start"
+        >
+            <label class="label">{{ $t('namingConvention') }}</label>
             <div slot="content">
                 <h3>{{ $t('grammaticalDifferences') }}</h3>
                 <bk-table
@@ -10,8 +14,16 @@
                     row-auto-height
                     show-overflow-tooltip
                 >
-                    <bk-table-column :label="$t('differenceItem')" prop="difference" :width="140" />
-                    <bk-table-column :label="$t('traditionalStyle')" prop="classic" :width="290">
+                    <bk-table-column
+                        :label="$t('differenceItem')"
+                        prop="difference"
+                        :width="140"
+                    />
+                    <bk-table-column
+                        :label="$t('traditionalStyle')"
+                        prop="classic"
+                        :width="290"
+                    >
                         <template slot-scope="props">
                             <div class="label-column">
                                 <p>{{ props.row.classic }}</p>
@@ -19,7 +31,10 @@
                             </div>
                         </template>
                     </bk-table-column>
-                    <bk-table-column :label="$t('constraintStyle')" prop="constrainedMode">
+                    <bk-table-column
+                        :label="$t('constraintStyle')"
+                        prop="constrainedMode"
+                    >
                         <template slot-scope="props">
                             <div class="label-column">
                                 <p>{{ props.row.constrainedMode }}</p>
@@ -42,10 +57,16 @@
             v-model="pipelineDialect"
             @change="pipelineDialectChange"
         >
-            <bk-radio :value="'CLASSIC'" :disabled="isDialectDisabled">
+            <bk-radio
+                :value="'CLASSIC'"
+                :disabled="isDialectDisabled"
+            >
                 <span class="radio-label">{{ $t('traditionalStyle') }}</span>
             </bk-radio>
-            <bk-radio :value="'CONSTRAINED'" :disabled="isDialectDisabled">
+            <bk-radio
+                :value="'CONSTRAINED'"
+                :disabled="isDialectDisabled"
+            >
                 <span class="radio-label">{{ $t('constraintStyle') }}</span>
             </bk-radio>
         </bk-radio-group>

From 85aa48047c63d0acab183d27b17de8f697b5795b Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 23 Sep 2024 17:46:33 +0800
Subject: [PATCH 15/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/locale/manage/en-US.json | 53 ++++++++++++++-----------
 src/frontend/locale/manage/zh-CN.json | 57 ++++++++++++++-------------
 2 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 9f550b79843..9b0ba14edf6 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -139,28 +139,6 @@
     "项目类型": "Project Type",
     "创建项目申请单已撤回": "Creation of project application has been withdrawn",
     "全员": "EveryOne",
-    "变量语法风格": "Naming Convention",
-    "继承项目设置": "Inherited Project Settings",
-    "传统风格": "Traditional Style",
-    "制约风格": "Constraint Style",
-    "语法差异": "Grammatical Differences",
-    "差异项": "Difference Item",
-
-    "表达式格式": "Expression Format",
-    "单花括号或双花括号": "Single or Double Curly Braces",
-    "如：${var}、${{var}}": "e.g., {'${var}'}、{'${{var}}'}",
-    "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
-    "如：${{variables.var}}": "e.g., {'${{variables.var}}'}",
-
-    "变量值超长": "Variable Value Too Long",
-    "仅警告未报错": "Only Warning without Error",
-
-    "变量不存在": "Variable Not Found",
-    "未报错，继续执行，依赖执行逻辑自行检查": "No Error, Continue Execution, Check Execution Logic as Needed",
-
-    "变量 ID 规范": "Variable ID Standard",
-    "未限制": "No Restriction",
-    "不支持中文 ID，减少不同构建环境下的兼容问题": "Chinese IDs Not Supported to Reduce Compatibility Issues in Different Build Environments",
     "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "The following {0} authorizations cannot be reset. Please {1} or {2} {3} {4}",
     "前往处理": "navigate to handle them",
     "继续重置其余": "continue to reset the remaining",
@@ -284,5 +262,34 @@
     "未来 X 小时": "Next {0} Hours",
     "未来 X 天": "Next {0} Days",
     "过去 X 小时": "Last {0} Hours",
-    "过去 X 天": "Last {0} Days"
+    "过去 X 天": "Last {0} Days",
+    "变量语法风格": "Naming Convention",
+    "继承项目设置": "Inherited Project Settings",
+    "传统风格": "Traditional Style",
+    "制约风格": "Constraint Style",
+    "语法差异": "Grammatical Differences",
+    "差异项": "Difference Item",
+
+    "表达式格式": "Expression Format",
+    "单花括号或双花括号": "Single or Double Curly Braces",
+    "如：${var}、${{var}}": "e.g., {'${var}'}、{'${{var}}'}",
+    "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
+    "如：${{variables.var}}": "e.g., {'${{variables.var}}'}",
+
+    "变量值超长": "Variable Value Too Long",
+    "仅警告未报错": "Only Warning without Error",
+
+    "变量不存在": "Variable Not Found",
+    "未报错，继续执行，依赖执行逻辑自行检查": "No Error, Continue Execution, Check Execution Logic as Needed",
+
+    "变量 ID 规范": "Variable ID Standard",
+    "未限制": "No Restriction",
+    "不支持中文 ID，减少不同构建环境下的兼容问题": "Chinese IDs Not Supported to Reduce Compatibility Issues in Different Build Environments",
+    "确定升级变量语法风格为制约风格？": "Are you sure you want to upgrade the variable syntax style to constraint style?",
+    "影响流水线(X)": "Affected Pipelines (0)",
+    "项目：": "Project:",
+    "升级后，该项目对变量引用方式将有更严格的要求。": "After the upgrade, this project will have stricter requirements for variable referencing.",
+    "将报错，运行失败": "It will cause errors and the run will fail",
+    "确认离开当前页?": "Are you sure you want to leave this page?",
+    "离开": "Leave"
 }
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index b4c2f3b40ba..5412edf8c8e 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -140,32 +140,6 @@
     "项目类型": "项目类型",
     "创建项目申请单已撤回": "创建项目申请单已撤回",
     "全员": "全员",
-    "变量语法风格": "变量语法风格",
-    "继承项目设置": "继承项目设置",
-    "传统风格": "传统风格",
-    "制约风格": "制约风格",
-    "语法差异": "语法差异",
-    "差异项": "差异项",
-
-    "表达式格式": "表达式格式",
-    "单花括号或双花括号": "单花括号或双花括号",
-    "如：${var}、${{var}}": "如：{'${var}'}、{'${{var}}'}",
-    "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
-    "如：${{variables.var}}":"如：{'${{variables.var}}'}",
-
-    "变量值超长": "变量值超长",
-    "仅警告未报错": "仅警告未报错",
-
-    "变量不存在": "变量不存在",
-    "未报错，继续执行，依赖执行逻辑自行检查": "未报错，继续执行，依赖执行逻辑自行检查",
-
-    "变量 ID 规范": "变量 ID 规范",
-    "未限制": "未限制",
-    "不支持中文 ID，减少不同构建环境下的兼容问题": "不支持中文 ID，减少不同构建环境下的兼容问题",
-    "确定升级变量语法风格为制约风格？": "确定升级变量语法风格为制约风格？",
-    "项目:": "项目:",
-    "升级后，该项目对变量引用方式将有更严格的要求。": "升级后，该项目对变量引用方式将有更严格的要求。",
-    "影响流水线(X)": "影响流水线(0)",
     "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "检测到以下{0}项授权将无法重置，请{1}或{2}{3}{4}",
     "前往处理": "前往处理",
     "继续重置其余": "继续重置其余",
@@ -289,5 +263,34 @@
     "未来 X 小时": "未来 {0} 小时",
     "未来 X 天": "未来 {0} 天",
     "过去 X 小时": "过去 {0} 小时",
-    "过去 X 天": "过去 {0} 天"
+    "过去 X 天": "过去 {0} 天",
+    "变量语法风格": "变量语法风格",
+    "继承项目设置": "继承项目设置",
+    "传统风格": "传统风格",
+    "制约风格": "制约风格",
+    "语法差异": "语法差异",
+    "差异项": "差异项",
+
+    "表达式格式": "表达式格式",
+    "单花括号或双花括号": "单花括号或双花括号",
+    "如：${var}、${{var}}": "如：{'${var}'}、{'${{var}}'}",
+    "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
+    "如：${{variables.var}}":"如：{'${{variables.var}}'}",
+
+    "变量值超长": "变量值超长",
+    "仅警告未报错": "仅警告未报错",
+
+    "变量不存在": "变量不存在",
+    "未报错，继续执行，依赖执行逻辑自行检查": "未报错，继续执行，依赖执行逻辑自行检查",
+
+    "变量 ID 规范": "变量 ID 规范",
+    "未限制": "未限制",
+    "不支持中文 ID，减少不同构建环境下的兼容问题": "不支持中文 ID，减少不同构建环境下的兼容问题",
+    "确定升级变量语法风格为制约风格？": "确定升级变量语法风格为制约风格？",
+    "项目：": "项目：",
+    "升级后，该项目对变量引用方式将有更严格的要求。": "升级后，该项目对变量引用方式将有更严格的要求。",
+    "影响流水线(X)": "影响流水线(0)",
+    "将报错，运行失败": "将报错，运行失败",
+    "确认离开当前页?": "确认离开当前页?",
+    "离开": "离开"
 }

From fb3036ee5ab06353c7cdf7295db92abffded8990 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 23 Sep 2024 18:45:31 +0800
Subject: [PATCH 16/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/locale/pipeline/en-US.json | 1 +
 src/frontend/locale/pipeline/zh-CN.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index c5eac7695d6..6c6d2c88bb1 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -1597,6 +1597,7 @@
 
   "variableNotFound": "Variable Not Found",
   "traditionalNotFoundMode": "No Error, Continue Execution, Check Execution Logic as Needed",
+  "constraintReadOnlyMode": "It will cause errors and the run will fail",
 
   "variableStandard": "Variable ID Standard",
   "traditionalStandardMode": "No Restriction",
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index 20c04fd83e3..08f95892d05 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -1599,6 +1599,7 @@
 
   "variableNotFound": "变量不存在",
   "traditionalNotFoundMode": "未报错，继续执行，依赖执行逻辑自行检查",
+  "constraintReadOnlyMode": "将报错，运行失败",
 
   "variableStandard": "变量 ID 规范",
   "traditionalStandardMode": "未限制",

From c00799dcba0133731afade728da724b9ffa250db Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 24 Sep 2024 11:29:55 +0800
Subject: [PATCH 17/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2019193?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-manage/src/components/dialectPopoverTable.vue    | 6 +++---
 .../components/children/permission-manage/group-aside.vue   | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index 3d5c3c00bda..c6c8c6ff5f0 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -10,8 +10,8 @@
     <template #content>
       <h3 class="title">{{ t('语法差异') }}</h3>
       <bk-table :data="namingConventionData" show-overflow-tooltip>
-        <bk-table-column :label="$t('差异项')" prop="difference" :width="140" />
-        <bk-table-column :label="$t('传统风格')" prop="classic" :width="290">
+        <bk-table-column :label="t('差异项')" prop="difference" :width="140" />
+        <bk-table-column :label="t('传统风格')" prop="classic" :width="290">
           <template #default="{ row }">
             <div
               class="label-column"
@@ -24,7 +24,7 @@
             </div>
           </template>
         </bk-table-column>
-        <bk-table-column :label="$t('制约风格')" prop="constrainedMode">
+        <bk-table-column :label="t('制约风格')" prop="constrainedMode">
           <template #default="{ row }">
             <div
               class="label-column"
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue
index 07733f24376..8997078dc9a 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue
@@ -37,7 +37,7 @@
       </div>
       <div class="line-split" v-if="!isNotProject" />
     </template>
-    <bk-loading v-if="dataLoaded" :loading="fetchGroupLoading">
+    <bk-loading v-if="dataLoaded" :loading="fetchGroupLoading"  class='saide-content'>
       <scroll-load-list
         class="group-list"
         ref="loadList"
@@ -526,6 +526,10 @@ export default {
     margin-bottom: 5px;
   }
 }
+.saide-content {
+  height: 100%;
+  overflow-y: auto;
+}
 .group-list {
   max-height: calc(100% - 70px);
   min-height: 80px;

From 47f5f9305cbfe6af619ed1fdfc52c648479b6356 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 24 Sep 2024 11:49:47 +0800
Subject: [PATCH 18/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2019200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-manage/src/components/dialectPopoverTable.vue    | 6 +++---
 .../src/components/syntaxStyleConfiguration.vue             | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index c6c8c6ff5f0..8ef2e77beaa 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -16,11 +16,11 @@
             <div
               class="label-column"
               v-bk-tooltips="{
-                content: row.classIcExample ? `${row.classic};  ${row.classIcExample}` : row.classic
+                content: row.classicExample ? `${row.classic};  ${row.classicExample}` : row.classic
               }"
             >
               <p>{{ row.classic }}</p>
-              <p>{{ row.classIcExample }}</p>
+              <p>{{ row.classicExample }}</p>
             </div>
           </template>
         </bk-table-column>
@@ -49,7 +49,7 @@ const namingConventionData = [
     {
         difference: t('表达式格式'),
         classic: t('单花括号或双花括号'),
-        classIcExample: t('如：${var}、${{var}}'),
+        classicExample: t('如：${var}、${{var}}'),
         constrainedMode: t('仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题'),
         constrainedExample: t('如：${{variables.var}}'),
     },
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index 53cc5b5f7e5..ac36b32b845 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -27,7 +27,7 @@
                         <template slot-scope="props">
                             <div class="label-column">
                                 <p>{{ props.row.classic }}</p>
-                                <p>{{ props.row.classIcExample }}</p>
+                                <p>{{ props.row.classicExample }}</p>
                             </div>
                         </template>
                     </bk-table-column>
@@ -87,7 +87,7 @@
                     {
                         difference: this.$t('expressionFormat'),
                         classic: this.$t('traditionalFormat'),
-                        classIcExample: this.$t('traditionalFormatExample'),
+                        classicExample: this.$t('traditionalFormatExample'),
                         constrainedMode: this.$t('constraintFormat'),
                         constrainedExample: this.$t('constraintFormatExample')
                     },

From 32b9ef051f2b11c58dd02375f23e09e0ffadfa3b Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 8 Oct 2024 15:46:49 +0800
Subject: [PATCH 19/26] Merge branch 'master' of
 https://github.com/TencentBlueKing/bk-ci into issue_10576 # Reviewed,
 transaction id: 19919


From 7757c5b266350b8448d2a03d687e130aad367b99 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 8 Oct 2024 18:41:39 +0800
Subject: [PATCH 20/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2019947?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pipelineSetting/BaseInfo.vue   | 20 ++++++----
 .../pipelineSetting/settingBase/index.vue     | 37 +++++++++++++++++--
 .../components/syntaxStyleConfiguration.vue   |  4 ++
 .../modules/pipelines/pipelinesTemplate.js    | 11 ++++--
 .../src/views/CreatePipeline.vue              |  9 ++---
 5 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
index 4df2265394a..c6e45864382 100755
--- a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
+++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
@@ -108,7 +108,7 @@
     import VuexInput from '@/components/atomFormField/VuexInput/index.vue'
     import VuexTextarea from '@/components/atomFormField/VuexTextarea/index.vue'
     import SyntaxStyleConfiguration from '@/components/syntaxStyleConfiguration'
-    import { mapGetters } from 'vuex'
+    import { mapGetters, mapActions, mapState } from 'vuex'
 
     export default {
         name: 'bkdevops-base-info-setting-tab',
@@ -127,14 +127,16 @@
         },
         data () {
             return {
-                settings: {},
-                currentPipelineDialect: ''
+                settings: {}
             }
         },
         computed: {
             ...mapGetters({
                 tagGroupList: 'pipelines/getTagGroupList'
             }),
+            ...mapState('pipelines', [
+                'currentPipelineDialect'
+            ]),
             projectId () {
                 return this.$route.params.projectId
             },
@@ -157,12 +159,11 @@
         watch: {
             'pipelineSetting.pipelineAsCodeSettings': {
                 handler (val) {
-                    if (val && !this.currentPipelineDialect) {
-                        const { inheritedDialect, projectDialect, pipelineDialect } = this.pipelineSetting.pipelineAsCodeSettings
-                        this.currentPipelineDialect = inheritedDialect ? projectDialect : pipelineDialect
+                    if (val) {
+                        const { inheritedDialect, pipelineDialect } = this.pipelineSetting.pipelineAsCodeSettings
                         this.settings = {
                             ...this.pipelineSetting.pipelineAsCodeSettings,
-                            pipelineDialect: this.currentPipelineDialect
+                            pipelineDialect: inheritedDialect ? this.currentPipelineDialect : pipelineDialect
                         }
                     }
                 },
@@ -173,6 +174,9 @@
             this.requestGrouptLists()
         },
         methods: {
+            ...mapActions('pipelines', [
+                'getPipelineDialect'
+            ]),
             /** *
              * 获取标签及其分组
              */
@@ -183,6 +187,8 @@
                     })
 
                     this.$store.commit('pipelines/updateGroupLists', res)
+                    // 获取当前项目语法风格
+                    await this.getPipelineDialect(this.projectId)
                 } catch (err) {
                     this.$showTips({
                         message: err.message || err,
diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue
index 5c884727c83..e603138b571 100755
--- a/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue
+++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue
@@ -65,6 +65,17 @@
                 />
             </form-field>
 
+            <form-field
+                class="namingConvention"
+            >
+                <syntax-style-configuration
+                    :inherited-dialect="templateSetting.pipelineAsCodeSettings?.inheritedDialect ?? true"
+                    :pipeline-dialect="templateSetting.pipelineAsCodeSettings?.pipelineDialect ?? 'CLASSIC'"
+                    @inherited-change="inheritedChange"
+                    @pipeline-dialect-change="pipelineDialectChange"
+                />
+            </form-field>
+
             <form-field
                 :label="$t('settings.runLock')"
                 class="opera-lock-radio"
@@ -126,6 +137,7 @@
     import FormField from '@/components/AtomPropertyPanel/FormField.vue'
     import RunningLock from '@/components/pipelineSetting/RunningLock'
     import { mapActions, mapGetters, mapState } from 'vuex'
+    import SyntaxStyleConfiguration from '@/components/syntaxStyleConfiguration'
     import {
         TEMPLATE_RESOURCE_ACTION
     } from '@/utils/permission'
@@ -133,7 +145,8 @@
         components: {
             NotifyTab,
             FormField,
-            RunningLock
+            RunningLock,
+            SyntaxStyleConfiguration
         },
         props: {
             isLoading: Boolean,
@@ -150,7 +163,8 @@
         },
         computed: {
             ...mapState('pipelines', [
-                'templateSetting'
+                'templateSetting',
+                'currentPipelineDialect'
             ]),
             ...mapGetters({
                 tagGroupList: 'pipelines/getTagGroupList'
@@ -244,7 +258,8 @@
         methods: {
             ...mapActions('pipelines', [
                 'requestTemplateSetting',
-                'updateTemplateSetting'
+                'updateTemplateSetting',
+                'getPipelineDialect'
             ]),
             ...mapActions('atom', [
                 'updatePipelineSetting'
@@ -283,6 +298,8 @@
                     })
                     $store.commit('pipelines/updateGroupLists', res)
                     this.dataList = this.tagGroupList
+                    // 获取当前项目语法风格
+                    await this.getPipelineDialect(this.projectId)
                 } catch (err) {
                     this.$showTips({
                         message: err.message || err,
@@ -331,6 +348,17 @@
             handleUpdateNotify (name, value) {
                 Object.assign(this.templateSetting, { [name]: value })
                 this.setIsEditing()
+            },
+            inheritedChange (value) {
+                const settings = this.templateSetting.pipelineAsCodeSettings
+                settings.inheritedDialect = value
+
+                if (value) {
+                    settings.pipelineDialect = this.currentPipelineDialect
+                }
+            },
+            pipelineDialectChange (value) {
+                this.templateSetting.pipelineAsCodeSettings.pipelineDialect = value
             }
         }
     }
@@ -397,6 +425,9 @@
         .form-group-link {
             width: 100%;
         }
+        .namingConvention {
+            position: relative;
+        }
         .opera-lock-radio {
             margin-bottom: 0;
             .view-radio {
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index ac36b32b845..1fafc5546b4 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -150,4 +150,8 @@
     border-radius: 12px;
     padding: 4px 12px;
 }
+
+.pipelinte-template-type-group {
+    margin-top: 10px;
+}
 </style>
diff --git a/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js b/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js
index 8c641a2d74f..dd5691953c7 100755
--- a/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js
+++ b/src/frontend/devops-pipeline/src/store/modules/pipelines/pipelinesTemplate.js
@@ -27,7 +27,7 @@ import ajax from '@/utils/request'
 const prefix = `/${PROCESS_API_URL_PREFIX}/user`
 
 const state = {
-
+    currentPipelineDialect: false
 }
 
 const getters = {
@@ -35,12 +35,15 @@ const getters = {
 }
 
 const mutations = {
-
+    getCurrentPipelineDialect (state, params) {
+        state.currentPipelineDialect = params.data
+    }
 }
 
 const actions = {
-    async getPipelineDialect (_, projectId) {
-        return ajax.get(`${PROJECT_API_URL_PREFIX}/user/projects/${projectId}/pipelineDialect`)
+    async getPipelineDialect ({ commit }, projectId) {
+        const res = await ajax.get(`${PROJECT_API_URL_PREFIX}/user/projects/${projectId}/pipelineDialect`)
+        commit('getCurrentPipelineDialect', res)
     },
     installPipelineTemplate (_, params) {
         return ajax.post(`${STORE_API_URL_PREFIX}/user/market/template/install`, params).then(response => {
diff --git a/src/frontend/devops-pipeline/src/views/CreatePipeline.vue b/src/frontend/devops-pipeline/src/views/CreatePipeline.vue
index bc8e9d44436..4a14943ad83 100644
--- a/src/frontend/devops-pipeline/src/views/CreatePipeline.vue
+++ b/src/frontend/devops-pipeline/src/views/CreatePipeline.vue
@@ -273,7 +273,6 @@
                 applySettings: [],
                 inheritedDialect: true,
                 pipelineDialect: 'CLASSIC',
-                currentPipelineDialect: '',
                 isLoading: false,
                 newPipelineName: '',
                 searchName: '',
@@ -293,7 +292,8 @@
                 'pipelineTemplateMap'
             ]),
             ...mapState('pipelines', [
-                'isManage'
+                'isManage',
+                'currentPipelineDialect'
             ]),
             pipelineListRoute () {
                 return {
@@ -592,9 +592,8 @@
             async requestPipelineDialect () {
                 try {
                     const projectId = this.$route.params.projectId
-                    const { data } = await this.getPipelineDialect(projectId)
-                    this.currentPipelineDialect = data
-                    this.pipelineDialect = data
+                    await this.getPipelineDialect(projectId)
+                    this.pipelineDialect = this.currentPipelineDialect
                 } catch (err) {
                     console.log(err)
                 }

From 43cc1c25fe2a208d2a8dc643da9edb884dd827db Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Thu, 10 Oct 2024 18:23:43 +0800
Subject: [PATCH 21/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2020185?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialectPopoverTable.vue    |  51 +++++---
 .../AtomPropertyPanel/FormField.vue           |  42 ++++---
 .../src/components/namingConventionTip.vue    | 109 ++++++++++++++++++
 .../pipelineSetting/settingBase/index.vue     |  11 +-
 .../components/syntaxStyleConfiguration.vue   |  62 ++++------
 src/frontend/locale/manage/en-US.json         |   7 ++
 src/frontend/locale/manage/zh-CN.json         |   7 ++
 src/frontend/locale/pipeline/en-US.json       |   7 ++
 src/frontend/locale/pipeline/zh-CN.json       |   7 ++
 9 files changed, 228 insertions(+), 75 deletions(-)
 create mode 100644 src/frontend/devops-pipeline/src/components/namingConventionTip.vue

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index 8ef2e77beaa..f325344ca1a 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -4,23 +4,40 @@
     :width="900"
     extCls="dialect-popover"
     :componentEventDelay="300"
+    show-overflow-tooltip
     autoPlacement
   >
     <label class="label">{{ t('变量语法风格') }}</label>
     <template #content>
       <h3 class="title">{{ t('语法差异') }}</h3>
       <bk-table :data="namingConventionData" show-overflow-tooltip>
-        <bk-table-column :label="t('差异项')" prop="difference" :width="140" />
+        <bk-table-column :label="t('差异项')" prop="difference" :width="140">
+          <template #default="{ row }">
+            <div
+              class="label-column"
+            >
+              <p>{{ row.difference }}</p>
+              <p>{{ row.differenceTip }}</p>
+            </div>
+          </template>
+        </bk-table-column>
         <bk-table-column :label="t('传统风格')" prop="classic" :width="290">
           <template #default="{ row }">
             <div
               class="label-column"
-              v-bk-tooltips="{
-                content: row.classicExample ? `${row.classic};  ${row.classicExample}` : row.classic
-              }"
             >
-              <p>{{ row.classic }}</p>
-              <p>{{ row.classicExample }}</p>
+              <div v-if="!row.classicKey">
+                <p>{{ row.classic }}</p>
+                <p>{{ row.classicExample }}</p>
+              </div>
+              <div v-else class="classic-desc">
+                  <i18n-t
+                      tag="div"
+                      keypath="仅在流程控制选项X设置中可以使用"
+                  >
+                      <span class="classic-key">{{ t('自定义表达式满足时运行') }}</span>
+                  </i18n-t>
+              </div>
             </div>
           </template>
         </bk-table-column>
@@ -28,9 +45,6 @@
           <template #default="{ row }">
             <div
               class="label-column"
-              v-bk-tooltips="{
-                content: row.constrainedExample ? `${row.constrainedMode};  ${row.constrainedExample}` : row.constrainedMode
-              }"
             >
               <p>{{ row.constrainedMode }}</p>
               <p>{{ row.constrainedExample }}</p>
@@ -53,6 +67,14 @@ const namingConventionData = [
         constrainedMode: t('仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题'),
         constrainedExample: t('如：${{variables.var}}'),
     },
+    {
+        difference: t('表达式函数'),
+        differenceTip: t('如contains、join、fromJSON'),
+        classic: t('仅在流程控制选项X设置中可以使用'),
+        classicKey: true,
+        constrainedMode: t('流程控制选项、插件入参、Job设置等流水线配置中均可使用函数'),
+        constrainedExample: t('如变量a值为Json字符串，则bash脚本中，可以使用fromJSON读取echo “a.node is ${{fromJSON(a).node}}”')
+    },
     {
         difference: t('变量值超长'),
         classic: t('仅警告未报错'),
@@ -90,10 +112,13 @@ const namingConventionData = [
   padding: 4px 0;
   p {
     line-height: 20px;
-    width: 100%;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
+    white-space: pre-wrap;
   }
 }
+.classic-desc {
+  white-space: pre-wrap;
+}
+.classic-key {
+  font-weight: 700;
+}
 </style>
\ No newline at end of file
diff --git a/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/FormField.vue b/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/FormField.vue
index db5bb11388b..4330288e31b 100755
--- a/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/FormField.vue
+++ b/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/FormField.vue
@@ -1,7 +1,10 @@
 <script>
-
+    import NamingConventionTip from '@/components/namingConventionTip.vue'
     export default {
         name: 'form-field',
+        components: {
+            NamingConventionTip
+        },
         props: {
             label: {
                 type: String,
@@ -52,6 +55,10 @@
             bottomDivider: {
                 type: Boolean,
                 default: false
+            },
+            customDesc: {
+                type: Boolean,
+                default: false
             }
         },
         computed: {
@@ -63,7 +70,7 @@
             }
         },
         render (h) {
-            const { label, inline, required, $slots, isError, errorMsg, hideColon, desc, docsLink, descLink, descLinkText, type, widthStyle, bottomDivider } = this
+            const { label, inline, required, $slots, isError, errorMsg, hideColon, desc, docsLink, descLink, descLinkText, type, widthStyle, bottomDivider, customDesc } = this
             const descMap = desc.split('\n')
             return (
                 <div class={{
@@ -78,22 +85,27 @@
                         { docsLink
                             && <a target="_blank" href={docsLink}><i class="bk-icon icon-question-circle"></i></a>
                         }
-                        { label.trim() && desc.trim() && <bk-popover placement="top">
-                            <i class={{ 'bk-icon': true, 'icon-info-circle': true }} style={{ 'margin-left': hideColon ? '4px' : '0', color: hideColon ? '#979BA5' : '' }}></i>
-                            <div slot="content" style="white-space: pre-wrap; font-size: 12px; max-width: 500px;">
-                                <div>
+                        { label.trim() && (desc.trim() || customDesc) && <bk-popover placement="top" theme={customDesc ? 'light' : 'dark'} width={customDesc ? 892 : 'auto'}>
+                                <i class={{ 'bk-icon': true, 'icon-info-circle': true }} style={{ 'margin-left': hideColon ? '4px' : '0', color: hideColon ? '#979BA5' : '' }}></i>
+                                <div slot="content">
                                     {
-                                        descMap.length > 1
-                                        ? descMap.map(item => (
-                                            <div>{item}</div>
-                                        ))
-                                        : desc
+                                        customDesc
+                                        ? <NamingConventionTip/>
+                                        : <div style="white-space: pre-wrap; font-size: 12px; max-width: 500px;">
+                                            {
+                                                descMap.length > 1
+                                                ? descMap.map(item => (
+                                                    <div>{item}</div>
+                                                ))
+                                                : desc
+                                            }
+                                            { descLink && <a class="desc-link" target="_blank" href={descLink}>{descLinkText}</a>}
+                                        </div>
                                     }
-                                    { descLink && <a class="desc-link" target="_blank" href={descLink}>{descLinkText}</a>}
+                                    
                                 </div>
-                            </div>
-                        </bk-popover>
-                    }
+                            </bk-popover>
+                        }
                     </label> }
                     
                     <div class='bk-form-content'>
diff --git a/src/frontend/devops-pipeline/src/components/namingConventionTip.vue b/src/frontend/devops-pipeline/src/components/namingConventionTip.vue
new file mode 100644
index 00000000000..774177e8ea0
--- /dev/null
+++ b/src/frontend/devops-pipeline/src/components/namingConventionTip.vue
@@ -0,0 +1,109 @@
+<template>
+    <div style="width: 100%;">
+        <h3>{{ $t('grammaticalDifferences') }}</h3>
+        <bk-table
+            :data="namingConventionData"
+            :outer-border="false"
+            row-auto-height
+            show-overflow-tooltip
+        >
+            <bk-table-column
+                :label="$t('differenceItem')"
+                prop="difference"
+                :width="140"
+            >
+                <template slot-scope="props">
+                    <div class="label-column">
+                        <p>{{ props.row.difference }}</p>
+                        <p>{{ props.row.differenceTip }}</p>
+                    </div>
+                </template>
+            </bk-table-column>
+            <bk-table-column
+                :label="$t('traditionalStyle')"
+                prop="classic"
+                :width="290"
+            >
+                <template slot-scope="props">
+                    <div class="label-column">
+                        <div v-if="!props.row.classicKey">
+                            <p>{{ props.row.classic }}</p>
+                            <p>{{ props.row.classicExample }}</p>
+                        </div>
+                        <div v-else>
+                            <i18n
+                                tag="p"
+                                path="traditionalFunctionFormat"
+                            >
+                                <span class="classicKey">{{ $t('customExpressionsSatisfyRun') }}</span>
+                            </i18n>
+                        </div>
+                    </div>
+                </template>
+            </bk-table-column>
+            <bk-table-column
+                :label="$t('constraintStyle')"
+                prop="constrainedMode"
+            >
+                <template slot-scope="props">
+                    <div class="label-column">
+                        <p>{{ props.row.constrainedMode }}</p>
+                        <p>{{ props.row.constrainedExample }}</p>
+                    </div>
+                </template>
+            </bk-table-column>
+        </bk-table>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'nameing-convention-tip',
+        computed: {
+            namingConventionData () {
+                return [
+                    {
+                        difference: this.$t('expressionFormat'),
+                        classic: this.$t('traditionalFormat'),
+                        classicExample: this.$t('traditionalFormatExample'),
+                        constrainedMode: this.$t('constraintFormat'),
+                        constrainedExample: this.$t('constraintFormatExample')
+                    },
+                    {
+                        difference: this.$t('expressionFunction'),
+                        differenceTip: this.$t('expressionFunctionTip'),
+                        classic: this.$t('traditionalFunctionFormat'),
+                        classicKey: true,
+                        constrainedMode: this.$t('constraintFunctionFormat'),
+                        constrainedExample: this.$t('constraintFunctionFormatExample')
+                    },
+                    {
+                        difference: this.$t('variableValueTooLong'),
+                        classic: this.$t('traditionalValueTooLongMode'),
+                        constrainedMode: this.$t('constraintReadOnlyMode')
+                    },
+                    {
+                        difference: this.$t('variableNotFound'),
+                        classic: this.$t('traditionalNotFoundMode'),
+                        constrainedMode: this.$t('constraintReadOnlyMode')
+                    },
+                    {
+                        difference: this.$t('variableStandard'),
+                        classic: this.$t('traditionalStandardMode'),
+                        constrainedMode: this.$t('constraintStandardMode')
+                    }
+                ]
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+p {
+  word-break: keep-all;
+  overflow-wrap: break-word;
+}
+.classicKey {
+  font-weight: 700;
+}
+</style>
diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue
index e603138b571..4f4f315d33b 100755
--- a/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue
+++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/settingBase/index.vue
@@ -66,11 +66,13 @@
             </form-field>
 
             <form-field
-                class="namingConvention"
+                :label="$t('namingConvention')"
+                :custom-desc="true"
             >
                 <syntax-style-configuration
-                    :inherited-dialect="templateSetting.pipelineAsCodeSettings?.inheritedDialect ?? true"
-                    :pipeline-dialect="templateSetting.pipelineAsCodeSettings?.pipelineDialect ?? 'CLASSIC'"
+                    :is-show-popover="false"
+                    :inherited-dialect="templateSetting.pipelineAsCodeSettings?.inheritedDialect"
+                    :pipeline-dialect="templateSetting.pipelineAsCodeSettings?.pipelineDialect ?? currentPipelineDialect"
                     @inherited-change="inheritedChange"
                     @pipeline-dialect-change="pipelineDialectChange"
                 />
@@ -425,9 +427,6 @@
         .form-group-link {
             width: 100%;
         }
-        .namingConvention {
-            position: relative;
-        }
         .opera-lock-radio {
             margin-bottom: 0;
             .view-radio {
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index 1fafc5546b4..40698855248 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -1,52 +1,18 @@
 <template>
     <div>
         <bk-popover
+            v-if="isShowPopover"
             theme="light"
             :width="892"
             placement="top-start"
         >
             <label class="label">{{ $t('namingConvention') }}</label>
             <div slot="content">
-                <h3>{{ $t('grammaticalDifferences') }}</h3>
-                <bk-table
-                    :data="namingConventionData"
-                    :outer-border="false"
-                    row-auto-height
-                    show-overflow-tooltip
-                >
-                    <bk-table-column
-                        :label="$t('differenceItem')"
-                        prop="difference"
-                        :width="140"
-                    />
-                    <bk-table-column
-                        :label="$t('traditionalStyle')"
-                        prop="classic"
-                        :width="290"
-                    >
-                        <template slot-scope="props">
-                            <div class="label-column">
-                                <p>{{ props.row.classic }}</p>
-                                <p>{{ props.row.classicExample }}</p>
-                            </div>
-                        </template>
-                    </bk-table-column>
-                    <bk-table-column
-                        :label="$t('constraintStyle')"
-                        prop="constrainedMode"
-                    >
-                        <template slot-scope="props">
-                            <div class="label-column">
-                                <p>{{ props.row.constrainedMode }}</p>
-                                <p>{{ props.row.constrainedExample }}</p>
-                            </div>
-                        </template>
-                    </bk-table-column>
-                </bk-table>
+                <NamingConventionTip />
             </div>
         </bk-popover>
         <bk-checkbox
-            ext-cls="namingConvention-checkbox"
+            :ext-cls="{ 'namingConvention-checkbox': isShowPopover }"
             v-model="inheritedDialect"
             @change="inheritedChange"
         >
@@ -58,28 +24,37 @@
             @change="pipelineDialectChange"
         >
             <bk-radio
+                class="radio-label"
                 :value="'CLASSIC'"
                 :disabled="isDialectDisabled"
             >
-                <span class="radio-label">{{ $t('traditionalStyle') }}</span>
+                <span>{{ $t('traditionalStyle') }}</span>
             </bk-radio>
             <bk-radio
+                class="radio-label"
                 :value="'CONSTRAINED'"
                 :disabled="isDialectDisabled"
             >
-                <span class="radio-label">{{ $t('constraintStyle') }}</span>
+                <span>{{ $t('constraintStyle') }}</span>
             </bk-radio>
         </bk-radio-group>
     </div>
 </template>
 
 <script>
-
+    import NamingConventionTip from '@/components/namingConventionTip.vue'
     export default {
         name: 'base-setting-tab',
+        components: {
+            NamingConventionTip
+        },
         props: {
             inheritedDialect: Boolean,
-            pipelineDialect: String
+            pipelineDialect: String,
+            isShowPopover: {
+                type: Boolean,
+                default: true
+            }
         },
         computed: {
             namingConventionData () {
@@ -153,5 +128,10 @@
 
 .pipelinte-template-type-group {
     margin-top: 10px;
+    display: flex;
+
+    .radio-label {
+        margin-right: 10px;
+    }
 }
 </style>
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 9b0ba14edf6..53654aa63d7 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -276,6 +276,13 @@
     "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
     "如：${{variables.var}}": "e.g., {'${{variables.var}}'}",
 
+    "表达式函数": "Expression Functions",
+    "如contains、join、fromJSON": "e.g., contains, join, fromJSON...",
+    "仅在流程控制选项X设置中可以使用": "Can only be used in the flow control option {0} settings",
+    "自定义表达式满足时运行": "custom expressions satisfy run",
+    "流程控制选项、插件入参、Job设置等流水线配置中均可使用函数": "Functions can be used in pipeline configurations such as flow control options, plugin parameters, and Job settings",
+    "如变量a值为Json字符串，则bash脚本中，可以使用fromJSON读取echo “a.node is ${{fromJSON(a).node}}”": "If the value of variable 'a' is a JSON string, you can use fromJSON in a bash script to read it, e.g., echo “a.node is ${{fromJSON(a).node}}”",
+
     "变量值超长": "Variable Value Too Long",
     "仅警告未报错": "Only Warning without Error",
 
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 5412edf8c8e..38290aa7b24 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -277,6 +277,13 @@
     "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
     "如：${{variables.var}}":"如：{'${{variables.var}}'}",
 
+    "表达式函数": "表达式函数",
+    "如contains、join、fromJSON": "如contains、join、fromJSON等",
+    "仅在流程控制选项X设置中可以使用": "仅在流程控制选项 {0} 设置中可以使用",
+    "自定义表达式满足时运行": "自定义表达式满足时运行",
+    "流程控制选项、插件入参、Job设置等流水线配置中均可使用函数": "流程控制选项、插件入参、Job设置等流水线配置中均可使用函数",
+    "如变量a值为Json字符串，则bash脚本中，可以使用fromJSON读取echo “a.node is ${{fromJSON(a).node}}”": "如变量 a 值为 Json 字符串，则 bash 脚本中，可以使用 fromJSON 读取echo “a.node is ${{fromJSON(a).node}}”",
+
     "变量值超长": "变量值超长",
     "仅警告未报错": "仅警告未报错",
 
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index 83d1113f251..dc15b69caea 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -1592,6 +1592,13 @@
   "constraintFormat": "Only Double Curly Braces Supported to Avoid System Assignment Issues in Bash Scripts",
   "constraintFormatExample": "e.g., ${{variables.var}}",
 
+  "expressionFunction": "Expression Functions",
+  "expressionFunctionTip": "e.g., contains, join, fromJSON...",
+  "traditionalFunctionFormat": "Can only be used in the flow control option {0} settings",
+  "customExpressionsSatisfyRun": "custom expressions satisfy run",
+  "constraintFunctionFormat": "Functions can be used in pipeline configurations such as flow control options, plugin parameters, and Job settings",
+  "constraintFunctionFormatExample": "If the value of variable 'a' is a JSON string, you can use fromJSON in a bash script to read it, e.g., echo “a.node is ${{fromJSON(a).node}}”",
+
   "variableValueTooLong": "Variable Value Too Long",
   "traditionalValueTooLongMode": "Only Warning without Error",
 
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index a3131878b35..69dfd5277e3 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -1594,6 +1594,13 @@
   "constraintFormat": "仅支持双花括号，避免出现 bash 脚本变量在执行前被系统赋值的问题",
   "constraintFormatExample": "如：${{variables.var}}",
 
+  "expressionFunction": "表达式函数",
+  "expressionFunctionTip": "如contains、join、fromJSON等",
+  "traditionalFunctionFormat": "仅在流程控制选项 {0} 设置中可以使用",
+  "customExpressionsSatisfyRun": "自定义表达式满足时运行",
+  "constraintFunctionFormat": "流程控制选项、插件入参、Job设置等流水线配置中均可使用函数",
+  "constraintFunctionFormatExample": "如变量 a 值为 Json 字符串，则 bash 脚本中，可以使用 fromJSON 读取echo “a.node is ${{fromJSON(a).node}}”",
+
   "variableValueTooLong": "变量值超长",
   "traditionalValueTooLongMode": "仅警告未报错",
 

From f7e5963a7362e86d8dcaac18358cee3017ad7bb6 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 11 Oct 2024 09:43:14 +0800
Subject: [PATCH 22/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/locale/manage/en-US.json | 2 +-
 src/frontend/locale/manage/zh-CN.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 53654aa63d7..3781df5445c 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -281,7 +281,7 @@
     "仅在流程控制选项X设置中可以使用": "Can only be used in the flow control option {0} settings",
     "自定义表达式满足时运行": "custom expressions satisfy run",
     "流程控制选项、插件入参、Job设置等流水线配置中均可使用函数": "Functions can be used in pipeline configurations such as flow control options, plugin parameters, and Job settings",
-    "如变量a值为Json字符串，则bash脚本中，可以使用fromJSON读取echo “a.node is ${{fromJSON(a).node}}”": "If the value of variable 'a' is a JSON string, you can use fromJSON in a bash script to read it, e.g., echo “a.node is ${{fromJSON(a).node}}”",
+    "如变量a值为Json字符串，则bash脚本中，可以使用fromJSON读取echo “a.node is ${{fromJSON(a).node}}”": "If the value of variable 'a' is a JSON string, you can use fromJSON in a bash script to read it, e.g., echo “a.node is {'${{fromJSON(a).node}}'}”",
 
     "变量值超长": "Variable Value Too Long",
     "仅警告未报错": "Only Warning without Error",
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 38290aa7b24..462d9a41728 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -282,7 +282,7 @@
     "仅在流程控制选项X设置中可以使用": "仅在流程控制选项 {0} 设置中可以使用",
     "自定义表达式满足时运行": "自定义表达式满足时运行",
     "流程控制选项、插件入参、Job设置等流水线配置中均可使用函数": "流程控制选项、插件入参、Job设置等流水线配置中均可使用函数",
-    "如变量a值为Json字符串，则bash脚本中，可以使用fromJSON读取echo “a.node is ${{fromJSON(a).node}}”": "如变量 a 值为 Json 字符串，则 bash 脚本中，可以使用 fromJSON 读取echo “a.node is ${{fromJSON(a).node}}”",
+    "如变量a值为Json字符串，则bash脚本中，可以使用fromJSON读取echo “a.node is ${{fromJSON(a).node}}”": "如变量 a 值为 Json 字符串，则 bash 脚本中，可以使用 fromJSON 读取echo “a.node is {'${{fromJSON(a).node}}'}”",
 
     "变量值超长": "变量值超长",
     "仅警告未报错": "仅警告未报错",

From 3903b4eb986213ef6c1e955b8edc6faba361150c Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 11 Oct 2024 14:13:12 +0800
Subject: [PATCH 23/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2020245?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-pipeline/src/components/pipelineSetting/BaseInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
index c6e45864382..a86cdb3ccf3 100755
--- a/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
+++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/BaseInfo.vue
@@ -95,7 +95,7 @@
             <bk-form-item ext-cls="namingConvention">
                 <syntax-style-configuration
                     :inherited-dialect="settings.inheritedDialect"
-                    :pipeline-dialect="settings.pipelineDialect"
+                    :pipeline-dialect="settings.pipelineDialect ?? currentPipelineDialect"
                     @inherited-change="inheritedChange"
                     @pipeline-dialect-change="pipelineDialectChange"
                 />

From d6ec18d5e20b091a4e8b64328b7d99dfa8c95489 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Sat, 12 Oct 2024 16:00:11 +0800
Subject: [PATCH 24/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2020411?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-manage/src/components/dialectPopoverTable.vue  | 4 ++--
 .../devops-manage/src/components/project-form.vue         | 4 ++--
 .../src/views/manage/project/show-project.vue             | 8 ++------
 .../src/components/PipelineDetailTabs/BaseConfig.vue      | 4 ++--
 .../src/components/namingConventionTip.vue                | 4 ++--
 .../src/components/syntaxStyleConfiguration.vue           | 4 ++--
 src/frontend/locale/manage/en-US.json                     | 4 ++--
 src/frontend/locale/manage/zh-CN.json                     | 4 ++--
 src/frontend/locale/pipeline/en-US.json                   | 4 ++--
 src/frontend/locale/pipeline/zh-CN.json                   | 4 ++--
 10 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
index f325344ca1a..81705a9973f 100644
--- a/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
+++ b/src/frontend/devops-manage/src/components/dialectPopoverTable.vue
@@ -21,7 +21,7 @@
             </div>
           </template>
         </bk-table-column>
-        <bk-table-column :label="t('传统风格')" prop="classic" :width="290">
+        <bk-table-column :label="t('CLASSIC')" prop="classic" :width="290">
           <template #default="{ row }">
             <div
               class="label-column"
@@ -41,7 +41,7 @@
             </div>
           </template>
         </bk-table-column>
-        <bk-table-column :label="t('制约风格')" prop="constrainedMode">
+        <bk-table-column :label="t('CONSTRAINED')" prop="constrainedMode">
           <template #default="{ row }">
             <div
               class="label-column"
diff --git a/src/frontend/devops-manage/src/components/project-form.vue b/src/frontend/devops-manage/src/components/project-form.vue
index 4879b37cda4..ad578d50d92 100644
--- a/src/frontend/devops-manage/src/components/project-form.vue
+++ b/src/frontend/devops-manage/src/components/project-form.vue
@@ -480,10 +480,10 @@ onBeforeUnmount(() => {
         @change="handleChangeForm"
       >
         <bk-radio label="CLASSIC">
-          <span>{{ t('传统风格') }}</span>
+          <span>{{ t('CLASSIC') }}</span>
         </bk-radio>
         <bk-radio label="CONSTRAINED">
-          <span>{{ t('制约风格') }}</span>
+          <span>{{ t('CONSTRAINED') }}</span>
         </bk-radio>
       </bk-radio-group>
     </bk-form-item>
diff --git a/src/frontend/devops-manage/src/views/manage/project/show-project.vue b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
index 30bba5d796e..c002ad18b1d 100644
--- a/src/frontend/devops-manage/src/views/manage/project/show-project.vue
+++ b/src/frontend/devops-manage/src/views/manage/project/show-project.vue
@@ -302,10 +302,6 @@ const projectTypeNameMap = {
   4: t('平台产品'),
   5: t('支撑产品'),
 }
-const pipelineDialectMap = {
-  'CLASSIC': t('传统风格'),
-  'CONSTRAINED': t('制约风格'),
-}
 watch(() => projectData.value.approvalStatus, (status) => {
   if (status === 4) fetchDiffProjectData();
 }, {
@@ -422,12 +418,12 @@ onMounted(async () => {
                     <dialect-popover-table />
                   </template>
                   <div>
-                    <span>{{ pipelineDialectMap[projectData.pipelineDialect] }}</span>
+                    <span>{{ t(projectData.pipelineDialect) }}</span>
                     <div class="diff-content" v-if="projectData.afterPipelineDialect">
                       <p class="update-title">
                         {{ t('本次更新：') }}
                       </p>
-                      <span>{{ pipelineDialectMap[projectData.afterPipelineDialect] }}</span>
+                      <span>{{ t(projectData.afterPipelineDialect) }}</span>
                     </div>
                   </div>
                 </bk-form-item>
diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
index 4e2cdc855d0..59f238689f6 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
@@ -79,8 +79,8 @@
             return {
                 activeName: ['baseInfo', 'executeConfig'],
                 namingStyle: {
-                    CLASSIC: this.$t('traditionalStyle'),
-                    CONSTRAINED: this.$t('constraintStyle')
+                    CLASSIC: this.$t('CLASSIC'),
+                    CONSTRAINED: this.$t('CONSTRAINED')
                 }
             }
         },
diff --git a/src/frontend/devops-pipeline/src/components/namingConventionTip.vue b/src/frontend/devops-pipeline/src/components/namingConventionTip.vue
index 774177e8ea0..2097b413595 100644
--- a/src/frontend/devops-pipeline/src/components/namingConventionTip.vue
+++ b/src/frontend/devops-pipeline/src/components/namingConventionTip.vue
@@ -20,7 +20,7 @@
                 </template>
             </bk-table-column>
             <bk-table-column
-                :label="$t('traditionalStyle')"
+                :label="$t('CLASSIC')"
                 prop="classic"
                 :width="290"
             >
@@ -42,7 +42,7 @@
                 </template>
             </bk-table-column>
             <bk-table-column
-                :label="$t('constraintStyle')"
+                :label="$t('CONSTRAINED')"
                 prop="constrainedMode"
             >
                 <template slot-scope="props">
diff --git a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
index 40698855248..7eaac503540 100644
--- a/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
+++ b/src/frontend/devops-pipeline/src/components/syntaxStyleConfiguration.vue
@@ -28,14 +28,14 @@
                 :value="'CLASSIC'"
                 :disabled="isDialectDisabled"
             >
-                <span>{{ $t('traditionalStyle') }}</span>
+                <span>{{ $t('CLASSIC') }}</span>
             </bk-radio>
             <bk-radio
                 class="radio-label"
                 :value="'CONSTRAINED'"
                 :disabled="isDialectDisabled"
             >
-                <span>{{ $t('constraintStyle') }}</span>
+                <span>{{ $t('CONSTRAINED') }}</span>
             </bk-radio>
         </bk-radio-group>
     </div>
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 3781df5445c..b49c8545e2f 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -265,8 +265,8 @@
     "过去 X 天": "Last {0} Days",
     "变量语法风格": "Naming Convention",
     "继承项目设置": "Inherited Project Settings",
-    "传统风格": "Traditional Style",
-    "制约风格": "Constraint Style",
+    "CLASSIC": "Traditional Style",
+    "CONSTRAINED": "Constraint Style",
     "语法差异": "Grammatical Differences",
     "差异项": "Difference Item",
 
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 462d9a41728..0d3a7c37b5b 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -266,8 +266,8 @@
     "过去 X 天": "过去 {0} 天",
     "变量语法风格": "变量语法风格",
     "继承项目设置": "继承项目设置",
-    "传统风格": "传统风格",
-    "制约风格": "制约风格",
+    "CLASSIC": "传统风格",
+    "CONSTRAINED": "制约风格",
     "语法差异": "语法差异",
     "差异项": "差异项",
 
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index dc15b69caea..09535090896 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -1581,8 +1581,8 @@
   "templateRollbackBackTips": "The current pipeline is in constraint mode (template instance). You need to jump to the template to roll back the version.",
   "namingConvention": "Naming Convention",
   "inheritedProject": "Inherited Project Settings",
-  "traditionalStyle": "Traditional Style",
-  "constraintStyle": "Constraint Style",
+  "CLASSIC": "Traditional Style",
+  "CONSTRAINED": "Constraint Style",
   "grammaticalDifferences": "Grammatical Differences",
   "differenceItem": "Difference Item",
 
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index 69dfd5277e3..adeee2f2887 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -1583,8 +1583,8 @@
   "templateRollbackBackTips": "当前流水线为约束模式（模板实例），需要跳转到模板进行版本回滚。",
   "namingConvention": "变量语法风格",
   "inheritedProject": "继承项目设置",
-  "traditionalStyle": "传统风格",
-  "constraintStyle": "制约风格",
+  "CLASSIC": "传统风格",
+  "CONSTRAINED": "制约风格",
   "grammaticalDifferences": "语法差异",
   "differenceItem": "差异项",
 

From 4e1b7dedad1845af7358624f705699d8c7cdcb18 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Sat, 12 Oct 2024 16:24:44 +0800
Subject: [PATCH 25/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576=20#=20Reviewed,=20transact?=
 =?UTF-8?q?ion=20id:=2020420?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/devops-quality/src/views/create_rules.vue | 2 +-
 src/frontend/locale/quality/en-US.json                 | 2 +-
 src/frontend/locale/quality/zh-CN.json                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontend/devops-quality/src/views/create_rules.vue b/src/frontend/devops-quality/src/views/create_rules.vue
index b1d3e656146..570f8516843 100755
--- a/src/frontend/devops-quality/src/views/create_rules.vue
+++ b/src/frontend/devops-quality/src/views/create_rules.vue
@@ -300,7 +300,7 @@
                         </devops-form-item>
                         <p class="gateway-id-tips">
                             <i class="devops-icon icon-info-circle-shape"></i>
-                            <span>{{ $t('quality.若输入了前缀（例如gate1），红线将只对名称以前缀加下划线开头的控制点生效（例如gate1_XX）') }}</span>
+                            <span>{{ $t('quality.若输入了前缀（例如gate1），红线将只对名称以前缀开头的控制点生效（例如gate1_XX）') }}</span>
                         </p>
                         <bk-form-item
                             :label="$t('quality.生效范围')"
diff --git a/src/frontend/locale/quality/en-US.json b/src/frontend/locale/quality/en-US.json
index 49eed9663b1..db1cc29d0b2 100644
--- a/src/frontend/locale/quality/en-US.json
+++ b/src/frontend/locale/quality/en-US.json
@@ -227,7 +227,7 @@
     "删除规则": "Delete a rule",
     "单流水线": "Single Pipeline",
     "仅展示最近10条。": "Only the last 10 are shown.",
-    "若输入了前缀（例如gate1），红线将只对名称以前缀加下划线开头的控制点生效（例如gate1_XX）": "If you enter a prefix (for example, gate1), the Red Line takes effect only for control points at the beginning of the name prefix with an underscore (for example, gate1_XX)",
+    "若输入了前缀（例如gate1），红线将只对名称以前缀开头的控制点生效（例如gate1_XX）": "If you enter a prefix (for example, gate1), the Red Line takes effect only for control points at the beginning of the name prefix with an underscore (for example, gate1_XX)",
     "请输入通知人员": "Please enter the notification personnel",
     "序号": "No.",
     "例如：CodeCoverage，创建后不可修改": "For example: CodeCoverage, which cannot be modified after creation",
diff --git a/src/frontend/locale/quality/zh-CN.json b/src/frontend/locale/quality/zh-CN.json
index 4abd6b6cb59..ccc727d3e8b 100644
--- a/src/frontend/locale/quality/zh-CN.json
+++ b/src/frontend/locale/quality/zh-CN.json
@@ -228,7 +228,7 @@
     "删除规则": "删除规则",
     "单流水线": "单流水线",
     "仅展示最近10条。": "仅展示最近10条。",
-    "若输入了前缀（例如gate1），红线将只对名称以前缀加下划线开头的控制点生效（例如gate1_XX）": "若输入了前缀（例如gate1），红线将只对名称以前缀加下划线开头的控制点生效（例如gate1_XX）",
+    "若输入了前缀（例如gate1），红线将只对名称以前缀开头的控制点生效（例如gate1_XX）": "若输入了前缀（例如gate1），红线将只对名称以前缀开头的控制点生效（例如gate1_XX）",
     "请输入通知人员": "请输入通知人员",
     "序号": "序号",
     "例如：CodeCoverage，创建后不可修改": "例如：CodeCoverage，创建后不可修改",

From de97804faeedb0415c5d4ffc87baeb2ae5c28e5a Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Sat, 12 Oct 2024 17:01:36 +0800
Subject: [PATCH 26/26] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=AD=E6=B3=95=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E9=A3=8E=E6=A0=BC=20#10576?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/locale/quality/en-US.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/locale/quality/en-US.json b/src/frontend/locale/quality/en-US.json
index db1cc29d0b2..9db8382da25 100644
--- a/src/frontend/locale/quality/en-US.json
+++ b/src/frontend/locale/quality/en-US.json
@@ -227,7 +227,7 @@
     "删除规则": "Delete a rule",
     "单流水线": "Single Pipeline",
     "仅展示最近10条。": "Only the last 10 are shown.",
-    "若输入了前缀（例如gate1），红线将只对名称以前缀开头的控制点生效（例如gate1_XX）": "If you enter a prefix (for example, gate1), the Red Line takes effect only for control points at the beginning of the name prefix with an underscore (for example, gate1_XX)",
+    "若输入了前缀（例如gate1），红线将只对名称以前缀开头的控制点生效（例如gate1_XX）": "If a prefix is entered (e.g., gate1), the red line will only apply to control points whose names start with the prefix (e.g., gate1_XX).",
     "请输入通知人员": "Please enter the notification personnel",
     "序号": "No.",
     "例如：CodeCoverage，创建后不可修改": "For example: CodeCoverage, which cannot be modified after creation",