vxe-table 4.11.9 → 4.11.11

package/es/table/module/edit/hook.js

@@ -319,7 +319,7 @@ hooks.add('tableEditModule', {
             }
             return nextTick().then(() => $xeTable.updateCellAreas());
         };
-        const handleEditActive = (params, evnt, isFocus) => {
+        const handleEditActive = (params, evnt, isFocus, isPos) => {
             const { editConfig, mouseConfig } = props;
             const { editStore, tableColumn } = reactData;
             const editOpts = computeEditOpts.value;
@@ -410,7 +410,7 @@ hooks.add('tableEditModule', {
                         column.renderHeight = cell.offsetHeight;
                         actived.args = params;
                         actived.column = column;
-                        if (isFocus) {
+                        if (isPos) {
                             setTimeout(() => {
                                 $xeTable.handleFocus(params, evnt);
                             });
@@ -437,7 +437,7 @@ hooks.add('tableEditModule', {
                             columnIndex: $xeTable.getColumnIndex(column),
                             cell,
                             $table: $xeTable
-                        }, null, false);
+                        }, null, isPos, isPos);
                         internalData._lastCallTime = Date.now();
                     }
                     return nextTick();
@@ -775,10 +775,12 @@ hooks.add('tableEditModule', {
             setEditRow(row, fieldOrColumn) {
                 const { visibleColumn } = internalData;
                 let column = XEUtils.find(visibleColumn, column => isEnableConf(column.editRender));
+                let isPos = false;
                 if (fieldOrColumn) {
+                    isPos = true;
                     column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
                 }
-                return handleEditCell(row, column, false);
+                return handleEditCell(row, column, isPos);
             },
             setActiveCell(row, fieldOrColumn) {
                 if (process.env.NODE_ENV === 'development') {
@@ -822,7 +824,7 @@ hooks.add('tableEditModule', {
              * 处理激活编辑
              */
             handleEdit(params, evnt) {
-                return handleEditActive(params, evnt, true);
+                return handleEditActive(params, evnt, true, true);
             },
             /**
              * @deprecated

package/es/table/src/table.js

@@ -1819,16 +1819,10 @@ export default defineComponent({
                     if (layout === 'header') {
                         // 表头体样式处理
                         // 横向滚动渲染
-                        let tWidth = tableWidth;
                         let renderColumnList = tableColumn;
                         let isOptimizeMode = false;
                         if (isGroup) {
                             renderColumnList = visibleColumn;
-                            if (fixedType) {
-                                if (wrapperElem) {
-                                    wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
-                                }
-                            }
                         }
                         else {
                             // 如果是使用优化模式
@@ -1846,24 +1840,34 @@ export default defineComponent({
                                 if (isOptimizeMode) {
                                     renderColumnList = fixedColumn || [];
                                 }
-                                if (!isOptimizeMode) {
+                            }
+                        }
+                        const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
+                        if (fixedType) {
+                            if (isGroup) {
+                                if (wrapperElem) {
+                                    wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+                                }
+                            }
+                            else {
+                                if (isOptimizeMode) {
                                     if (wrapperElem) {
                                         wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
                                     }
                                 }
+                                else {
+                                    if (wrapperElem) {
+                                        wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+                                    }
+                                }
                             }
                         }
-                        tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
                         if (currScrollElem) {
                             currScrollElem.style.height = `${headerHeight}px`;
                         }
                         if (tableElem) {
                             tableElem.style.width = tWidth ? `${tWidth}px` : '';
                         }
-                        const repairElem = getRefElem(elemStore[`${name}-${layout}-repair`]);
-                        if (repairElem) {
-                            repairElem.style.width = `${tableWidth}px`;
-                        }
                         const listElem = getRefElem(elemStore[`${name}-${layout}-list`]);
                         if (isGroup && listElem) {
                             XEUtils.arrayEach(listElem.querySelectorAll('.col--group'), (thElem) => {
@@ -1905,7 +1909,6 @@ export default defineComponent({
                             fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : (tableHeight + headerHeight + footerHeight + osbHeight)}px`;
                             fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
                         }
-                        let tWidth = tableWidth;
                         let renderColumnList = tableColumn;
                         let isOptimizeMode = false;
                         // 如果是使用优化模式
@@ -1922,13 +1925,20 @@ export default defineComponent({
                             if (isOptimizeMode) {
                                 renderColumnList = fixedColumn || [];
                             }
-                            if (!isOptimizeMode) {
+                        }
+                        const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
+                        if (fixedType) {
+                            if (isOptimizeMode) {
                                 if (wrapperElem) {
                                     wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
                                 }
                             }
+                            else {
+                                if (wrapperElem) {
+                                    wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+                                }
+                            }
                         }
-                        tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
                         if (tableElem) {
                             tableElem.style.width = tWidth ? `${tWidth}px` : '';
                             // 兼容性处理
@@ -1940,7 +1950,6 @@ export default defineComponent({
                         }
                     }
                     else if (layout === 'footer') {
-                        let tWidth = tableWidth;
                         let renderColumnList = tableColumn;
                         let isOptimizeMode = false;
                         // 如果是使用优化模式
@@ -1957,13 +1966,20 @@ export default defineComponent({
                             if (isOptimizeMode) {
                                 renderColumnList = fixedColumn || [];
                             }
-                            if (!isOptimizeMode) {
+                        }
+                        const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
+                        if (fixedType) {
+                            if (isOptimizeMode) {
                                 if (wrapperElem) {
                                     wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
                                 }
                             }
+                            else {
+                                if (wrapperElem) {
+                                    wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+                                }
+                            }
                         }
-                        tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
                         if (currScrollElem) {
                             currScrollElem.style.height = `${footerHeight}px`;
                             // 如果是固定列

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.11.9";
+export const version = "4.11.11";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.11.9"}`;
+const version = `table v${"4.11.11"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);