访问流水线搜索日志，全屏浏览器查询搜索的日志，上方的搜索栏会消失 TencentBlueKing#11118

# Reviewed, transaction id: 21988
useryuyu · Oct 28, 2024 · 25020c1 · 25020c1
1 parent 792a199
commit 25020c1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/src/frontend/devops-environment/src/components/devops/environment/basic-information.vue b/src/frontend/devops-environment/src/components/devops/environment/basic-information.vue
@@ -67,16 +67,27 @@
             <div class="item-content">
                 <div class="item-label">{{ $t('environment.nodeInfo.dockerMaxConcurrency') }}</div>
                 <div class="item-value">
-                    <div class="display-item" v-if="isEditDockerCount">
-                        <input type="number" class="bk-form-input parallelTaskCount-input"
+                    <div
+                        class="display-item"
+                        v-if="isEditDockerCount"
+                    >
+                        <input
+                            type="number"
+                            class="bk-form-input parallelTaskCount-input"
                             ref="dockerParallelTaskCount"
                             name="dockerParallelTaskCount"
                             :placeholder="$t('environment.nodeInfo.parallelTaskCountTips')"
                             v-validate.initial="`required|between:0,100|decimal:0`"
                             v-model="dockerParallelTaskCount"
-                            :class="{ 'is-danger': errors.has('dockerParallelTaskCount') }">
+                            :class="{ 'is-danger': errors.has('dockerParallelTaskCount') }"
+                        >
+                    </div>
+                    <div
+                        class="editing-item"
+                        v-else
+                    >
+                        {{ nodeDetails.dockerParallelTaskCount || '--' }}
                     </div>
-                    <div class="editing-item" v-else>{{ nodeDetails.dockerParallelTaskCount || '--' }}</div>
                 </div>
                 <div class="handle-btn">
                     <div v-if="isEditDockerCount">

diff --git a/src/frontend/devops-pipeline/src/components/StagePropertyPanel/StageControl.vue b/src/frontend/devops-pipeline/src/components/StagePropertyPanel/StageControl.vue
@@ -82,6 +82,7 @@
                         v-validate.initial="showCondition ? 'required' : ''"
                         name="customCondition"
                         :handle-change="handleUpdateStageControl"
+                        :placeholder="$t('storeMap.customConditionExpPlaceholder')"
                     >
                     </vuex-input>
                 </form-field>

diff --git a/src/frontend/devops-pipeline/src/store/modules/common/jobOptionConfigMixin.js b/src/frontend/devops-pipeline/src/store/modules/common/jobOptionConfigMixin.js
@@ -304,7 +304,8 @@ const jobOptionConfigMixin = {
                     label: this.$t('storeMap.customConditionExp'),
                     isHidden: (container) => {
                         return container?.jobControlOption?.runCondition !== 'CUSTOM_CONDITION_MATCH'
-                    }
+                    },
+                    placeholder: this.$t('storeMap.customConditionExpPlaceholder')
                 }
             }
         },

diff --git a/src/frontend/devops-pipeline/src/store/modules/common/optionConfigMixin.js b/src/frontend/devops-pipeline/src/store/modules/common/optionConfigMixin.js
@@ -184,7 +184,8 @@ const optionConfigMixin = {
                 label: this.$t('storeMap.customConditionExp'),
                 isHidden: (element) => {
                     return element?.additionalOptions?.runCondition !== 'CUSTOM_CONDITION_MATCH'
-                }
+                },
+                placeholder: this.$t('storeMap.customConditionExpPlaceholder')
             },
             otherTask: {
                 isHidden: true,

diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
@@ -1149,7 +1149,8 @@
     "singleNodeConcurrencyPlaceholder": "Default is the maximum concurrency set on the node",
     "allNodeConcurrency": "Concurrency limit across all nodes",
     "allNodeConcurrencyPlaceholder": "The theoretical concurrency = concurrency per node * number of nodes",
-    "minutes": "Minutes"
+    "minutes": "Minutes",
+    "customConditionExpPlaceholder": "e.g., variables.a == 1 || jobs.job1.steps.step1.outputs.b == 'api'"
   },
   "主版本": "Major version",
   "特性版本": "Minor version",

diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
@@ -1148,7 +1148,8 @@
     "singleNodeConcurrencyPlaceholder": "不填则以节点上设置的最大并发数为准",
     "allNodeConcurrency": "所有节点上的总并发",
     "allNodeConcurrencyPlaceholder": "不填则 总并发理论值=单节点最大并发*构建节点数",
-    "minutes": "分钟"
+    "minutes": "分钟",
+    "customConditionExpPlaceholder": "如：variables.a == 1 || jobs.job1.steps.step1.outputs.b == 'api'"
   },
   "主版本": "主版本",
   "特性版本": "特性版本",