fix: 资源配置批操作修改&加权轮询控件调整 (#913)

TencentBlueKing · Sep 12, 2024 · ba6c59c · ba6c59c
1 parent fac47b0
commit ba6c59c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/src/dashboard-front/src/views/backend-service/add.vue b/src/dashboard-front/src/views/backend-service/add.vue
@@ -656,17 +656,17 @@ defineExpose({
 .weight-input {
   margin-bottom: 0px;
   border-left: 1px solid #c4c6cc !important;
-  :deep(.bk-form-content) {
-    margin-top: -1px;
-  }
+  // :deep(.bk-form-content) {
+  //   margin-top: -1px;
+  // }
 }
 .suffix-slot-cls {
   width: 80px;
-  line-height: 30px;
+  line-height: 28px;
   font-size: 12px;
   color: #63656e;
   text-align: center;
-  height: 30px;
+  height: 28px;
   border: none;
   box-shadow: none !important;
   :deep(.bk-input--text) {

diff --git a/src/dashboard-front/src/views/resource/setting/index.vue b/src/dashboard-front/src/views/resource/setting/index.vue
@@ -93,6 +93,7 @@
             <ag-dropdown
               :text="t('导入')"
               :dropdown-list="importDropData"
+              v-show="!showBatch"
               @on-change="handleImport"></ag-dropdown>
             <ag-dropdown
               :text="t('导出')"
@@ -471,6 +472,7 @@
             <div class="edit-labels-container">
               <bk-switcher
                 v-model="batchEditData.isUpdateLabels"
+                @change="handleUpdateLabelsChange"
                 theme="primary"
               />
               <SelectCheckBox
@@ -1177,6 +1179,7 @@ const handleBatchConfirm = async () => {
   }
   dialogData.isShow = false;
   batchEditData.value.isUpdateLabels = false;
+  batchEditData.value.labelIds = [];
   Message({
     message: t(`${isBatchDelete.value ? '删除' : '编辑'}成功`),
     theme: 'success',
@@ -1300,6 +1303,12 @@ const handleDeleteSuccess = () => {
   handleShowList();
 };
 
+const handleUpdateLabelsChange = (v: Boolean) => {
+  if (!v) {
+    batchEditData.value.labelIds = [];
+  }
+};
+
 const handleRowClass = (v: any) => {
   const ret = [];
   if (!v.is24HoursAgo) {

diff --git a/src/dashboard-front/src/views/stage/overview/comps/edit-stage-sideslider.vue b/src/dashboard-front/src/views/stage/overview/comps/edit-stage-sideslider.vue
@@ -853,11 +853,11 @@ defineExpose({
     }
   }
 
-  .weights-input {
-    :deep(.bk-input--number-control) {
-      display: none;
-    }
-  }
+  // .weights-input {
+  //   :deep(.bk-input--number-control) {
+  //     display: none;
+  //   }
+  // }
 
   &.check-mode {
     .title {
@@ -893,17 +893,17 @@ defineExpose({
 .weight-input {
   margin-bottom: 0px;
   border-left: 1px solid #c4c6cc !important;
-  :deep(.bk-form-content) {
-    margin-top: -1px;
-  }
+  // :deep(.bk-form-content) {
+  //   margin-top: -1px;
+  // }
 }
 .suffix-slot-cls {
   width: 80px;
-  line-height: 30px;
+  line-height: 28px;
   font-size: 12px;
   color: #63656e;
   text-align: center;
-  height: 30px;
+  height: 28px;
   border: none;
   box-shadow: none !important;
   :deep(.bk-input--text) {