feat: 1.15需求开发 && eslint 修复

src/dashboard-front/.eslintignore

@@ -12,4 +12,4 @@ src/views/permission/apply/index.vue
 src/assets/**
 *bak*
 src/views/resource/setting/detail.vue
-src/views/resource/setting/import.vue
+src/views/resource/setting/comps/table-res-to-action.vue

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

@@ -138,6 +138,10 @@ const lang: ILANG = {
   '个资源': ['resources'],
   '批量编辑资源': ['Batch Edit Resource'],
   '确定要删除实例': ['Confirm to delete the instance'],
+  '批量编辑资源（共{count}个）': ['Batch edit resources (total {count})'],
+  '确定要删除以下{count}个资源': ['Be sure to delete the following {count} resources'],
+  '删除资源后，需要生成新的版本，并发布到目标环境才能生效': ['After a resource is deleted, a new version must be generated and released to the target environment to take effect'],
+  '是否修改标签': ['Whether to modify labels'],
   '请输入资源名称或请求路径，回车结束': ['Please input resource name or path, press Enter to search'],
   '全部差异类型': ['All Diff Types'],
   '仅显示有差异的资源属性': ['Only show differences'],

src/dashboard-front/src/views/backend-service/add.vue

@@ -110,7 +110,7 @@
                                   :rules="configRules.weight"
                                   :property="`configs.hosts.${i}.weight`"
                                   label=""
-                                  style="margin-bottom: 0px;">
+                                  class="weight-input">
                                   <bk-input
                                     class="suffix-slot-cls weights-input"
                                     :placeholder="t('权重')"
@@ -653,15 +653,25 @@ defineExpose({
     display: none;
   }
 }
+.weight-input {
+  margin-bottom: 0px;
+  border-left: 1px solid #c4c6cc !important;
+  :deep(.bk-form-content) {
+    margin-top: -1px;
+  }
+}
 .suffix-slot-cls {
   width: 80px;
   line-height: 30px;
   font-size: 12px;
   color: #63656e;
   text-align: center;
-  height: 28px;
+  height: 30px;
   border: none;
-  border-left: 1px solid #c4c6cc !important;
+  box-shadow: none !important;
+  :deep(.bk-input--text) {
+    border-radius: 0;
+  }
 }
 .scheme-select-cls {
   color: #63656e;

src/dashboard-front/src/views/resource/setting/comps/select-check-box.vue

@@ -110,6 +110,8 @@ const props = defineProps({
   // 是否强制让 select 进入 focus 态
   // 用于某些场景下 select 框不展示 focus 态样式的问题
   forceFocus: { type: Boolean, default: false },
+  // 批量编辑标签时，不需要更新某一资源的标签列表
+  bathEdit: { type: Boolean, default: false },
 });
 
 const { curSelectLabelIds, resourceId, labelsData, width, isAdd, modelValue } = toRefs(props);
@@ -154,7 +156,7 @@ const handleToggle = async (v: boolean) => {
     _forceFocus.value = false;
   }
   // 新增标签标识
-  if (isAdd.value) return;
+  if (isAdd.value || props.bathEdit) return;
   setTimeout(async () => {
     // 关闭下拉框且
     if (!v) {
@@ -190,7 +192,7 @@ const addOption = async () => {
       width: 'auto',
     });
     optionName.value = '';
-    if (curLabelIds.value.length < 10) {
+    if (curLabelIds.value.length < 10 && !props.bathEdit) {
       curLabelIds.value.push(ret.id);
       if (!isAdd.value) {
         await updateResourcesLabels(apigwId, resourceId.value, { label_ids: curLabelIds.value });