feat：流水线变量语法支持两种风格 TencentBlueKing#10576

# Reviewed, transaction id: 19193
useryuyu · Sep 24, 2024 · c00799d · c00799d
1 parent fb3036e
commit c00799d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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/...ps-manage/src/components/user-group/components/children/permission-manage/group-aside.vue b/...ps-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;