Dev/develop ci

src/dashboard-front/src/common/menu.ts

@@ -99,7 +99,7 @@ export const createMenuData = (): IMenu[] => {
         },
         {
           name: 'apigwMonitorAlarmHistory',
-          title: t('告警历史'),
+          title: t('告警记录'),
           enabled: true,
         },
       ],

src/dashboard-front/src/components/resource-setting-top-bar.vue

@@ -162,6 +162,12 @@ const handleCreateResourceVersion = async () => {
       padding: 0 12px;
       i {
         font-size: 16px;
+        margin-right: 4px;
+      }
+      &.bk-button.is-disabled {
+        color: #dcdee5;
+        cursor: not-allowed;
+        border-color: #dcdee5;
       }
     }
   }

src/dashboard-front/src/language/lang.ts

@@ -36,7 +36,7 @@ const lang: ILANG = {
   '统计报表': ['Statistics'],
   '监控告警': ['Monitoring'],
   '告警策略': ['Alarm Strategy'],
-  '告警历史': ['Alarm Histories'],
+  '告警记录': ['Alarm Records'],
   '在线调试': ['API Test'],
   '资源SDK': ['SDKs'],
   '操作审计': ['Audits'],

src/dashboard-front/src/router/index.ts

@@ -274,7 +274,7 @@ const routes: RouteRecordRaw[] = [
         name: 'apigwMonitorAlarmHistory',
         component: ApigwMonitorAlarmHistory,
         meta: {
-          title: t('告警历史'),
+          title: t('告警记录'),
           matchRoute: 'apigwMonitorAlarmHistory',
           topMenu: 'home',
         },

src/dashboard-front/src/views/components/plugin-manage/index.vue

@@ -172,9 +172,9 @@
         </div>
       </template>
       <template #footer v-if="state.curStep === 1">
-        <div class="slider-footer pl20">
+        <div class="slider-footer">
           <div class="fist-step">
-            <bk-button theme="primary" @click="handelNext" width="50px" :disabled="!curChoosePlugin">
+            <bk-button theme="primary" @click="handelNext" :disabled="!curChoosePlugin">
               {{ t('下一步') }}
             </bk-button>
             <bk-button @click="handleCancel">{{ t('取消') }}</bk-button>
@@ -776,15 +776,26 @@ init();
 .plugin-add-slider {
   :deep(.bk-modal-content) {
     // height: calc(100vh - 106px) !important;
-    height: calc(100% - 126px) !important;
+    // height: calc(100% - 126px) !important;
     overflow-y: auto;
   }
-
+  :deep(.bk-sideslider-footer) {
+    height: 48px !important;
+  }
   .slider-footer {
     display: flex;
+    padding: 0 24px;
+    height: 32px;
 
     .fist-step {
-      margin-right: 12px;
+      font-size: 0;
+      line-height: 48px;
+      .bk-button {
+        min-width: 88px;
+        &:not(&:first-child) {
+          margin-left: 8px;
+        }
+      }
     }
   }
 }

src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue

@@ -69,11 +69,11 @@
           @confirm="handleAdd"
           v-if="isStage"
         >
-          <bk-button theme="primary">{{ t('确定') }}</bk-button>
+          <bk-button theme="primary" class="default-btn">{{ t('确定') }}</bk-button>
         </bk-pop-confirm>
-        <bk-button v-else @click="handleAdd" theme="primary">{{ t('确定') }}</bk-button>
-        <bk-button @click="handlePre" class="ml5" v-if="isAdd">{{ t('上一步') }}</bk-button>
-        <bk-button @click="handleCancel" class="ml5">{{ t('取消') }}</bk-button>
+        <bk-button v-else @click="handleAdd" theme="primary" class="default-btn">{{ t('确定') }}</bk-button>
+        <bk-button @click="handlePre" class="prev-btn ml8" v-if="isAdd">{{ t('上一步') }}</bk-button>
+        <bk-button @click="handleCancel" class="default-btn ml8">{{ t('取消') }}</bk-button>
       </div>
     </div>
   </div>
@@ -491,4 +491,17 @@ init();
     background: #3a84ff;
   }
 }
+
+.last-step {
+  font-size: 0;
+  .default-btn {
+    min-width: 88px;
+  }
+  .prev-btn {
+    min-width: 74px;
+  }
+  .ml8 {
+    margin-left: 8px;
+  }
+}
 </style>

src/dashboard-front/src/views/main.vue

@@ -303,6 +303,10 @@ const handleBack = () => {
     .submenu-header-content{
       color: rgb(99, 101, 110);
     }
+    .submenu-header-collapse {
+      width: 20px;
+      font-size: 20px;
+    }
     .bk-menu-submenu.is-opened {
       background: #fff !important;
     }

src/dashboard-front/src/views/operate-data/report/index.vue

@@ -263,7 +263,7 @@ const getDataByDimension = async () => {
     });
     return false;
   }
-  metricsList.value?.map((metrics: any) => {
+  const requests = metricsList.value?.map((metrics: any) => {
     const params = {
       ...searchParams,
       dimension: dimension.value,
@@ -274,13 +274,10 @@ const getDataByDimension = async () => {
   });
 
   try {
-    // const res = await Promise.all(requests);
+    const res = await Promise.all(requests);
     chartData.value = {};
-    metricsList.value?.forEach((metrics: any) => {
-      // chartData.value[metrics] = res[index];
-      chartData.value[metrics] = {
-        metrics: [], series: [],
-      };
+    metricsList.value?.forEach((metrics: any, index: number) => {
+      chartData.value[metrics] = res[index];
     });
 
     renderChart();
@@ -557,7 +554,7 @@ const getChartOption = (chartId: any, chartInstId: any) => {
       right: 40,
       feature: {
         dataZoom: {
-          yAxisIndex: false,
+          yAxisIndex: 'none',
         },
       },
     },

src/dashboard-front/src/views/operate-records/index.vue

@@ -22,6 +22,7 @@
         </bk-form-item>
         <bk-form-item class="ag-form-item-search">
           <bk-search-select
+            style="width: 100%"
             v-model="searchValue"
             unique-select
             class="operate-records-search"
@@ -469,7 +470,7 @@ watch(
     :deep(.search-form) {
       width: 100% !important;
       max-width: 100% !important;
-      display: inline-block;
+      display: flex;
 
       .bk-form-item {
         display: inline-flex;
@@ -485,6 +486,7 @@ watch(
           width: auto !important;
           line-height: 32px;
           display: inline-block;
+          min-width: 75px;
           padding: 0 15px 0 0;
 
           span {
@@ -512,10 +514,21 @@ watch(
         }
       }
 
-      .top-search-input {
-        width: 600px;
+      .ag-form-item-datepicker {
+        .bk-form-content {
+          max-width: 320px;
+        }
       }
 
+      .ag-form-item-search {
+        width: calc(100% - 320px);
+        .bk-form-content {
+          width: 100%;
+          .operate-records-search {
+            background: #ffffff;
+          }
+        }
+      }
     }
   }
 
@@ -535,13 +548,6 @@ watch(
     }
   }
 
-  .ag-form-item-search {
-    .operate-records-search {
-      width: calc(100vh - 20px);
-      background: #ffffff;
-    }
-  }
-
   .ag-dot {
     width: 8px;
     height: 8px;
@@ -605,11 +611,11 @@ watch(
       margin-top: 10px;
     }
 
-    .ag-form-item-search {
-      .operate-records-search {
-        width: calc(100vh - 144px);
-      }
-    }
+    // .ag-form-item-search {
+    //   .operate-records-search {
+    //     width: calc(100vh - 144px);
+    //   }
+    // }
   }
 }
 </style>

src/dashboard-front/src/views/permission/apply/index.vue

@@ -57,7 +57,7 @@
               @selection-change="(e: SelectionType) => handleRowSelectionChange(row, e)"
             >
               <bk-table-column type="index" label="" width="60" />
-              <bk-table-column type="selection" width="50" />
+              <bk-table-column type="selection" width="50" align="center" />
               <bk-table-column prop="name" :label="t('资源名称')" />
               <bk-table-column prop="path" :label="t('请求路径')" />
               <bk-table-column prop="method" :label="t('请求方法')" />

src/dashboard-front/src/views/resource/setting/comps/base-info.vue

@@ -3,16 +3,21 @@
   <bk-form ref="formRef" :model="formData" :rules="rules" class="resource-baseinfo">
     <bk-form-item
       :label="t('名称')"
-      :description="t('由小写字母、数字、连接符（-）组成，首字符必须是字母，长度大于3小于30个字符')"
       property="name"
       required
     >
-      <bk-input
-        v-model="formData.name"
-        :placeholder="t('请输入名称')"
-        class="name"
-        clearable
-      />
+      <bk-popover
+        placement="top-start"
+        trigger="click"
+        theme="light"
+        :content="t('由小写字母、数字、连接符（-）组成，首字符必须是字母，长度大于3小于30个字符')">
+        <bk-input
+          v-model="formData.name"
+          :placeholder="t('请输入')"
+          class="name"
+          clearable
+        />
+      </bk-popover>
     </bk-form-item>
     <bk-form-item
       :label="t('描述')"

src/dashboard-front/src/views/resource/setting/detail.vue

@@ -304,6 +304,8 @@ watch(
 <style lang="scss" scoped>
 .detail-container{
     max-width: 1000px;
+    height: calc(100vh - 175px);
+    overflow: auto;
     .title {
       color: #313238;
       font-weight: 700;
@@ -321,6 +323,19 @@ watch(
           padding-right: 10px;
           display: flex;
           justify-content: flex-end;
+          .bk-form-label-description {
+            border-bottom: none;
+            position: relative;
+            &::after {
+              content: ' ';
+              position: absolute;
+              width: 82%;
+              height: 1px;
+              border-bottom: 1px dashed #979ba5;
+              bottom: 4px;
+              left: 0;
+            }
+          }
         }
       }
       .label-cls{

src/dashboard-front/src/views/resource/setting/index.vue

@@ -5,7 +5,10 @@
     :is-detail="isDetail"
   />
   <div
-    :class="['resource-container', 'page-wrapper-padding', isDragging ? 'dragging' : '']"
+    :class="['resource-container',
+             'page-wrapper-padding',
+             isDragging ? 'dragging' : '',
+             isDetail && !isShowLeft ? 'welt' : '']"
     id="resourceId">
 
     <div
@@ -1266,6 +1269,8 @@ onBeforeMount(() => {
   .left-wraper{
     position: relative;
     background: #fff;
+    height: calc(100vh - 220px);
+    overflow-y: auto;
     // padding-bottom: 24px;
     .document-info{
       color: #3a84ff;
@@ -1405,4 +1410,7 @@ onBeforeMount(() => {
 .resource-container.dragging {
   cursor: col-resize;
 }
+.welt {
+  padding-left: 0px;
+}
 </style>