releases 4.8.7

x-extends · Nov 8, 2024 · d440edc · d440edc
1 parent cbfb953
commit d440edc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.8.6",
+  "version": "4.8.7",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/table/module/custom/panel.ts b/packages/table/module/custom/panel.ts
@@ -28,7 +28,7 @@ export default defineComponent({
 
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 
-    const { reactData } = $xeTable
+    const { props: tableProps, reactData } = $xeTable
     const { computeCustomOpts, computeColumnOpts, computeIsMaxFixedColumn, computeResizableOpts } = $xeTable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
@@ -546,6 +546,7 @@ export default defineComponent({
 
     const renderPopupPanel = () => {
       const { customStore } = props
+      const { resizable: allResizable } = tableProps
       const { customColumnList } = reactData
       const customOpts = computeCustomOpts.value
       const { modalOptions, drawerOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts
@@ -679,7 +680,10 @@ export default defineComponent({
                 ? h('td', {
                   class: 'vxe-table-custom-popup--column-item col--resizable'
                 }, [
-                  column.children && column.children.length
+                  (
+                    (column.children && column.children.length) ||
+                    !(XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
+                  )
                     ? h('span', '-')
                     : (
                         VxeUINumberInputComponent

diff --git a/packages/table/src/header.ts b/packages/table/src/header.ts
@@ -168,7 +168,7 @@ export default defineComponent({
 
     const renderVN = () => {
       const { fixedType, fixedColumn, tableColumn } = props
-      const { resizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
+      const { resizable: allResizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
       const { isGroup, currentColumn, scrollXLoad, overflowX, scrollbarWidth } = tableReactData
       const { visibleColumn } = tableInternalData
       const columnOpts = computeColumnOpts.value
@@ -293,7 +293,7 @@ export default defineComponent({
                 /**
                  * 列宽拖动
                  */
-                !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || resizable))
+                !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
                   ? h('div', {
                     class: ['vxe-resizable', {
                       'is--line': !border || border === 'none'