Merge pull request #2954 from hLinx/hotfix_3.8.x

Hotfix 3.8.x
TencentBlueKing · May 9, 2024 · 98125f1 · 98125f1
2 parents 7e56b75 + 35de246
commit 98125f1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -14,7 +14,7 @@
   "keywords": [],
   "license": "ISC",
   "dependencies": {
-    "@blueking/ip-selector": "0.2.0-beta",
+    "@blueking/ip-selector": "0.3.0-beta.21",
     "@blueking/notice-component-vue2": "2.0.0-beta.2",
     "@blueking/paas-login": "0.0.11",
     "@blueking/user-selector": "1.0.12",
@@ -102,8 +102,8 @@
     "postcss-url": "10.1.3",
     "speed-measure-webpack-plugin": "1.5.0",
     "style-loader": "4.0.0",
-    "stylelint": "16.3.1",
-    "stylelint-config-standard": "36.0.0",
+    "stylelint": "15.11.0",
+    "stylelint-config-standard": "34.0.0",
     "stylelint-order": "6.0.4",
     "stylelint-scss": "6.2.1",
     "stylelint-webpack-plugin": "5.0.0",

diff --git a/src/frontend/src/components/system-log/index.vue b/src/frontend/src/components/system-log/index.vue
@@ -242,7 +242,11 @@
     }
 
     .bk-dialog-body {
-      padding: 0;
+      padding: 0 !important;
+    }
+
+    .bk-dialog-footer {
+      display: none
     }
   }
 

diff --git a/src/frontend/src/css/bk-patch.css b/src/frontend/src/css/bk-patch.css
@@ -174,7 +174,7 @@
   }
 
   .bk-dialog {
-    top: unset;
+    top: unset !important;
     display: inline-block;
     margin: unset;
     text-align: initial;

diff --git a/src/frontend/src/views/white-ip/index/index.vue b/src/frontend/src/views/white-ip/index/index.vue
@@ -233,6 +233,20 @@
           id: 'ipStr',
           default: true,
         },
+        {
+          name: I18n.t('whiteIP.生效范围.colHead'),
+          id: 'actionScopeStr',
+          children: [
+            {
+              id: '1',
+              name: I18n.t('脚本执行'),
+            },
+            {
+              id: '2',
+              name: I18n.t('文件分发'),
+            },
+          ]
+        },
         {
           name: I18n.t('whiteIP.目标业务.colHead'),
           id: 'appIdStr',