vxe-table 3.21.14 → 3.21.16

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.14";
+const version = "3.21.16";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4074,7 +4074,7 @@ function wheelScrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.21.14"}`;
+const log_version = `table v${"3.21.16"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -7857,7 +7857,12 @@ remainList.forEach(column=>{const width=Math.max(meanWidth,minCellWidth);column.
  * 处理显示 tooltip
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
- */function handleTooltip($xeTable,evnt,tipOpts,type,tdEl,overflowElem,tipElem,params){const reactData=$xeTable;const tipOverEl=overflowElem||tdEl;if(!tipOverEl){return $xeTable.$nextTick();}params.cell=tdEl;const{tooltipStore}=reactData;const{column,row}=params;const{showAll,contentMethod}=tipOpts;const customContent=contentMethod?contentMethod(params):null;const useCustom=contentMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent);const content=useCustom?customContent:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(column.type==='html'?tipOverEl.innerText:tipOverEl.textContent).trim();const isOver=tipOverEl.scrollWidth>tipOverEl.clientWidth;if(content&&(showAll||useCustom||isOver)){const tipContent=formatText(content);Object.assign(tooltipStore,{row,column,visible:true,content:tipContent,type,currOpts:tipOpts});$xeTable.$nextTick(()=>{const $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return $xeTable.$nextTick();}function handleScrollToRowColumn($xeTable,fieldOrColumn,row,options){const internalData=$xeTable;const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,options?options.colAlign!==false:true,column,row);}return $xeTable.$nextTick();}function handleRowExpandReserve($xeTable,row,expanded){const internalData=$xeTable;const{rowExpandedReserveRowMap}=internalData;const expandOpts=$xeTable.computeExpandOpts;if(expandOpts.reserve){const rowid=getRowid($xeTable,row);if(expanded){rowExpandedReserveRowMap[rowid]=row;}else if(rowExpandedReserveRowMap[rowid]){delete rowExpandedReserveRowMap[rowid];}}}function handleDefaultMergeCells($xeTable){const props=$xeTable;const{mergeCells}=props;if(mergeCells){$xeTable.setMergeCells(mergeCells);}}function handleDefaultMergeHeaderItems($xeTable){const props=$xeTable;const{mergeHeaderCells}=props;if(mergeHeaderCells){$xeTable.setMergeHeaderCells(mergeHeaderCells);}}function handleDefaultMergeFooterItems($xeTable){const props=$xeTable;const{mergeFooterCells,mergeFooterItems}=props;const mFooterCells=mergeFooterCells||mergeFooterItems;if(mFooterCells){$xeTable.setMergeFooterCells(mFooterCells);}}// 计算可视渲染相关数据
+ */function handleTooltip($xeTable,evnt,tipOpts,type,tdEl,overflowElem,tipElem,params){const reactData=$xeTable;const tipOverEl=overflowElem||tdEl;if(!tipOverEl){return $xeTable.$nextTick();}params.cell=tdEl;const{tooltipStore}=reactData;const{column,row}=params;const{showAll,contentMethod}=tipOpts;const cellText=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(column.type==='html'?tipOverEl.innerText:tipOverEl.textContent).trim();const isOver=tipOverEl.scrollWidth>tipOverEl.clientWidth;let isShow=false;let customContent=null;let content='';if(contentMethod){customContent=contentMethod(params);}// 是否全部展示
+if(showAll){// 如果为 null 默认显示
+if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent)){isShow=true;content=cellText;}else if(customContent!==''&&customContent!==false){// 如果为 '' | false 则不显示
+isShow=true;content=''+customContent;}}else{// 如果为 null 使用默认逻辑
+if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent)){isShow=isOver;}else if(customContent!==''&&customContent!==false){// 如果为 '' | false 则不显示
+isShow=true;}content=cellText;}if(isShow&&content){const tipContent=formatText(content);Object.assign(tooltipStore,{row,column,visible:true,content:tipContent,type,currOpts:tipOpts});$xeTable.$nextTick(()=>{const $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return $xeTable.$nextTick();}function handleScrollToRowColumn($xeTable,fieldOrColumn,row,options){const internalData=$xeTable;const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,options?options.colAlign!==false:true,column,row);}return $xeTable.$nextTick();}function handleRowExpandReserve($xeTable,row,expanded){const internalData=$xeTable;const{rowExpandedReserveRowMap}=internalData;const expandOpts=$xeTable.computeExpandOpts;if(expandOpts.reserve){const rowid=getRowid($xeTable,row);if(expanded){rowExpandedReserveRowMap[rowid]=row;}else if(rowExpandedReserveRowMap[rowid]){delete rowExpandedReserveRowMap[rowid];}}}function handleDefaultMergeCells($xeTable){const props=$xeTable;const{mergeCells}=props;if(mergeCells){$xeTable.setMergeCells(mergeCells);}}function handleDefaultMergeHeaderItems($xeTable){const props=$xeTable;const{mergeHeaderCells}=props;if(mergeHeaderCells){$xeTable.setMergeHeaderCells(mergeHeaderCells);}}function handleDefaultMergeFooterItems($xeTable){const props=$xeTable;const{mergeFooterCells,mergeFooterItems}=props;const mFooterCells=mergeFooterCells||mergeFooterItems;if(mFooterCells){$xeTable.setMergeFooterCells(mFooterCells);}}// 计算可视渲染相关数据
 function computeScrollLoad($xeTable){const reactData=$xeTable;const internalData=$xeTable;return $xeTable.$nextTick().then(()=>{const{scrollXLoad,scrollYLoad}=reactData;const{scrollXStore,scrollYStore}=internalData;const virtualYOpts=$xeTable.computeVirtualYOpts;const virtualXOpts=$xeTable.computeVirtualXOpts;// 计算 X 逻辑
 if(scrollXLoad){const{toVisibleIndex:toXVisibleIndex,visibleSize:visibleXSize}=handleVirtualXVisible($xeTable);const offsetXSize=Math.max(0,virtualXOpts.oSize?external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.oSize):0);scrollXStore.preloadSize=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.preSize);scrollXStore.offsetSize=offsetXSize;scrollXStore.visibleSize=visibleXSize;scrollXStore.endIndex=Math.max(scrollXStore.startIndex+scrollXStore.visibleSize+offsetXSize,scrollXStore.endIndex);scrollXStore.visibleStartIndex=Math.max(scrollXStore.startIndex,toXVisibleIndex);scrollXStore.visibleEndIndex=Math.min(scrollXStore.endIndex,toXVisibleIndex+visibleXSize);$xeTable.updateScrollXData().then(()=>{loadScrollXData($xeTable);});}else{$xeTable.updateScrollXSpace();}// 计算 Y 逻辑
 const rowHeight=computeRowHeight($xeTable);scrollYStore.rowHeight=rowHeight;// 已废弃
@@ -9888,6 +9893,10 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
   const cellOpts = $xeTable.computeCellOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const headerCellOpts = $xeTable.computeHeaderCellOpts;
+  const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
+  const {
+    cellClassName
+  } = floatingFilterOpts;
   const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
   return cols.map((column, $columnIndex) => {
     const {
@@ -9952,7 +9961,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
       tcStyle.minHeight = `${currCellHeight}px`;
     }
     return h('th', {
-      class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
+      class: ['vxe-table--column vxe-header--column is--floating-filters', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
         [`col--${headAlign}`]: headAlign,
         [`col--${type}`]: type,
         'col--last': isLastColumn,
@@ -9966,7 +9975,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
       key: colid,
       attrs: thAttrs
     }, [h('div', {
-      class: ['vxe-cell', {
+      class: ['vxe-cell', '' + (cellClassName || ''), {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
@@ -10008,7 +10017,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups, renderColumn
   if (floatingFilterOpts.enabled) {
     rowVNs.push(h('tr', {
       key: 'ff',
-      class: ['vxe-header--row']
+      class: ['vxe-header--row is--floating-filters', '' + (floatingFilterOpts.rowClassName || '')]
     }, renderFilterRows(h, _vm, isOptimizeMode, renderColumnList)));
   }
   return rowVNs;
@@ -16675,7 +16684,8 @@ function toHtml($xeTable, opts, columns, datas) {
     isIndeterminate
   } = reactData;
   const {
-    mergeBodyCellMaps
+    mergeBodyCellMaps,
+    mergeFooterCellMaps
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
@@ -16816,15 +16826,37 @@ function toHtml($xeTable, opts, columns, datas) {
     const footers = getFooterData($xeTable, opts, footerTableData);
     if (footers.length) {
       tables.push('<tfoot>');
-      footers.forEach(row => {
+      footers.forEach((row, rIndex) => {
         tables.push(`<tr>${columns.map(column => {
           const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
           const classNames = hasEllipsis($xeTable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
           const cellValue = getFooterCellValue($xeTable, opts, row, column);
+          let rowSpan = 1;
+          let colSpan = 1;
+          if (isMerge) {
+            const _rowIndex = rIndex;
+            const _columnIndex = $xeTable.getVTColumnIndex(column);
+            const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
+            if (spanRest) {
+              const {
+                rowspan,
+                colspan
+              } = spanRest;
+              if (!rowspan || !colspan) {
+                return '';
+              }
+              if (rowspan > 1) {
+                rowSpan = rowspan;
+              }
+              if (colspan > 1) {
+                colSpan = colspan;
+              }
+            }
+          }
           if (footAlign) {
             classNames.push(`col--${footAlign}`);
           }
-          return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
+          return `<td class="${classNames.join(' ')}" rowspan="${rowSpan}" colspan="${colSpan}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
         }).join('')}</tr>`);
       });
       tables.push('</tfoot>');
@@ -20519,6 +20551,9 @@ function renderBody(h, $xeTable) {
     };
   },
   inject: {
+    $xeModal: {
+      default: null
+    },
     $xeTabs: {
       default: null
     },
@@ -20544,6 +20579,7 @@ function renderBody(h, $xeTable) {
       reLayoutFlag: 0,
       footFlag: 0,
       kfFlag: 0,
+      layoutReFlag: 0,
       mergeFooteCellFlag: 0,
       crossTableDragRowInfo: crossTableDragRowGlobal
     };
@@ -21494,11 +21530,21 @@ function renderBody(h, $xeTable) {
       const props = $xeTable;
       return Object.assign({}, table_getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig);
     },
-    tabsResizeFlag() {
+    combineTabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
       return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
     },
+    combineModalResizeFlag() {
+      const $xeTable = this;
+      const $xeModal = $xeTable.$xeModal;
+      return $xeModal ? $xeModal.reactData.resizeFlag : null;
+    },
+    combineSplitterResizeFlag() {
+      const $xeTable = this;
+      const $xeSplitter = $xeTable.$xeSplitter;
+      return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null;
+    },
     computeVxeLanguage() {
       return core_.VxeUI.getLanguage();
     },
@@ -21636,7 +21682,16 @@ function renderBody(h, $xeTable) {
         });
       }
     },
-    tabsResizeFlag() {
+    combineTabsResizeFlag() {
+      this.layoutReFlag++;
+    },
+    combineModalResizeFlag() {
+      this.layoutReFlag++;
+    },
+    combineSplitterResizeFlag() {
+      this.layoutReFlag++;
+    },
+    layoutReFlag() {
       this.handleGlobalResizeEvent();
     },
     mergeCells(value) {
@@ -26525,14 +26580,14 @@ function handleSetTreeSelectValue(renderOpts, params) {
  */
 render_renderer.mixin({
   input: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender,
     renderTableDefault: nativeEditRender,
     renderTableFilter: nativeFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   textarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender
   },
   select: {
@@ -26594,7 +26649,7 @@ render_renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell(h, renderOpts, params) {
       const {
@@ -26642,7 +26697,7 @@ render_renderer.mixin({
     }
   },
   VxeNumberInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell: handleNumberCell,
     renderTableFooter(h, renderOpts, params) {
@@ -26706,7 +26761,7 @@ render_renderer.mixin({
     }
   },
   VxeDatePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell(h, renderOpts, params) {
       const props = renderOpts.props || {};
@@ -26740,7 +26795,7 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod
   },
   VxeDateRangePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit(h, renderOpts, params) {
       const {
         startField,
@@ -26863,7 +26918,7 @@ render_renderer.mixin({
     }
   },
   VxeTextarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableDefault: defaultEditRender,
     renderTableEdit: defaultEditRender
   },
@@ -26885,7 +26940,7 @@ render_renderer.mixin({
     }
   },
   VxeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultSelectEditRender,
     renderTableDefault: defaultSelectEditRender,
     renderTableCell(h, renderOpts, params) {
@@ -27073,7 +27128,7 @@ render_renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell(h, renderOpts, params) {
       const {
@@ -27167,8 +27222,52 @@ render_renderer.mixin({
     tableCellPasteMethod: handleSetTreeSelectValue,
     tableExportMethod: handleExportTreeSelectMethod
   },
+  VxeCascader: {
+    tableAutoFocus: true,
+    renderTableEdit: defaultTableOrTreeSelectEditRender,
+    renderTableCell(h, renderOpts, params) {
+      const {
+        options,
+        optionGroups
+      } = renderOpts;
+      const {
+        $table,
+        row,
+        column
+      } = params;
+      const opSize = options ? options.length : null;
+      const ogSize = optionGroups ? optionGroups.length : null;
+      const {
+        cellResult
+      } = $table.effectCellData(row, column, {
+        key: 'render_table_cell',
+        isChanged({
+          oldValue,
+          cellValue
+        }) {
+          return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize;
+        },
+        setValue({
+          cellValue
+        }) {
+          return [cellValue, opSize, ogSize];
+        },
+        getResult({
+          cellValue
+        }) {
+          return handleTreeSelectCellValue(cellValue, renderOpts);
+        }
+      });
+      // const cellResult = getTreeSelectCellValue(renderOpts, params)
+      return getCellLabelVNs(h, renderOpts, params, cellResult);
+    },
+    tableCellFormatter: handleFormatTreeSelect,
+    tableCellCopyMethod: handleFormatTreeSelect,
+    tableCellPasteMethod: handleSetTreeSelectValue,
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeTableSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell(h, renderOpts, params) {
       const {
@@ -27212,7 +27311,7 @@ render_renderer.mixin({
     tableExportMethod: handleExportTreeSelectMethod
   },
   VxeColorPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit(h, renderOpts, params) {
       const {
         row,
@@ -27246,7 +27345,7 @@ render_renderer.mixin({
     }
   },
   VxeIconPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit(h, renderOpts, params) {
       const {
         row,
@@ -27358,7 +27457,7 @@ render_renderer.mixin({
   },
   // 以下已废弃
   $input: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldEditRender,
     renderTableCell(h, renderOpts, params) {
       const {
@@ -27390,7 +27489,7 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   $textarea: {
-    tableAutoFocus: '.vxe-textarea--inner'
+    tableAutoFocus: 'textarea'
   },
   $button: {
     renderTableDefault: oldButtonEditRender
@@ -27399,7 +27498,7 @@ render_renderer.mixin({
     renderTableDefault: oldButtonsEditRender
   },
   $select: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldSelectEditRender,
     renderTableDefault: oldSelectEditRender,
     renderTableCell(h, renderOpts, params) {
@@ -27433,13 +27532,13 @@ render_renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   $radio: {
-    tableAutoFocus: '.vxe-radio--input'
+    tableAutoFocus: 'input'
   },
   $checkbox: {
-    tableAutoFocus: '.vxe-checkbox--input'
+    tableAutoFocus: 'input'
   },
   $switch: {
-    tableAutoFocus: '.vxe-switch--button',
+    tableAutoFocus: 'button',
     renderTableEdit: oldEditRender,
     renderTableDefault: oldEditRender
   }
@@ -27863,6 +27962,13 @@ const Toolbar = VxeToolbar;
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },