fix:修复自监控ip勾选未显示问题、插件包列表已部署节点排序问题、删除按钮位置问题

# Reviewed, transaction id: 14700
wyyalt · Aug 9, 2024 · 451c09e · 451c09e
1 parent 7b3d1c5
commit 451c09e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/frontend/src/components/RussianDolls/DollForm.css b/frontend/src/components/RussianDolls/DollForm.css
@@ -37,7 +37,7 @@
     display: flex;
     align-items: center;
     flex: 1;
-    padding-right: 16px;
+    padding-right: 20px;
     background: #f5f7fa;
 
     & + .array-content-add {
@@ -74,7 +74,7 @@
 
 .array-content-delete {
   position: absolute;
-  left: 100%;
+  left: calc(100% - 20px);
 }
 .child-btns {
   display: flex;
@@ -84,3 +84,8 @@
   font-size: 16px;
   flex-shrink: 0;
 }
+
+/* 选择第一层的 .array-content-delete */
+.russian-dolls-form > .item-object > .item-array > .bk-form-content > .array-child-group > .array-child > .array-content-delete {
+  left: 100%;
+}
diff --git a/frontend/src/components/common/navigation.vue b/frontend/src/components/common/navigation.vue
@@ -187,11 +187,11 @@ export default class NodemanNavigation extends Mixins(routerBackMixin) {
   private langList = [
     {
       id: 'zh-cn', // zhCN
-      name: this.$t('中文'),
+      name: '中文',
     },
     {
       id: 'en', // enUS
-      name: this.$t('英文'),
+      name: 'English',
     },
   ];
   private userList: IUserItem[] = [

diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js
@@ -318,8 +318,6 @@ export default {
   版本日志: 'Release note',
   问题反馈: 'Feedback',
   开源社区: 'Open source community',
-  中文: 'Chinese',
-  英文: 'English',
   当前版本: 'Current',
   安装到业务: 'Install to business',
   接入点已在管控区域中设定: 'Access point has been set in the "BK-Net"',

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
@@ -318,8 +318,6 @@ export default {
   版本日志: '版本日志',
   问题反馈: '问题反馈',
   开源社区: '开源社区',
-  中文: '中文',
-  英文: '英文',
   当前版本: '当前版本',
   安装到业务: '安装到业务',
   接入点已在管控区域中设定: '接入点已在「管控区域」中设定',

diff --git a/frontend/src/views/global-config/healthz/healthz-service-table.vue b/frontend/src/views/global-config/healthz/healthz-service-table.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, Ref } from 'vue-property-decorator';
+import { Vue, Component, Ref, Watch } from 'vue-property-decorator';
 import { ConfigStore } from '@/store/index';
 import ExceptionCard from '@/components/exception/exception-card.vue';
 
@@ -40,7 +40,8 @@ export default class HealthzServiceTable extends Vue {
     return ConfigStore.allIPs.map(item => ({ ip: item }));
   }
 
-  private mounted() {
+  @Watch('tableData', { deep: true, immediate: true })
+  private toggleSelect() {
     this.$nextTick(() => {
       this.toggleSelection(this.tableData);
     });
@@ -51,9 +52,7 @@ export default class HealthzServiceTable extends Vue {
   }
   public toggleSelection(rows?: Dictionary[]) {
     if (rows) {
-      rows.forEach((row) => {
-        this.serviceTable.toggleRowSelection(row);
-      });
+      this.serviceTable.toggleAllSelection(rows);
     } else {
       this.serviceTable.clearSelection();
     }

diff --git a/frontend/src/views/plugin/plugin-package/plugin-package-table.vue b/frontend/src/views/plugin/plugin-package/plugin-package-table.vue
@@ -3,7 +3,7 @@
     <bk-table
       :class="`plugin-package-table head-customize-table ${fontSize}`"
       :max-height="tableMaxHeight"
-      :data="tableList"
+      :data="tableData"
       :pagination="pagination"
       :row-class-name="rowClassName"
       :span-method="colspanHandle"
@@ -157,6 +157,12 @@ export default class PackageTable extends Mixins(HeaderRenderMixin) {
   @Prop({ default: () => ([]), type: Array }) private readonly tableList!: IPluginRow[];
   @Prop({ default: () => ({}), type: Object }) private readonly pagination!: IPagination;
   @Prop({ default: true, type: Boolean }) private readonly isLoading!: boolean;
+  private get tableData () {
+    return this.tableList.map(item => ({
+      ...item,
+      nodes_number: item.nodes_number || 0,
+    }));
+  }
   private localMark = 'package_table';
   private filterField = [
     { checked: true, disabled: true, mockChecked: true, name: this.$t('插件别名'), id: 'description' },