Merge pull request #569 from xintaoLi/staging

bugfix(table): selection类型列 header-render失效 #559 & 配置化表格hover全选按钮会丢失填…
TencentBlueKing · Jul 31, 2024 · 54f6f5c · 54f6f5c
2 parents a2890d8 + 4ebb53b
commit 54f6f5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -197,5 +197,8 @@
   "vetur": {
     "tags": "./bkui-vue2-helper/tags.json",
     "attributes": "./bkui-vue2-helper/attributes.json"
+  },
+  "engines": {
+    "node": "<= 16.14"
   }
 }
diff --git a/src/components/table/table-column.js b/src/components/table/table-column.js
@@ -387,12 +387,14 @@ export default {
       let value = source[prop]
       if (value !== undefined) {
         if (prop === 'renderHeader') {
-          if (type === 'selection' && column[prop]) {
-            // eslint-disable-next-line max-len
-            console.warn('[Magic Warn][TableColumn]Selection column doesn\'t allow to set render-header function.')
-          } else {
-            value = column[prop] || value
-          }
+          // if (type === 'selection' && column[prop]) {
+          //   // eslint-disable-next-line max-len
+          //   console.warn('[Magic Warn][TableColumn]Selection column doesn\'t allow to set render-header function.')
+          // } else {
+          //   value = column[prop] || value
+          // }
+
+          value = column[prop] || value
         }
         column[prop] = prop === 'className' ? `${column[prop]} ${value}` : value
       }

diff --git a/src/ui/table.css b/src/ui/table.css
@@ -42,7 +42,7 @@ $tableDarkHeaderHover: #eaebf0;
     &.bk-table-dark-header {
         th {
             background-color: $tableDarkHeader;
-            :hover {
+            .cell:hover {
                 background-color: $tableDarkHeaderHover
             }
         }