From 92f675954bcc58aaeb38545f6492fa125cb34b8d Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Sun, 28 Apr 2024 16:43:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20IP=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=E8=8C=83=E5=9B=B4=E5=8C=B9=E9=85=8D=E9=80=89=E9=A1=B9?= =?UTF-8?q?=20#2872?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/components/system-log/index.vue | 6 +++++- src/frontend/src/css/bk-patch.css | 2 +- src/frontend/src/views/white-ip/index/index.vue | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/components/system-log/index.vue b/src/frontend/src/components/system-log/index.vue index c657b2b334..87e5c4ecaa 100644 --- 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 index 78329b6e18..49c52f98b5 100644 --- 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 index 51d8d780a5..ac32718685 100644 --- 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: 'SCRIPT_EXECUTE', + name: I18n.t('脚本执行'), + }, + { + id: 'FILE_DISTRIBUTIO', + name: I18n.t('文件分发'), + }, + ] + }, { name: I18n.t('whiteIP.目标业务.colHead'), id: 'appIdStr', From 5e2503419b467651d5dedee79234b5b993045808 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Mon, 29 Apr 2024 18:14:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20IP=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=E8=8C=83=E5=9B=B4=E5=8C=B9=E9=85=8D=E9=80=89=E9=A1=B9?= =?UTF-8?q?=20#2872?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/package.json | 4 ++-- src/frontend/src/views/white-ip/index/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontend/package.json b/src/frontend/package.json index 331adaa9d7..6eb17aa4c4 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -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/views/white-ip/index/index.vue b/src/frontend/src/views/white-ip/index/index.vue index ac32718685..e75f87ebe0 100644 --- a/src/frontend/src/views/white-ip/index/index.vue +++ b/src/frontend/src/views/white-ip/index/index.vue @@ -238,11 +238,11 @@ id: 'actionScopeStr', children: [ { - id: 'SCRIPT_EXECUTE', + id: '1', name: I18n.t('脚本执行'), }, { - id: 'FILE_DISTRIBUTIO', + id: '2', name: I18n.t('文件分发'), }, ] From 35de24671c336efe9bb164ab665811cf8626b5f5 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Mon, 6 May 2024 18:00:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=B8=BB=E6=9C=BA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=EF=BC=8C?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=A1=BF=E5=8F=B7=E4=BC=9A=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=A7=A3=E6=9E=90IP?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=20#2945=20#=20Reviewed,=20transaction=20id:?= =?UTF-8?q?=207115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/package.json b/src/frontend/package.json index 6eb17aa4c4..1b403ecaac 100644 --- 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",