vxe-table 4.9.34 → 4.9.35

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.9.34";
+const version = "4.9.35";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2412,7 +2412,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.9.34"}`;
+const log_version = `table v${"4.9.35"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4886,7 +4886,6 @@ const lineOffsetSizes = {
       computeAreaOpts,
       computeSYOpts,
       computeEmptyOpts,
-      computeKeyboardOpts,
       computeTooltipOpts,
       computeRadioOpts,
       computeExpandOpts,
@@ -5725,23 +5724,24 @@ const lineOffsetSizes = {
       elemStore[`${prefix}emptyBlock`] = null;
     });
     const renderVN = () => {
-      let {
+      const {
         fixedColumn,
         fixedType,
         tableColumn
       } = props;
       const {
-        keyboardConfig,
         showOverflow: allColumnOverflow,
         spanMethod,
+        footerSpanMethod,
         mouseConfig
       } = tableProps;
       const {
         tableData,
-        mergeList,
+        scrollXLoad,
         scrollYLoad,
         isAllOverflow,
-        isDragRowMove
+        isDragRowMove,
+        expandColumn
       } = tableReactData;
       const {
         visibleColumn
@@ -5752,30 +5752,19 @@ const lineOffsetSizes = {
       const rowOpts = computeRowOpts.value;
       const sYOpts = computeSYOpts.value;
       const emptyOpts = computeEmptyOpts.value;
-      const keyboardOpts = computeKeyboardOpts.value;
       const mouseOpts = computeMouseOpts.value;
       const rowDragOpts = computeRowDragOpts.value;
-      // const isMergeLeftFixedExceeded = computeIsMergeLeftFixedExceeded.value
-      // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
-      // 如果是使用优化模式
+      let renderColumnList = tableColumn;
       if (fixedType) {
-        // 如果存在展开行使用全量渲染
-        if (!tableReactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-          if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-            tableColumn = fixedColumn;
+        renderColumnList = visibleColumn;
+        // 如果是使用优化模式
+        if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+          // 如果不支持优化模式
+          if (expandColumn || spanMethod || footerSpanMethod) {
+            renderColumnList = visibleColumn;
           } else {
-            tableColumn = visibleColumn;
-            // 检查固定列是否被合并，合并范围是否超出固定列
-            // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
-            //   tableColumn = fixedColumn
-            // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
-            //   tableColumn = fixedColumn
-            // } else {
-            //   tableColumn = visibleColumn
-            // }
+            renderColumnList = fixedColumn || [];
           }
-        } else {
-          tableColumn = visibleColumn;
         }
       }
       let emptyContent;
@@ -5807,7 +5796,7 @@ const lineOffsetSizes = {
         class: ['vxe-table--body-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
         xid: xID,
         ...ons
-      }, [fixedType ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [fixedType ? body_renderEmptyElement($xeTable) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refBodyXSpace,
         class: 'vxe-body--x-space'
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -5826,7 +5815,7 @@ const lineOffsetSizes = {
        */
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('colgroup', {
         ref: refBodyColgroup
-      }, tableColumn.map((column, $columnIndex) => {
+      }, renderColumnList.map((column, $columnIndex) => {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
           name: column.id,
           key: $columnIndex
@@ -5840,10 +5829,10 @@ const lineOffsetSizes = {
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
         tag: 'tbody'
       }, {
-        default: () => renderRows(fixedType, tableData, tableColumn)
+        default: () => renderRows(fixedType, tableData, renderColumnList)
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tbody', {
         ref: refBodyTBody
-      }, renderRows(fixedType, tableData, tableColumn))]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, renderRows(fixedType, tableData, renderColumnList))]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--checkbox-range'
       }), mouseConfig && mouseOpts.area ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--cell-area'
@@ -5885,7 +5874,8 @@ const lineOffsetSizes = {
 
 
 const {
-  renderer: header_renderer
+  renderer: header_renderer,
+  renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
 const header_renderType = 'header';
 /* harmony default export */ var header = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
@@ -6244,11 +6234,12 @@ const header_renderType = 'header';
         tableColumn
       } = props;
       const {
-        showHeaderOverflow: allColumnHeaderOverflow
+        showHeaderOverflow: allColumnHeaderOverflow,
+        spanMethod,
+        footerSpanMethod
       } = tableProps;
       const {
         isGroup,
-        scrollXLoad,
         scrollbarWidth
       } = tableReactData;
       const {
@@ -6259,10 +6250,16 @@ const header_renderType = 'header';
       if (isGroup) {
         renderColumnList = visibleColumn;
       } else {
-        // 如果是使用优化模式
         if (fixedType) {
-          if (scrollXLoad || allColumnHeaderOverflow) {
-            renderColumnList = fixedColumn;
+          renderColumnList = visibleColumn;
+          // 如果是使用优化模式
+          if (allColumnHeaderOverflow) {
+            // 如果不支持优化模式
+            if (spanMethod || footerSpanMethod) {
+              renderColumnList = visibleColumn;
+            } else {
+              renderColumnList = fixedColumn || [];
+            }
           }
         }
         headerGroups = [renderColumnList];
@@ -6271,7 +6268,7 @@ const header_renderType = 'header';
         ref: refElem,
         class: ['vxe-table--header-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
         xid: xID
-      }, [fixedType ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [fixedType ? header_renderEmptyElement($xeTable) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refHeaderXSpace,
         class: 'vxe-body--x-space'
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('table', {
@@ -6358,7 +6355,8 @@ const header_renderType = 'header';
 
 
 const {
-  renderer: footer_renderer
+  renderer: footer_renderer,
+  renderEmptyElement: footer_renderEmptyElement
 } = core_.VxeUI;
 const footer_renderType = 'footer';
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
@@ -6632,10 +6630,10 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         class: 'vxe-footer--gutter col--gutter'
       })] : []);
     };
-    const renderHeads = footerTableData => {
+    const renderHeads = renderColumnList => {
       const {
         fixedType,
-        tableColumn
+        footerTableData
       } = props;
       const {
         footerRowClassName,
@@ -6664,24 +6662,24 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             class: ['vxe-footer--row', footerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
             style: footerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
           }, {
-            default: () => renderRows(tableColumn, footerTableData, row, $rowIndex, _rowIndex)
+            default: () => renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex)
           });
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
           key: $rowIndex,
           class: ['vxe-footer--row', footerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
           style: footerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
-        }, renderRows(tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+        }, renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
       });
     };
     const renderVN = () => {
-      let {
+      const {
         fixedType,
         fixedColumn,
-        tableColumn,
-        footerTableData
+        tableColumn
       } = props;
       const {
+        spanMethod,
         footerSpanMethod,
         showFooterOverflow: allColumnFooterOverflow
       } = tableProps;
@@ -6689,21 +6687,19 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         visibleColumn
       } = tableInternalData;
       const {
-        scrollXLoad,
-        scrollbarWidth,
-        mergeFooterList
+        scrollbarWidth
       } = tableReactData;
-      // 如果是使用优化模式
+      let renderColumnList = tableColumn;
       if (fixedType) {
-        // 如果存在展开行使用全量渲染
-        if (!tableReactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-          if (!mergeFooterList.length || !footerSpanMethod) {
-            tableColumn = fixedColumn;
+        renderColumnList = visibleColumn;
+        // 如果是使用优化模式
+        if (allColumnFooterOverflow) {
+          // 如果不支持优化模式
+          if (spanMethod || footerSpanMethod) {
+            renderColumnList = visibleColumn;
           } else {
-            tableColumn = visibleColumn;
+            renderColumnList = fixedColumn || [];
           }
-        } else {
-          tableColumn = visibleColumn;
         }
       }
       const ons = {};
@@ -6715,7 +6711,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         class: ['vxe-table--footer-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
         xid: xID,
         ...ons
-      }, [fixedType ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [fixedType ? footer_renderEmptyElement($xeTable) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refFooterXSpace,
         class: 'vxe-body--x-space'
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('table', {
@@ -6731,7 +6727,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
        */
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('colgroup', {
         ref: refFooterColgroup
-      }, tableColumn.map((column, $columnIndex) => {
+      }, renderColumnList.map((column, $columnIndex) => {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
           name: column.id,
           key: $columnIndex
@@ -6744,7 +6740,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
        */
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tfoot', {
         ref: refFooterTFoot
-      }, renderHeads(footerTableData))])]);
+      }, renderHeads(renderColumnList))])]);
     };
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
@@ -11012,8 +11008,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         showFooterOverflow: allColumnFooterOverflow,
         mouseConfig,
         spanMethod,
-        footerSpanMethod,
-        keyboardConfig
+        footerSpanMethod
       } = props;
       const {
         isGroup,
@@ -11026,9 +11021,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         scrollbarHeight,
         columnStore,
         editStore,
-        mergeList,
-        mergeFooterList,
-        isAllOverflow
+        isAllOverflow,
+        expandColumn
       } = reactData;
       let {
         visibleColumn,
@@ -11046,7 +11040,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const emptyPlaceholderElem = refEmptyPlaceholder.value;
       const cellOffsetWidth = computeCellOffsetWidth.value;
       const mouseOpts = computeMouseOpts.value;
-      const keyboardOpts = computeKeyboardOpts.value;
       const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
       if (emptyPlaceholderElem) {
         emptyPlaceholderElem.style.top = `${headerHeight}px`;
@@ -11102,10 +11095,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             if (isGroup) {
               renderColumnList = visibleColumn;
             } else {
-              // 如果是使用优化模式
               if (fixedType) {
-                if (scrollXLoad || allColumnHeaderOverflow) {
-                  renderColumnList = fixedColumn;
+                renderColumnList = visibleColumn;
+                // 如果是使用优化模式
+                if (allColumnHeaderOverflow) {
+                  // 如果不支持优化模式
+                  if (spanMethod || footerSpanMethod) {
+                    renderColumnList = visibleColumn;
+                  } else {
+                    renderColumnList = fixedColumn || [];
+                  }
                 }
               }
             }
@@ -11186,17 +11185,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             }
             let tWidth = tableWidth;
             let renderColumnList = tableColumn;
-            // 如果是使用优化模式
             if (fixedType) {
-              // 如果存在展开行使用全量渲染
-              if (!reactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-                if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                  renderColumnList = fixedColumn;
-                } else {
+              renderColumnList = visibleColumn;
+              // 如果是使用优化模式
+              if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+                // 如果不支持优化模式
+                if (expandColumn || spanMethod || footerSpanMethod) {
                   renderColumnList = visibleColumn;
+                } else {
+                  renderColumnList = fixedColumn || [];
                 }
-              } else {
-                renderColumnList = visibleColumn;
               }
             }
             tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
@@ -11211,17 +11209,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           } else if (layout === 'footer') {
             let tWidth = tableWidth;
             let renderColumnList = tableColumn;
-            // 如果是使用优化模式
             if (fixedType) {
-              // 如果存在展开行使用全量渲染
-              if (!reactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-                if (!mergeFooterList.length || !footerSpanMethod) {
-                  renderColumnList = fixedColumn;
-                } else {
+              renderColumnList = visibleColumn;
+              // 如果是使用优化模式
+              if (allColumnFooterOverflow) {
+                // 如果不支持优化模式
+                if (spanMethod || footerSpanMethod) {
                   renderColumnList = visibleColumn;
+                } else {
+                  renderColumnList = fixedColumn || [];
                 }
-              } else {
-                renderColumnList = visibleColumn;
               }
             }
             tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
@@ -24385,6 +24382,9 @@ const {
 } = core_.VxeUI;
 const componentDefaultModelProp = 'modelValue';
 const defaultCompProps = {};
+function handleDefaultValue(value, defaultVal, initVal) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(value) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(defaultVal) ? initVal : defaultVal : value;
+}
 function parseDate(value, props) {
   return value && props.valueFormat ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(value, props.valueFormat) : value;
 }
@@ -25070,15 +25070,27 @@ render_renderer.mixin({
       if (cellValue) {
         const numberInputConfig = render_getConfig().numberInput || {};
         if (type === 'float') {
-          const digits = props.digits || numberInputConfig.digits || 1;
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
           cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+          if (!autoFill) {
+            cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+          }
         } else if (type === 'amount') {
-          const digits = props.digits || numberInputConfig.digits || 2;
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
           cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
             digits
           });
-          const showCurrency = props.showCurrency;
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(showCurrency) ? showCurrency : numberInputConfig.showCurrency) {
+          if (!autoFill) {
+            const [iStr, dStr] = cellValue.split('.');
+            if (dStr) {
+              const dRest = dStr.replace(/0+$/, '');
+              cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
+            }
+          }
+          if (showCurrency) {
             cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
           }
         }
@@ -25098,20 +25110,38 @@ render_renderer.mixin({
         type
       } = props;
       // 兼容老模式
-      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row) ? row[_columnIndex] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(cellValue)) {
+      const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row) ? row[_columnIndex] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(itemValue)) {
         const numberInputConfig = render_getConfig().numberInput || {};
         if (type === 'float') {
-          const digits = props.digits || numberInputConfig.digits || 1;
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
+          let amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(itemValue, digits), digits);
+          if (!autoFill) {
+            amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(amountLabel);
+          }
+          return amountLabel;
         } else if (type === 'amount') {
-          const digits = props.digits || numberInputConfig.digits || 2;
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
+          let amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(itemValue), {
             digits
           });
+          if (!autoFill) {
+            const [iStr, dStr] = amountLabel.split('.');
+            if (dStr) {
+              const dRest = dStr.replace(/0+$/, '');
+              amountLabel = dRest ? [iStr, '.', dRest].join('') : iStr;
+            }
+          }
+          if (showCurrency) {
+            amountLabel = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${amountLabel}`;
+          }
+          return amountLabel;
         }
       }
-      return getFuncText(cellValue, 1);
+      return getFuncText(itemValue, 1);
     },
     renderTableDefault: defaultEditRender,
     renderTableFilter: defaultFilterRender,