Merge pull request #1904 from hLinx/hotfix_3.6.x

bugfix: IP白名单列表增加备注列 #1902
TencentBlueKing · Apr 3, 2023 · 423e73f · 423e73f
2 parents c504802 + ab70b7d
commit 423e73f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/src/frontend/src/components/jb-edit/tag.vue b/src/frontend/src/components/jb-edit/tag.vue
@@ -239,7 +239,6 @@
           return;
         }
         copyMemo = _.cloneDeep(this.localValue);
-        console.log('form copyMemocopyMemo = ', copyMemo);
         execCopy(this.text);
       },
       /**

diff --git a/src/frontend/src/layout-new.vue b/src/frontend/src/layout-new.vue
@@ -270,8 +270,6 @@
         ENABLE_FEATURE_FILE_MANAGE: false,
       });
 
-      console.dir(context);
-
       /**
        * @desc 返回首页
        */

diff --git a/src/frontend/src/views/white-ip/index/components/operation.vue b/src/frontend/src/views/white-ip/index/components/operation.vue
@@ -75,7 +75,7 @@
           type="textarea" />
       </jb-form-item>
       <jb-form-item
-        :label="$t('whiteIP.备注')"
+        :label="$t('whiteIP.备注.label')"
         property="remark"
         required>
         <bk-input
@@ -252,7 +252,7 @@
             this.actionScope = data;
           });
       },
-            
+
       handleRangeChange (value) {
         if (value.length > 0) {
           this.$refs.whiteIpForm.clearError('actionScopeIdList');

diff --git a/src/frontend/src/views/white-ip/index/index.vue b/src/frontend/src/views/white-ip/index/index.vue
@@ -84,6 +84,13 @@
         :label="$t('whiteIP.目标业务.colHead')"
         prop="appText"
         show-overflow-tooltip />
+      <bk-table-column
+        v-if="allRenderColumnMap.remark"
+        key="remark"
+        align="left"
+        :label="$t('whiteIP.备注.colHead')"
+        prop="remark"
+        show-overflow-tooltip />
       <bk-table-column
         v-if="allRenderColumnMap.creator"
         key="creator"
@@ -264,6 +271,10 @@
           label: I18n.t('whiteIP.目标业务.colHead'),
           disabled: true,
         },
+        {
+          id: 'remark',
+          label: I18n.t('whiteIP.备注.colHead'),
+        },
         {
           id: 'creator',
           label: I18n.t('whiteIP.创建人'),

diff --git a/src/frontend/src/views/white-ip/local.js b/src/frontend/src/views/white-ip/local.js
@@ -38,7 +38,10 @@ export default {
     提交: 'Commit',
     云区域: 'Cloud Area',
     '输入IP，以“回车”分隔': 'Separate with new line...',
-    备注: 'Description',
+    备注: {
+      label: 'Description',
+      colHead: 'DESCRIPTION',
+    },
     IP必填: 'IP address field is required',
     备注必填: 'Description field is required',
     生效范围必填: 'Acting On is required',