vxe-table 4.14.0-beta.3 → 4.14.0-beta.4

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

@@ -93,8 +93,11 @@ hooks.add('tableEditModule', {
                 }
             });
         };
+        // const insertGroupRow = (newRecords: any[], isAppend: boolean) => {
+        // }
         const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
             const { treeConfig } = props;
+            const { isRowGroupStatus } = reactData;
             const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { transform, rowField, mapChildrenField } = treeOpts;
@@ -108,6 +111,14 @@ hooks.add('tableEditModule', {
                 if (treeConfig && transform) {
                     insertTreeRow(newRecords, false);
                 }
+                else if (isRowGroupStatus) {
+                    // 如果分组
+                    if (treeConfig) {
+                        throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                    }
+                    warnLog(getI18n('vxe.error.noGroup', ['remove']));
+                    // insertGroupRow(newRecords, false)
+                }
                 else {
                     newRecords.forEach(item => {
                         const rowid = getRowid($xeTable, item);
@@ -132,6 +143,14 @@ hooks.add('tableEditModule', {
                     if (treeConfig && transform) {
                         insertTreeRow(newRecords, true);
                     }
+                    else if (isRowGroupStatus) {
+                        // 如果分组
+                        if (treeConfig) {
+                            throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                        }
+                        warnLog(getI18n('vxe.error.noGroup', ['remove']));
+                        // insertGroupRow(newRecords, true)
+                    }
                     else {
                         newRecords.forEach(item => {
                             const rowid = getRowid($xeTable, item);
@@ -196,6 +215,13 @@ hooks.add('tableEditModule', {
                             insertTreeRow(newRecords, true);
                         }
                     }
+                    else if (isRowGroupStatus) {
+                        // 如果分组
+                        if (treeConfig) {
+                            throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                        }
+                        warnLog(getI18n('vxe.error.noGroup', ['remove']));
+                    }
                     else {
                         if (treeConfig) {
                             throw new Error(getI18n('vxe.error.noTree', ['insert']));
@@ -481,7 +507,7 @@ hooks.add('tableEditModule', {
              */
             remove(rows) {
                 const { treeConfig } = props;
-                const { editStore } = reactData;
+                const { editStore, isRowGroupStatus } = reactData;
                 const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const treeOpts = computeTreeOpts.value;
@@ -540,6 +566,10 @@ hooks.add('tableEditModule', {
                             }
                         });
                     }
+                    else if (isRowGroupStatus) {
+                        // 如果分组
+                        warnLog(getI18n('vxe.error.noGroup', ['remove']));
+                    }
                     else {
                         rows.forEach((row) => {
                             const tfIndex = $xeTable.findRowIndexOf(tableFullData, row);

package/es/table/src/body.js

@@ -333,7 +333,7 @@ export default defineVxeComponent({
                         h('div', {
                             colid,
                             rowid,
-                            class: 'vxe-cell--wrapper'
+                            class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
                         }, column.renderCell(cellParams))
                     ]));
                 if (showValidTip && errorValidItem) {

package/es/table/src/footer.js

@@ -182,7 +182,7 @@ export default defineVxeComponent({
                         : [
                             h('div', {
                                 colid,
-                                class: 'vxe-cell--wrapper'
+                                class: 'vxe-cell--wrapper vxe-footer-cell--wrapper'
                             }, column.renderFooter(cellParams))
                         ]),
                     /**

package/es/table/src/header.js

@@ -161,7 +161,7 @@ export default defineVxeComponent({
                         : [
                             h('div', {
                                 colid,
-                                class: 'vxe-cell--wrapper'
+                                class: 'vxe-cell--wrapper vxe-header-cell--wrapper'
                             }, column.renderHeader(cellParams))
                         ]),
                     /**

package/es/table/src/table.js

@@ -1586,7 +1586,20 @@ export default defineVxeComponent({
             }
         };
         const calcColumnAutoWidth = (column, wrapperEl) => {
-            const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);
+            const columnOpts = computeColumnOpts.value;
+            const { autoOptions } = columnOpts;
+            const { isCalcHeader, isCalcBody, isCalcFooter } = autoOptions || {};
+            const querySelections = [];
+            if (isCalcHeader) {
+                querySelections.push(`.vxe-header-cell--wrapper[colid="${column.id}"]`);
+            }
+            if (isCalcBody) {
+                querySelections.push(`.vxe-body-cell--wrapper[colid="${column.id}"]`);
+            }
+            if (isCalcFooter) {
+                querySelections.push(`.vxe-footer-cell--wrapper[colid="${column.id}"]`);
+            }
+            const cellElemList = querySelections.length ? wrapperEl.querySelectorAll(querySelections.join(',')) : [];
             let leftRightPadding = 0;
             const firstCellEl = cellElemList[0];
             if (firstCellEl && firstCellEl.parentElement) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.14.0-beta.3";
+export const version = "4.14.0-beta.4";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -71,6 +71,11 @@ VxeUI.setConfig({
             theme: 'beautify'
         },
         columnConfig: {
+            autoOptions: {
+                isCalcHeader: true,
+                isCalcBody: true,
+                isCalcFooter: true
+            },
             maxFixedSize: 4
         },
         cellConfig: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.14.0-beta.3";
+const version = "4.14.0-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3209,6 +3209,11 @@ core_.VxeUI.setConfig({
       theme: 'beautify'
     },
     columnConfig: {
+      autoOptions: {
+        isCalcHeader: true,
+        isCalcBody: true,
+        isCalcFooter: true
+      },
       maxFixedSize: 4
     },
     cellConfig: {
@@ -3623,7 +3628,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.14.0-beta.3"}`;
+const log_version = `table v${"4.14.0-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6945,7 +6950,7 @@ const renderType = 'body';
         }, isVNPreEmptyStatus ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           colid,
           rowid,
-          class: 'vxe-cell--wrapper'
+          class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
         }, column.renderCell(cellParams))]));
         if (showValidTip && errorValidItem) {
           const errRule = errorValidItem.rule;
@@ -7698,7 +7703,7 @@ const header_renderType = 'header';
           style: tcStyle
         }, isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           colid,
-          class: 'vxe-cell--wrapper'
+          class: 'vxe-cell--wrapper vxe-header-cell--wrapper'
         }, column.renderHeader(cellParams))]),
         /**
          * 列宽拖动
@@ -8154,7 +8159,7 @@ const footer_renderType = 'footer';
           style: tcStyle
         }, isVNPreEmptyStatus ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           colid,
-          class: 'vxe-cell--wrapper'
+          class: 'vxe-cell--wrapper vxe-footer-cell--wrapper'
         }, column.renderFooter(cellParams))]),
         /**
          * 列宽拖动
@@ -10994,7 +10999,7 @@ if(hasCustomSort){collectColumn=external_root_XEUtils_commonjs_xe_utils_commonjs
          * 更新数据列的 Map
          * 牺牲数据组装的耗时，用来换取使用过程中的流畅
          */const cacheColumnMap=()=>{const{tableFullColumn,collectColumn}=internalData;const fullColumnIdData=internalData.fullColumnIdData={};const fullColumnFieldData=internalData.fullColumnFieldData={};const mouseOpts=computeMouseOpts.value;const expandOpts=computeExpandOpts.value;const columnOpts=computeColumnOpts.value;const columnDragOpts=computeColumnDragOpts.value;const virtualYOpts=computeVirtualYOpts.value;const{isCrossDrag,isSelfToChildDrag}=columnDragOpts;const customOpts=computeCustomOpts.value;const{storage}=customOpts;const rowOpts=computeRowOpts.value;const isGroup=collectColumn.some(hasChildrenList);let isAllOverflow=!!props.showOverflow;let rowGroupColumn;let expandColumn;let treeNodeColumn;let checkboxColumn;let radioColumn;let htmlColumn;let hasFixed;const handleFunc=(column,index,items,path,parentColumn)=>{const{id:colid,field,fixed,type,treeNode,rowGroupNode}=column;const rest={$index:-1,_index:-1,column,colid,index,items,parent:parentColumn||null,width:0,oLeft:0};if(field){if(fullColumnFieldData[field]){errLog('vxe.error.colRepet',['field',field]);}fullColumnFieldData[field]=rest;}else{if(storage&&!type||columnOpts.drag&&(isCrossDrag||isSelfToChildDrag)){errLog('vxe.error.reqProp',[`${column.getTitle()||type||''} -> column.field=?`]);}}if(!hasFixed&&fixed){hasFixed=fixed;}if(!htmlColumn&&type==='html'){htmlColumn=column;}if(treeNode){if(treeNodeColumn){warnLog('vxe.error.colRepet',['tree-node',treeNode]);}if(!treeNodeColumn){treeNodeColumn=column;}}if(rowGroupNode){if(treeNodeColumn){warnLog('vxe.error.colRepet',['row-group-node',rowGroupNode]);}if(!rowGroupColumn){rowGroupColumn=column;}}if(type==='expand'){if(expandColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!expandColumn){expandColumn=column;}}if(type==='checkbox'){if(checkboxColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!checkboxColumn){checkboxColumn=column;}}else if(type==='radio'){if(radioColumn){warnLog('vxe.error.colRepet',['type',type]);}if(!radioColumn){radioColumn=column;}}if(isAllOverflow&&column.showOverflow===false){isAllOverflow=false;}if(fullColumnIdData[colid]){errLog('vxe.error.colRepet',['colId',colid]);}fullColumnIdData[colid]=rest;};if(isGroup){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn,(column,index,items,path,parentColumn,nodes)=>{column.level=nodes.length;handleFunc(column,index,items,path,parentColumn);});}else{tableFullColumn.forEach(handleFunc);}if(expandColumn&&expandOpts.mode!=='fixed'&&virtualYOpts.enabled){warnLog('vxe.error.notConflictProp',['column.type="expand','virtual-y-config.enabled=false']);}if(expandColumn&&expandOpts.mode!=='fixed'&&mouseOpts.area){errLog('vxe.error.errConflicts',['mouse-config.area','column.type=expand']);}if(htmlColumn){if(!columnOpts.useKey){errLog('vxe.error.reqProp',['column-config.useKey & column.type=html']);}if(!rowOpts.useKey){errLog('vxe.error.reqProp',['row-config.useKey & column.type=html']);}}reactData.isGroup=isGroup;reactData.rowGroupColumn=rowGroupColumn;reactData.treeNodeColumn=treeNodeColumn;reactData.expandColumn=expandColumn;reactData.isAllOverflow=isAllOverflow;};const updateHeight=()=>{internalData.customHeight=calcTableHeight('height');internalData.customMinHeight=calcTableHeight('minHeight');internalData.customMaxHeight=calcTableHeight('maxHeight');// 如果启用虚拟滚动，默认高度
-if(reactData.scrollYLoad&&!(internalData.customHeight||internalData.customMinHeight)){internalData.customHeight=300;}};const calcColumnAutoWidth=(column,wrapperEl)=>{const cellElemList=wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);let leftRightPadding=0;const firstCellEl=cellElemList[0];if(firstCellEl&&firstCellEl.parentElement){const cellStyle=getComputedStyle(firstCellEl.parentElement);leftRightPadding=Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft)+external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight));}let colWidth=column.renderAutoWidth-leftRightPadding;for(let i=0;i<cellElemList.length;i++){const celEl=cellElemList[i];colWidth=Math.max(colWidth,celEl?Math.ceil(celEl.scrollWidth)+4:0);}return colWidth+leftRightPadding;};const calcCellWidth=()=>{const autoWidthColumnList=computeAutoWidthColumnList.value;const{fullColumnIdData}=internalData;const el=refElem.value;if(el){el.setAttribute('data-calc-col','Y');autoWidthColumnList.forEach(column=>{const colid=column.id;const colRest=fullColumnIdData[colid];const colWidth=calcColumnAutoWidth(column,el);if(colRest){colRest.width=Math.max(colWidth,colRest.width);}column.renderAutoWidth=colWidth;});$xeTable.analyColumnWidth();el.removeAttribute('data-calc-col');}};/**
+if(reactData.scrollYLoad&&!(internalData.customHeight||internalData.customMinHeight)){internalData.customHeight=300;}};const calcColumnAutoWidth=(column,wrapperEl)=>{const columnOpts=computeColumnOpts.value;const{autoOptions}=columnOpts;const{isCalcHeader,isCalcBody,isCalcFooter}=autoOptions||{};const querySelections=[];if(isCalcHeader){querySelections.push(`.vxe-header-cell--wrapper[colid="${column.id}"]`);}if(isCalcBody){querySelections.push(`.vxe-body-cell--wrapper[colid="${column.id}"]`);}if(isCalcFooter){querySelections.push(`.vxe-footer-cell--wrapper[colid="${column.id}"]`);}const cellElemList=querySelections.length?wrapperEl.querySelectorAll(querySelections.join(',')):[];let leftRightPadding=0;const firstCellEl=cellElemList[0];if(firstCellEl&&firstCellEl.parentElement){const cellStyle=getComputedStyle(firstCellEl.parentElement);leftRightPadding=Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft)+external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight));}let colWidth=column.renderAutoWidth-leftRightPadding;for(let i=0;i<cellElemList.length;i++){const celEl=cellElemList[i];colWidth=Math.max(colWidth,celEl?Math.ceil(celEl.scrollWidth)+4:0);}return colWidth+leftRightPadding;};const calcCellWidth=()=>{const autoWidthColumnList=computeAutoWidthColumnList.value;const{fullColumnIdData}=internalData;const el=refElem.value;if(el){el.setAttribute('data-calc-col','Y');autoWidthColumnList.forEach(column=>{const colid=column.id;const colRest=fullColumnIdData[colid];const colWidth=calcColumnAutoWidth(column,el);if(colRest){colRest.width=Math.max(colWidth,colRest.width);}column.renderAutoWidth=colWidth;});$xeTable.analyColumnWidth();el.removeAttribute('data-calc-col');}};/**
          * 列宽算法，计算单元格列宽，动态分配可用剩余空间
          * 支持 px、%、固定 混合分配
          * 支持动态列表调整分配
@@ -15310,10 +15315,15 @@ edit_hook_hooks.add('tableEditModule', {
         }
       });
     };
+    // const insertGroupRow = (newRecords: any[], isAppend: boolean) => {
+    // }
     const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
       const {
         treeConfig
       } = props;
+      const {
+        isRowGroupStatus
+      } = reactData;
       const {
         tableFullTreeData,
         afterFullData,
@@ -15341,6 +15351,13 @@ edit_hook_hooks.add('tableEditModule', {
         // 如果为虚拟树
         if (treeConfig && transform) {
           insertTreeRow(newRecords, false);
+        } else if (isRowGroupStatus) {
+          // 如果分组
+          if (treeConfig) {
+            throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
+          }
+          warnLog(hook_getI18n('vxe.error.noGroup', ['remove']));
+          // insertGroupRow(newRecords, false)
         } else {
           newRecords.forEach(item => {
             const rowid = getRowid($xeTable, item);
@@ -15380,6 +15397,13 @@ edit_hook_hooks.add('tableEditModule', {
           // 如果为虚拟树
           if (treeConfig && transform) {
             insertTreeRow(newRecords, true);
+          } else if (isRowGroupStatus) {
+            // 如果分组
+            if (treeConfig) {
+              throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
+            }
+            warnLog(hook_getI18n('vxe.error.noGroup', ['remove']));
+            // insertGroupRow(newRecords, true)
           } else {
             newRecords.forEach(item => {
               const rowid = getRowid($xeTable, item);
@@ -15480,6 +15504,12 @@ edit_hook_hooks.add('tableEditModule', {
               warnLog('vxe.error.unableInsert');
               insertTreeRow(newRecords, true);
             }
+          } else if (isRowGroupStatus) {
+            // 如果分组
+            if (treeConfig) {
+              throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
+            }
+            warnLog(hook_getI18n('vxe.error.noGroup', ['remove']));
           } else {
             if (treeConfig) {
               throw new Error(hook_getI18n('vxe.error.noTree', ['insert']));
@@ -15814,7 +15844,8 @@ edit_hook_hooks.add('tableEditModule', {
           treeConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isRowGroupStatus
         } = reactData;
         const {
           tableFullTreeData,
@@ -15891,6 +15922,9 @@ edit_hook_hooks.add('tableEditModule', {
                 afterFullData.splice(afIndex, 1);
               }
             });
+          } else if (isRowGroupStatus) {
+            // 如果分组
+            warnLog(hook_getI18n('vxe.error.noGroup', ['remove']));
           } else {
             rows.forEach(row => {
               const tfIndex = $xeTable.findRowIndexOf(tableFullData, row);
@@ -21346,6 +21380,7 @@ const Toolbar = VxeToolbar;
       notCommands: '全局指令 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '树结构不支持 "{0}"',
+      noGroup: '数据分组后不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',
       checkProp: '当数据量过大时可能会导致复选框卡顿，建议设置参数 "{0}" 提升渲染速度',
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',