releases 4.7.61

x-extends · Aug 5, 2024 · 1a4ea0f · 1a4ea0f
1 parent c9bf25a
commit 1a4ea0f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.60",
+  "version": "4.7.61",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.0.86"
+    "vxe-pc-ui": "^4.0.88"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

diff --git a/packages/table/src/footer.ts b/packages/table/src/footer.ts
@@ -172,7 +172,7 @@ export default defineComponent({
               const showAllTip = tooltipOpts.showAll
               const isColGroup = column.children && column.children.length
               const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX
-              const footOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow
+              const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow
               const footAlign = footerAlign || align || allFooterAlign || allAlign
               let showEllipsis = footOverflow === 'ellipsis'
               const showTitle = footOverflow === 'title'

diff --git a/packages/table/src/header.ts b/packages/table/src/header.ts
@@ -228,7 +228,7 @@ export default defineComponent({
               const { type, showHeaderOverflow, headerAlign, align, headerClassName } = column
               const isColGroup = column.children && column.children.length
               const fixedHiddenColumn = fixedType ? (column.fixed !== fixedType && !isColGroup) : !!column.fixed && overflowX
-              const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
+              const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
               const headAlign = headerAlign || align || allHeaderAlign || allAlign
               let showEllipsis = headOverflow === 'ellipsis'
               const showTitle = headOverflow === 'title'

diff --git a/packages/toolbar/src/toolbar.ts b/packages/toolbar/src/toolbar.ts
@@ -315,6 +315,7 @@ export default defineComponent({
                     round: item.round,
                     status: item.status,
                     content: item.name,
+                    permissionCode: item.permissionCode,
                     destroyOnClose: item.destroyOnClose,
                     placement: item.placement,
                     transfer: item.transfer,