diff --git a/dev_log/2.1.360/daoqgong_202112161652.yaml b/dev_log/2.1.360/daoqgong_202112161652.yaml
new file mode 100644
index 000000000..5ab6716bf
--- /dev/null
+++ b/dev_log/2.1.360/daoqgong_202112161652.yaml
@@ -0,0 +1,3 @@
+---
+bugfix:
+ - "表格锁边及滚动问题 (fixed #364)"
diff --git a/frontend/src/css/app.css b/frontend/src/css/app.css
index 45c3d479d..21e5c55b2 100644
--- a/frontend/src/css/app.css
+++ b/frontend/src/css/app.css
@@ -220,6 +220,10 @@ body {
color: #979ba5;
}
}
+ .bk-table-fixed,
+ .bk-table-fixed-right {
+ bottom: 0!important;
+ }
}
/* table 做出展开角标 */
diff --git a/frontend/src/views/agent/agent-list.vue b/frontend/src/views/agent/agent-list.vue
index 466e03380..7369d725e 100644
--- a/frontend/src/views/agent/agent-list.vue
+++ b/frontend/src/views/agent/agent-list.vue
@@ -235,15 +235,20 @@
+ prop="inner_ip"
+ width="110"
+ show-overflow-tooltip>
+ width="110"
+ v-if="filter['login_ip'].mockChecked"
+ show-overflow-tooltip>
{{ row.login_ip | filterEmpty }}
@@ -1764,9 +1769,6 @@ export default class AgentList extends Mixins(pollMixin, TableHeaderMixins, auth
position: relative;
left: 3px;
}
->>> .bk-table-fixed-right-patch {
- display: none;
-}
.agent {
min-height: calc(100vh - 112px);
padding-bottom: 82px;
diff --git a/frontend/src/views/plugin/plugin-list/node-detail-table.vue b/frontend/src/views/plugin/plugin-list/node-detail-table.vue
index 61d902bf6..c013f69b2 100644
--- a/frontend/src/views/plugin/plugin-list/node-detail-table.vue
+++ b/frontend/src/views/plugin/plugin-list/node-detail-table.vue
@@ -322,9 +322,6 @@ export default class PluginRuleTable extends Vue {
}
>>> .bk-table-expanded-cell {
padding: 0 0 0 30px;
- .bk-table-fixed-right {
- border-bottom: 0;
- }
}
>>> .is-last .cell {
border-left: 0;
diff --git a/frontend/src/views/plugin/plugin-list/plugin-list-table.vue b/frontend/src/views/plugin/plugin-list/plugin-list-table.vue
index f285888e4..f0c828201 100644
--- a/frontend/src/views/plugin/plugin-list/plugin-list-table.vue
+++ b/frontend/src/views/plugin/plugin-list/plugin-list-table.vue
@@ -387,10 +387,6 @@ export default class PluginRuleTable extends Mixins(FormLabelMixin, HeaderRender
padding-left: 0;
}
}
- >>> .bk-table-fixed {
- /* stylelint-disable-next-line declaration-no-important */
- bottom: 0 !important;
- }
.checkbox-row-item {
display: flex;
.col-status {
diff --git a/frontend/src/views/plugin/plugin-rule/plugin-rule-create/version-detail-table.vue b/frontend/src/views/plugin/plugin-rule/plugin-rule-create/version-detail-table.vue
index 1ae5c730e..ecf3e95bd 100644
--- a/frontend/src/views/plugin/plugin-rule/plugin-rule-create/version-detail-table.vue
+++ b/frontend/src/views/plugin/plugin-rule/plugin-rule-create/version-detail-table.vue
@@ -13,16 +13,19 @@
class="detail-table-left"
v-test.policy="'chooseVersionTable'"
:row-class-name="handleRowClass"
+ :max-height="500"
@row-click="handleRowClick">
-
+
@@ -63,7 +66,7 @@