vxe-table 3.20.2 → 3.20.3

package/es/table/module/filter/mixin.js

@@ -107,7 +107,7 @@ export default {
                 const tableEl = $xeTable.$refs.refElem;
                 const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                 const filterOpts = $xeTable.computeFilterOpts;
-                const { transfer } = filterOpts;
+                const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
                 const currEl = btnEl || colEl;
                 const tableRect = tableEl.getBoundingClientRect();
                 const filterRender = column ? column.filterRender : null;
@@ -164,14 +164,23 @@ export default {
                             }
                         }
                     }
-                    filterStore.style = {
+                    const fStys = {
                         top: toCssUnit(top),
                         left: toCssUnit(left)
                     };
+                    if (zIndex) {
+                        fStys.zIndex = zIndex;
+                    }
+                    filterStore.style = fStys;
                     // 筛选面板是自适应表格高度
                     if (compConf ? !compConf.tableFilterAutoHeight : false) {
                         maxHeight = 0;
                     }
+                    else {
+                        if (customMaxHeight) {
+                            maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+                        }
+                    }
                     // 判断面板不能大于表格高度
                     filterStore.maxHeight = maxHeight;
                 });

package/es/table/module/menu/mixin.js

@@ -172,7 +172,7 @@ export default {
             const isContentMenu = $xeTable.computeIsContentMenu;
             const menuOpts = $xeTable.computeMenuOpts;
             const config = menuOpts[type];
-            const { transfer, visibleMethod } = menuOpts;
+            const { zIndex, transfer, visibleMethod } = menuOpts;
             if (config) {
                 const { options, disabled } = config;
                 if (disabled) {
@@ -202,7 +202,7 @@ export default {
                                     selectChild: null,
                                     showChild: false,
                                     style: {
-                                        zIndex: internalData.tZindex,
+                                        zIndex: zIndex || internalData.tZindex,
                                         top: `${top}px`,
                                         left: `${left}px`
                                     }

package/es/table/src/methods.js

@@ -5108,6 +5108,48 @@ const tableMethods = {
         }
         return cellLabel;
     },
+    updateCellLabel(row, fieldOrColumn) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (!column) {
+            return null;
+        }
+        const { fullAllDataRowIdData } = internalData;
+        const rowid = getRowid($xeTable, row);
+        if (rowid) {
+            const colid = column.id;
+            const rowid = getRowid($xeTable, row);
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (rowRest) {
+                const formatData = rowRest.formatData;
+                if (formatData) {
+                    delete formatData[colid];
+                }
+            }
+        }
+        return $xeTable.getFooterCellLabel(row, column);
+    },
+    clearFormatterCache(isUpdate) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { tableData, tableColumn } = reactData;
+        const { fullAllDataRowIdData } = internalData;
+        XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+            if (rowRest.formatData) {
+                rowRest.formatData = undefined;
+            }
+        });
+        if (isUpdate) {
+            tableData.forEach(row => {
+                tableColumn.forEach(column => {
+                    $xeTable.getCellLabel(row, column);
+                });
+            });
+        }
+        return $xeTable.$nextTick();
+    },
     getFooterCellLabel(row, fieldOrColumn) {
         const $xeTable = this;
         const reactData = $xeTable;
@@ -5179,6 +5221,47 @@ const tableMethods = {
         }
         return cellLabel;
     },
+    updateFooterCellLabel(row, fieldOrColumn) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (!column) {
+            return null;
+        }
+        const { footerTableData } = reactData;
+        const { footerFullDataRowData } = internalData;
+        const colid = column.id;
+        const $rowIndex = footerTableData.indexOf(row);
+        const rowRest = footerFullDataRowData[$rowIndex];
+        if (rowRest) {
+            const formatData = rowRest.formatData;
+            if (formatData) {
+                delete formatData[colid];
+            }
+        }
+        return $xeTable.getFooterCellLabel(row, column);
+    },
+    clearFooterFormatterCache(isUpdate) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { tableData, tableColumn } = reactData;
+        const { footerFullDataRowData } = internalData;
+        XEUtils.each(footerFullDataRowData, (rowRest) => {
+            if (rowRest.formatData) {
+                rowRest.formatData = undefined;
+            }
+        });
+        if (isUpdate) {
+            tableData.forEach(row => {
+                tableColumn.forEach(column => {
+                    $xeTable.getFooterCellLabel(row, column);
+                });
+            });
+        }
+        return $xeTable.$nextTick();
+    },
     /**
      * 检查是否为临时行数据
      */

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.20.2";
+export const version = "3.20.3";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -155,7 +155,8 @@ VxeUI.setConfig({
             // transfer: false,
             destroyOnClose: true,
             multiple: true,
-            showIcon: true
+            showIcon: true,
+            maxHeight: 280
         },
         floatingFilterConfig: {
         // enabled: false

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.20.2";
+const version = "3.20.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2160,7 +2160,8 @@ core_.VxeUI.setConfig({
       // transfer: false,
       destroyOnClose: true,
       multiple: true,
-      showIcon: true
+      showIcon: true,
+      maxHeight: 280
     },
     floatingFilterConfig: {
       // enabled: false
@@ -2745,7 +2746,7 @@ function scrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.20.2"}`;
+const log_version = `table v${"3.20.3"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6587,8 +6588,8 @@ if(eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_x
      * @param {Array/Row} rows 行数据
      * @param {String} field 字段名
      */clearData(rows,field){const $xeTable=this;const internalData=$xeTable;const{tableFullData,visibleColumn}=internalData;if(!arguments.length){rows=tableFullData;}else if(rows&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)){rows=[rows];}if(field){rows.forEach(row=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row,field,null));}else{rows.forEach(row=>{visibleColumn.forEach(column=>{if(column.field){setCellValue(row,column,null);}});});}return $xeTable.$nextTick();},getCellElement(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const{elemStore}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const rowid=getRowid($xeTable,row);const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);const leftScrollElem=getRefElem(elemStore['left-body-scroll']);const rightScrollElem=getRefElem(elemStore['right-body-scroll']);let bodyElem;if(column){if(column.fixed){if(column.fixed==='left'){if(leftScrollElem){bodyElem=leftScrollElem;}}else{if(rightScrollElem){bodyElem=rightScrollElem;}}}if(!bodyElem){bodyElem=bodyScrollElem;}if(bodyElem){return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);}}return null;},getCellLabel(row,fieldOrColumn){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{editConfig}=props;const{formatter,editRender,cellRender}=column;// formatter > tableCellFormatter
-const renderOpts=formatter?null:editConfig&&isEnableConf(editRender)?editRender:isEnableConf(cellRender)?cellRender:null;const compConf=renderOpts?methods_renderer.get(renderOpts.name):null;const tcFormatter=compConf?compConf.tableCellFormatter:null;const cellValue=getCellValue(row,column);let cellLabel=cellValue;if(formatter||tcFormatter){let formatData;const{fullAllDataRowIdData}=internalData;const rowid=getRowid($xeTable,row);const colid=column.id;const rowRest=fullAllDataRowIdData[rowid];if(rowRest){formatData=rowRest.formatData;if(!formatData){formatData=fullAllDataRowIdData[rowid].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===cellValue){return formatData[colid].label;}}}const formatParams={$table:$xeTable,cellValue,row,rowIndex:$xeTable.getRowIndex(row),column,columnIndex:$xeTable.getColumnIndex(column)};if(formatter){if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)){const gFormatOpts=methods_formats.get(formatter);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams):'';}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)){const gFormatOpts=methods_formats.get(formatter[0]);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams,...formatter.slice(1)):'';}else{cellLabel=formatter(formatParams);}}else if(renderOpts&&tcFormatter){cellLabel=tcFormatter(renderOpts,formatParams);}if(formatData){formatData[colid]={value:cellValue,label:cellLabel};}}return cellLabel;},getFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
-if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row)){itemValue=row[_columnIndex];}else{itemValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,column.field);}let cellLabel=itemValue;if(footerFormatter){let formatData;const{footerTableData}=reactData;const{footerFullDataRowData}=internalData;const colid=column.id;const $rowIndex=footerTableData.indexOf(row);let rowRest=null;if($rowIndex>-1){rowRest=footerFullDataRowData[$rowIndex];if(!rowRest){rowRest=footerFullDataRowData[$rowIndex]={};}formatData=rowRest.formatData;if(!formatData){formatData=footerFullDataRowData[$rowIndex].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===itemValue){return formatData[colid].label;}}}const footerFormatParams={$table:$xeTable,cellValue:itemValue,itemValue,row,items:row,$rowIndex,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(footerFormatter)){const gFormatOpts=methods_formats.get(footerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams):'';}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter)){const gFormatOpts=methods_formats.get(footerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams,...footerFormatter.slice(1)):'';}else{cellLabel=footerFormatter(footerFormatParams);}if(formatData){formatData[colid]={value:itemValue,label:cellLabel};}}return cellLabel;},/**
+const renderOpts=formatter?null:editConfig&&isEnableConf(editRender)?editRender:isEnableConf(cellRender)?cellRender:null;const compConf=renderOpts?methods_renderer.get(renderOpts.name):null;const tcFormatter=compConf?compConf.tableCellFormatter:null;const cellValue=getCellValue(row,column);let cellLabel=cellValue;if(formatter||tcFormatter){let formatData;const{fullAllDataRowIdData}=internalData;const rowid=getRowid($xeTable,row);const colid=column.id;const rowRest=fullAllDataRowIdData[rowid];if(rowRest){formatData=rowRest.formatData;if(!formatData){formatData=fullAllDataRowIdData[rowid].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===cellValue){return formatData[colid].label;}}}const formatParams={$table:$xeTable,cellValue,row,rowIndex:$xeTable.getRowIndex(row),column,columnIndex:$xeTable.getColumnIndex(column)};if(formatter){if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)){const gFormatOpts=methods_formats.get(formatter);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams):'';}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)){const gFormatOpts=methods_formats.get(formatter[0]);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams,...formatter.slice(1)):'';}else{cellLabel=formatter(formatParams);}}else if(renderOpts&&tcFormatter){cellLabel=tcFormatter(renderOpts,formatParams);}if(formatData){formatData[colid]={value:cellValue,label:cellLabel};}}return cellLabel;},updateCellLabel(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{fullAllDataRowIdData}=internalData;const rowid=getRowid($xeTable,row);if(rowid){const colid=column.id;const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}}return $xeTable.getFooterCellLabel(row,column);},clearFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{fullAllDataRowIdData}=internalData;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(fullAllDataRowIdData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getCellLabel(row,column);});});}return $xeTable.$nextTick();},getFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
+if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row)){itemValue=row[_columnIndex];}else{itemValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,column.field);}let cellLabel=itemValue;if(footerFormatter){let formatData;const{footerTableData}=reactData;const{footerFullDataRowData}=internalData;const colid=column.id;const $rowIndex=footerTableData.indexOf(row);let rowRest=null;if($rowIndex>-1){rowRest=footerFullDataRowData[$rowIndex];if(!rowRest){rowRest=footerFullDataRowData[$rowIndex]={};}formatData=rowRest.formatData;if(!formatData){formatData=footerFullDataRowData[$rowIndex].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===itemValue){return formatData[colid].label;}}}const footerFormatParams={$table:$xeTable,cellValue:itemValue,itemValue,row,items:row,$rowIndex,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(footerFormatter)){const gFormatOpts=methods_formats.get(footerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams):'';}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter)){const gFormatOpts=methods_formats.get(footerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams,...footerFormatter.slice(1)):'';}else{cellLabel=footerFormatter(footerFormatParams);}if(formatData){formatData[colid]={value:itemValue,label:cellLabel};}}return cellLabel;},updateFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerTableData}=reactData;const{footerFullDataRowData}=internalData;const colid=column.id;const $rowIndex=footerTableData.indexOf(row);const rowRest=footerFullDataRowData[$rowIndex];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}return $xeTable.getFooterCellLabel(row,column);},clearFooterFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{footerFullDataRowData}=internalData;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(footerFullDataRowData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getFooterCellLabel(row,column);});});}return $xeTable.$nextTick();},/**
      * 检查是否为临时行数据
      */isInsertByRow(row){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const rowid=getRowid($xeTable,row);return!!reactData.insertRowFlag&&!!internalData.insertRowMaps[rowid];},isRemoveByRow(row){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const rowid=getRowid($xeTable,row);return!!reactData.removeRowFlag&&!!internalData.removeRowMaps[rowid];},/**
      * 删除所有新增的临时数据
@@ -11995,7 +11996,9 @@ const mixin_sourceType = 'table';
         } = getDomNode();
         const filterOpts = $xeTable.computeFilterOpts;
         const {
-          transfer
+          maxHeight: customMaxHeight,
+          transfer,
+          zIndex
         } = filterOpts;
         const currEl = btnEl || colEl;
         const tableRect = tableEl.getBoundingClientRect();
@@ -12050,13 +12053,21 @@ const mixin_sourceType = 'table';
               }
             }
           }
-          filterStore.style = {
+          const fStys = {
             top: toCssUnit(top),
             left: toCssUnit(left)
           };
+          if (zIndex) {
+            fStys.zIndex = zIndex;
+          }
+          filterStore.style = fStys;
           // 筛选面板是自适应表格高度
           if (compConf ? !compConf.tableFilterAutoHeight : false) {
             maxHeight = 0;
+          } else {
+            if (customMaxHeight) {
+              maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+            }
           }
           // 判断面板不能大于表格高度
           filterStore.maxHeight = maxHeight;
@@ -12638,6 +12649,7 @@ const {
       const menuOpts = $xeTable.computeMenuOpts;
       const config = menuOpts[type];
       const {
+        zIndex,
         transfer,
         visibleMethod
       } = menuOpts;
@@ -12677,7 +12689,7 @@ const {
                   selectChild: null,
                   showChild: false,
                   style: {
-                    zIndex: internalData.tZindex,
+                    zIndex: zIndex || internalData.tZindex,
                     top: `${top}px`,
                     left: `${left}px`
                   }