vxe-table 3.11.38 → 3.11.39

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.38";
+const version = "3.11.39";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2793,7 +2793,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.38"}`;
+const log_version = `table v${"3.11.39"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8365,11 +8365,8 @@ const Methods = {
       editStore,
       currentRow,
       mouseConfig,
-      keyboardConfig,
-      keyboardOpts,
       spanMethod,
-      mergeList,
-      mergeFooterList,
+      expandColumn,
       footerSpanMethod,
       isAllOverflow,
       visibleColumn
@@ -8426,10 +8423,17 @@ const Methods = {
           if (isGroup) {
             renderColumnList = visibleColumn;
           } else {
-            // 如果是使用优化模式
             if (fixedType) {
-              if (scrollXLoad || allColumnHeaderOverflow) {
-                renderColumnList = fixedColumn;
+              // 如果是使用优化模式
+              if (allColumnHeaderOverflow) {
+                // 如果不支持优化模式
+                if (spanMethod || footerSpanMethod) {
+                  renderColumnList = visibleColumn;
+                } else {
+                  renderColumnList = fixedColumn || [];
+                }
+              } else {
+                renderColumnList = visibleColumn;
               }
             }
           }
@@ -8516,14 +8520,14 @@ const Methods = {
           }
           let tWidth = tableWidth;
           let renderColumnList = tableColumn;
-          // 如果是使用优化模式
           if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!this.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-              if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                renderColumnList = fixedColumn;
-              } else {
+            // 如果是使用优化模式
+            if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+              // 如果不支持优化模式
+              if (expandColumn || spanMethod || footerSpanMethod) {
                 renderColumnList = visibleColumn;
+              } else {
+                renderColumnList = fixedColumn || [];
               }
             } else {
               renderColumnList = visibleColumn;
@@ -8541,14 +8545,14 @@ const Methods = {
         } else if (layout === 'footer') {
           let tWidth = tableWidth;
           let renderColumnList = tableColumn;
-          // 如果是使用优化模式
           if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!this.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-              if (!mergeFooterList.length || !footerSpanMethod) {
-                renderColumnList = fixedColumn;
-              } else {
+            // 如果是使用优化模式
+            if (allColumnFooterOverflow) {
+              // 如果不支持优化模式
+              if (spanMethod || footerSpanMethod) {
                 renderColumnList = visibleColumn;
+              } else {
+                renderColumnList = fixedColumn || [];
               }
             } else {
               renderColumnList = visibleColumn;
@@ -14336,71 +14340,71 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     elemStore[`${prefix}emptyBlock`] = null;
   },
   render(h) {
+    const props = this;
     const $xeTable = this.$parent;
+    const tableProps = $xeTable;
+    const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
     const {
-      _e,
-      $parent: $xetable,
-      fixedColumn,
-      fixedType
-    } = this;
-    const rowOpts = $xeTable.computeRowOpts;
-    const rowDragOpts = $xeTable.computeRowDragOpts;
-    let {
-      $scopedSlots,
       tId,
-      tableData,
-      tableColumn,
-      visibleColumn,
-      expandColumn,
+      $scopedSlots
+    } = $xeTable;
+    const {
+      fixedColumn,
+      fixedType,
+      tableColumn
+    } = props;
+    const {
       showOverflow: allColumnOverflow,
-      keyboardConfig,
-      keyboardOpts,
-      mergeList,
       spanMethod,
+      footerSpanMethod,
+      mouseConfig
+    } = tableProps;
+    const {
+      tableData,
       scrollXLoad,
       scrollYLoad,
       isAllOverflow,
-      emptyOpts,
-      mouseConfig,
-      mouseOpts,
-      sYOpts,
-      isDragRowMove
-    } = $xetable;
-    // 如果是使用优化模式
+      isDragRowMove,
+      expandColumn
+    } = tableReactData;
+    const {
+      visibleColumn
+    } = tableInternalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const sYOpts = $xeTable.computeSYOpts;
+    const emptyOpts = $xeTable.computeEmptyOpts;
+    const mouseOpts = $xeTable.computeMouseOpts;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    let renderColumnList = tableColumn;
     if (fixedType) {
-      // 如果存在展开行使用全量渲染
-      if (!expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-        if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-          tableColumn = fixedColumn;
+      // 如果是使用优化模式
+      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;
+        renderColumnList = visibleColumn;
       }
     }
     let emptyContent;
     if ($scopedSlots.empty) {
       emptyContent = $scopedSlots.empty.call(this, {
-        $table: $xetable
+        $table: $xeTable,
+        $grid: $xeTable.xegrid
       }, h);
     } else {
       const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
       const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
       if (rtEmptyView) {
         emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, {
-          $table: $xetable
+          $table: $xeTable
         }));
       } else {
-        emptyContent = $xetable.emptyText || body_getI18n('vxe.table.emptyText');
+        emptyContent = tableProps.emptyText || body_getI18n('vxe.table.emptyText');
       }
     }
     const ons = {
@@ -14416,7 +14420,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         xid: tId
       },
       on: ons
-    }, [fixedType ? _e() : h('div', {
+    }, [fixedType ? body_renderEmptyElement($xeTable) : h('div', {
       class: 'vxe-body--x-space',
       ref: 'xSpace'
     }), h('div', {
@@ -14437,7 +14441,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
      */
     h('colgroup', {
       ref: 'colgroup'
-    }, tableColumn.map((column, $columnIndex) => {
+    }, renderColumnList.map((column, $columnIndex) => {
       return h('col', {
         attrs: {
           name: column.id
@@ -14453,9 +14457,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         tag: 'tbody',
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`
       }
-    }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn)) : h('tbody', {
+    }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList)) : h('tbody', {
       ref: 'tbody'
-    }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn))]), h('div', {
+    }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList))]), h('div', {
       class: 'vxe-table--checkbox-range'
     }), mouseConfig && mouseOpts.area ? h('div', {
       class: 'vxe-table--cell-area'
@@ -14465,9 +14469,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       class: 'vxe-table--cell-main-area-btn',
       on: {
         mousedown(evnt) {
-          if ($xetable.triggerCellAreaExtendMousedownEvent) {
-            $xetable.triggerCellAreaExtendMousedownEvent(evnt, {
-              $table: $xetable,
+          if ($xeTable.triggerCellAreaExtendMousedownEvent) {
+            $xeTable.triggerCellAreaExtendMousedownEvent(evnt, {
+              $table: $xeTable,
               fixed: fixedType,
               type: renderType
             });
@@ -14703,7 +14707,8 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
 
 
 const {
-  renderer: header_renderer
+  renderer: header_renderer,
+  renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
 const cellType = 'header';
 const header_renderRows = (h, _vm, cols, $rowIndex) => {
@@ -14944,31 +14949,50 @@ function renderHeads(h, _vm, headerGroups) {
     elemStore[`${prefix}repair`] = null;
   },
   render(h) {
+    const props = this;
+    const $xeTable = this.$parent;
+    const tableProps = $xeTable;
+    const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
+    const {
+      tId
+    } = $xeTable;
     const {
-      _e,
-      $parent: $xetable,
       fixedType,
-      headerColumn,
-      tableColumn,
-      fixedColumn
+      fixedColumn,
+      tableColumn
+    } = props;
+    const {
+      headerColumn
     } = this;
     const {
-      tId,
-      isGroup,
-      visibleColumn,
       showHeaderOverflow: allColumnHeaderOverflow,
-      scrollXLoad,
+      spanMethod,
+      footerSpanMethod
+    } = tableProps;
+    const {
+      isGroup,
       scrollbarWidth
-    } = $xetable;
+    } = tableReactData;
+    const {
+      visibleColumn
+    } = tableInternalData;
     let headerGroups = headerColumn;
     let renderColumnList = tableColumn;
     if (isGroup) {
       renderColumnList = visibleColumn;
     } else {
-      // 如果是使用优化模式
       if (fixedType) {
-        if (scrollXLoad || allColumnHeaderOverflow) {
-          renderColumnList = fixedColumn;
+        // 如果是使用优化模式
+        if (allColumnHeaderOverflow) {
+          // 如果不支持优化模式
+          if (spanMethod || footerSpanMethod) {
+            renderColumnList = visibleColumn;
+          } else {
+            renderColumnList = fixedColumn || [];
+          }
+        } else {
+          renderColumnList = visibleColumn;
         }
       }
       headerGroups = [renderColumnList];
@@ -14978,7 +15002,7 @@ function renderHeads(h, _vm, headerGroups) {
       attrs: {
         xid: tId
       }
-    }, [fixedType ? _e() : h('div', {
+    }, [fixedType ? header_renderEmptyElement($xeTable) : h('div', {
       class: 'vxe-body--x-space',
       ref: 'xSpace'
     }), h('table', {
@@ -15169,7 +15193,8 @@ function renderHeads(h, _vm, headerGroups) {
 
 const footer_renderType = 'footer';
 const {
-  renderer: footer_renderer
+  renderer: footer_renderer,
+  renderEmptyElement: footer_renderEmptyElement
 } = core_.VxeUI;
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
@@ -15357,24 +15382,24 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     class: 'vxe-footer--gutter col--gutter'
   })] : []);
 }
-function footer_renderHeads(h, _vm, footerTableData) {
+function footer_renderHeads(h, _vm, renderColumnList) {
   const $xeTable = _vm.$parent;
+  const props = _vm;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
-    $parent: $xetable,
     fixedType,
-    tableColumn
-  } = _vm;
+    footerTableData
+  } = props;
   const {
     footerRowClassName,
     footerRowStyle,
     isDragColMove
-  } = $xetable;
+  } = $xeTable;
   return footerTableData.map((row, $rowIndex) => {
     const _rowIndex = $rowIndex;
     const rowParams = {
-      $table: $xetable,
+      $table: $xeTable,
       row,
       _rowIndex,
       $rowIndex,
@@ -15390,13 +15415,13 @@ function footer_renderHeads(h, _vm, footerTableData) {
           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
         }
-      }, footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+      }, footer_renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
     }
     return 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
-    }, footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+    }, footer_renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
   });
 }
 /* harmony default export */ var footer = ({
@@ -15441,35 +15466,43 @@ function footer_renderHeads(h, _vm, footerTableData) {
     elemStore[`${prefix}xSpace`] = null;
   },
   render(h) {
-    let {
-      _e,
-      $parent: $xetable,
+    const props = this;
+    const $xeTable = this.$parent;
+    const tableProps = $xeTable;
+    const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
+    const {
+      tId
+    } = $xeTable;
+    const {
       fixedType,
       fixedColumn,
-      tableColumn,
-      footerTableData
-    } = this;
+      tableColumn
+    } = props;
     const {
-      tId,
-      mergeFooterList,
+      spanMethod,
       footerSpanMethod,
-      scrollXLoad,
-      showFooterOverflow: allColumnFooterOverflow,
-      scrollbarWidth,
-      visibleColumn,
-      expandColumn
-    } = $xetable;
+      showFooterOverflow: allColumnFooterOverflow
+    } = tableProps;
+    const {
+      visibleColumn
+    } = tableInternalData;
+    const {
+      scrollbarWidth
+    } = tableReactData;
+    let renderColumnList = tableColumn;
     // 如果是使用优化模式
     if (fixedType) {
-      // 如果存在展开行使用全量渲染
-      if (!expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-        if (!mergeFooterList.length || !footerSpanMethod) {
-          tableColumn = fixedColumn;
+      // 如果是使用优化模式
+      if (allColumnFooterOverflow) {
+        // 如果不支持优化模式
+        if (spanMethod || footerSpanMethod) {
+          renderColumnList = visibleColumn;
         } else {
-          tableColumn = visibleColumn;
+          renderColumnList = fixedColumn || [];
         }
       } else {
-        tableColumn = visibleColumn;
+        renderColumnList = visibleColumn;
       }
     }
     const ons = {};
@@ -15482,7 +15515,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
         xid: tId
       },
       on: ons
-    }, [fixedType ? _e() : h('div', {
+    }, [fixedType ? footer_renderEmptyElement($xeTable) : h('div', {
       class: 'vxe-body--x-space',
       ref: 'xSpace'
     }), h('table', {
@@ -15500,7 +15533,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
      */
     h('colgroup', {
       ref: 'colgroup'
-    }, tableColumn.map((column, $columnIndex) => {
+    }, renderColumnList.map((column, $columnIndex) => {
       return h('col', {
         attrs: {
           name: column.id
@@ -15517,7 +15550,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
      */
     h('tfoot', {
       ref: 'tfoot'
-    }, footer_renderHeads(h, this, footerTableData))])]);
+    }, footer_renderHeads(h, this, renderColumnList))])]);
   },
   methods: {
     /**
@@ -26937,6 +26970,9 @@ const {
 } = core_.VxeUI;
 const componentDefaultModelProp = 'value';
 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;
 }
@@ -27634,15 +27670,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}`;
           }
         }
@@ -27662,20 +27710,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,