vxe-table 4.7.25 → 4.7.26

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

@@ -604,7 +604,7 @@ hooks.add('tableEditModule', {
                 const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
                 if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
                     return $xeTable.scrollToRow(row, column).then(() => {
-                        const cell = $xeTable.getCell(row, column);
+                        const cell = $xeTable.getCellElement(row, column);
                         if (cell) {
                             editPrivateMethods.handleActived({
                                 row,
@@ -631,7 +631,7 @@ hooks.add('tableEditModule', {
                 if (row && column && editOpts.trigger !== 'manual') {
                     const rowIndex = $xeTable.findRowIndexOf(tableData, row);
                     if (rowIndex > -1 && column) {
-                        const cell = $xeTable.getCell(row, column);
+                        const cell = $xeTable.getCellElement(row, column);
                         const params = {
                             row,
                             rowIndex,
@@ -657,7 +657,7 @@ hooks.add('tableEditModule', {
                 const { actived, focused } = editStore;
                 const { row, column } = params;
                 const { editRender } = column;
-                const cell = (params.cell || $xeTable.getCell(row, column));
+                const cell = (params.cell || $xeTable.getCellElement(row, column));
                 const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
                 params.cell = cell;
                 if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
@@ -836,7 +836,7 @@ hooks.add('tableEditModule', {
                 const { row, column } = selected;
                 removeCellSelectedClass();
                 if (row && column) {
-                    const cell = $xeTable.getCell(row, column);
+                    const cell = $xeTable.getCellElement(row, column);
                     if (cell) {
                         addClass(cell, 'col--selected');
                     }

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

@@ -349,13 +349,13 @@ hooks.add('tableExportModule', {
                                             cellValue = getCellValue(row, column);
                                         }
                                         else {
-                                            cellValue = $xeTable.getCellLabel(row, column);
+                                            cellValue = `${$xeTable.getCellLabel(row, column)}`;
                                             if (column.type === 'html') {
                                                 htmlCellElem.innerHTML = cellValue;
                                                 cellValue = htmlCellElem.innerText.trim();
                                             }
                                             else {
-                                                const cell = $xeTable.getCell(row, column);
+                                                const cell = $xeTable.getCellElement(row, column);
                                                 if (cell) {
                                                     cellValue = cell.innerText.trim();
                                                 }
@@ -408,13 +408,13 @@ hooks.add('tableExportModule', {
                                     cellValue = getCellValue(row, column);
                                 }
                                 else {
-                                    cellValue = $xeTable.getCellLabel(row, column);
+                                    cellValue = `${$xeTable.getCellLabel(row, column)}`;
                                     if (column.type === 'html') {
                                         htmlCellElem.innerHTML = cellValue;
                                         cellValue = htmlCellElem.innerText.trim();
                                     }
                                     else {
-                                        const cell = $xeTable.getCell(row, column);
+                                        const cell = $xeTable.getCellElement(row, column);
                                         if (cell) {
                                             cellValue = cell.innerText.trim();
                                         }

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

@@ -282,7 +282,7 @@ hooks.add('tableKeyboardModule', {
                     }
                     params.columnIndex = targetColumnIndex;
                     params.column = targetColumn;
-                    params.cell = $xeTable.getCell(params.row, params.column);
+                    params.cell = $xeTable.getCellElement(params.row, params.column);
                     if (editConfig) {
                         if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
                             if (editOpts.mode === 'row') {
@@ -371,7 +371,7 @@ hooks.add('tableKeyboardModule', {
                     params.column = visibleColumn[params.columnIndex];
                 }
                 $xeTable.scrollToRow(params.row, params.column).then(() => {
-                    params.cell = $xeTable.getCell(params.row, params.column);
+                    params.cell = $xeTable.getCellElement(params.row, params.column);
                     $xeTable.handleSelected(params, evnt);
                 });
             },

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

@@ -68,7 +68,7 @@ hooks.add('tableMenuModule', {
                             const { keyboard, row, column } = params;
                             if (keyboard && row && column) {
                                 $xeTable.scrollToRow(row, column).then(() => {
-                                    const cell = $xeTable.getCell(row, column);
+                                    const cell = $xeTable.getCellElement(row, column);
                                     if (cell) {
                                         const { boundingTop, boundingLeft } = getAbsolutePos(cell);
                                         top = boundingTop + scrollTop + Math.floor(cell.offsetHeight / 2);

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

@@ -190,7 +190,7 @@ hooks.add('tableValidatorModule', {
                             });
                         };
                         const posAndFinish = () => {
-                            firstErrParams.cell = $xeTable.getCell(firstErrParams.row, firstErrParams.column);
+                            firstErrParams.cell = $xeTable.getCellElement(firstErrParams.row, firstErrParams.column);
                             scrollToView(firstErrParams.cell);
                             handleValidError(firstErrParams).then(finish);
                         };

package/es/table/src/table.js

@@ -1145,7 +1145,7 @@ export default defineComponent({
                     cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy);
                 }
                 else {
-                    cellValue = tablePrivateMethods.getCellLabel(row, column);
+                    cellValue = tableMethods.getCellLabel(row, column);
                 }
                 if (!sortType || sortType === 'auto') {
                     return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
@@ -2966,6 +2966,83 @@ export default defineComponent({
                 }
                 return nextTick();
             },
+            getCellElement(row, fieldOrColumn) {
+                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+                if (!column) {
+                    return null;
+                }
+                const rowid = getRowid($xeTable, row);
+                const tableBody = refTableBody.value;
+                const leftBody = refTableLeftBody.value;
+                const rightBody = refTableRightBody.value;
+                let bodyElem;
+                if (column) {
+                    if (column.fixed) {
+                        if (column.fixed === 'left') {
+                            if (leftBody) {
+                                bodyElem = leftBody.$el;
+                            }
+                        }
+                        else {
+                            if (rightBody) {
+                                bodyElem = rightBody.$el;
+                            }
+                        }
+                    }
+                    if (!bodyElem) {
+                        bodyElem = tableBody.$el;
+                    }
+                    if (bodyElem) {
+                        return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
+                    }
+                }
+                return null;
+            },
+            getCellLabel(row, fieldOrColumn) {
+                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+                if (!column) {
+                    return null;
+                }
+                const formatter = column.formatter;
+                const cellValue = getCellValue(row, column);
+                let cellLabel = cellValue;
+                if (formatter) {
+                    let formatData;
+                    const { fullAllDataRowIdData } = internalData;
+                    const rowid = getRowid($xeTable, row);
+                    const colid = column.id;
+                    const rest = fullAllDataRowIdData[rowid];
+                    if (rest) {
+                        formatData = rest.formatData;
+                        if (!formatData) {
+                            formatData = fullAllDataRowIdData[rowid].formatData = {};
+                        }
+                        if (rest && formatData[colid]) {
+                            if (formatData[colid].value === cellValue) {
+                                return formatData[colid].label;
+                            }
+                        }
+                    }
+                    const formatParams = { cellValue, row, rowIndex: tableMethods.getRowIndex(row), column, columnIndex: tableMethods.getColumnIndex(column) };
+                    if (XEUtils.isString(formatter)) {
+                        const gFormatOpts = formats.get(formatter);
+                        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
+                        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
+                    }
+                    else if (XEUtils.isArray(formatter)) {
+                        const gFormatOpts = formats.get(formatter[0]);
+                        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
+                        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
+                    }
+                    else {
+                        cellLabel = formatter(formatParams);
+                    }
+                    if (formatData) {
+                        formatData[colid] = { value: cellValue, label: cellLabel };
+                    }
+                }
+                return cellLabel;
+            },
             /**
              * 检查是否为临时行数据
              * @param {Row} row 行对象
@@ -3021,6 +3098,13 @@ export default defineComponent({
                 const columns = internalData.visibleColumn;
                 return XEUtils.isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
             },
+            /**
+             * 根据列获取列的唯一主键
+             */
+            getColid(fieldOrColumn) {
+                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+                return column ? column.id : null;
+            },
             /**
              * 根据列的唯一主键获取列
              * @param {String} colid 列主键
@@ -4313,7 +4397,7 @@ export default defineComponent({
                         const type = 'change';
                         if ($xeTable.hasCellRules) {
                             if ($xeTable.hasCellRules(type, row, column)) {
-                                const cell = tablePrivateMethods.getCell(row, column);
+                                const cell = tableMethods.getCellElement(row, column);
                                 if (cell) {
                                     return $xeTable.validCellRules(type, row, column, cellValue)
                                         .then(() => {
@@ -6232,74 +6316,12 @@ export default defineComponent({
                 }
                 internalData.hoverRow = null;
             },
+            /**
+             * 已废弃，被 getCellElement 替换
+             * @deprecated
+             */
             getCell(row, column) {
-                const rowid = getRowid($xeTable, row);
-                const tableBody = refTableBody.value;
-                const leftBody = refTableLeftBody.value;
-                const rightBody = refTableRightBody.value;
-                let bodyElem;
-                if (column) {
-                    if (column.fixed) {
-                        if (column.fixed === 'left') {
-                            if (leftBody) {
-                                bodyElem = leftBody.$el;
-                            }
-                        }
-                        else {
-                            if (rightBody) {
-                                bodyElem = rightBody.$el;
-                            }
-                        }
-                    }
-                    if (!bodyElem) {
-                        bodyElem = tableBody.$el;
-                    }
-                    if (bodyElem) {
-                        return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
-                    }
-                }
-                return null;
-            },
-            getCellLabel(row, column) {
-                const formatter = column.formatter;
-                const cellValue = getCellValue(row, column);
-                let cellLabel = cellValue;
-                if (formatter) {
-                    let formatData;
-                    const { fullAllDataRowIdData } = internalData;
-                    const rowid = getRowid($xeTable, row);
-                    const colid = column.id;
-                    const rest = fullAllDataRowIdData[rowid];
-                    if (rest) {
-                        formatData = rest.formatData;
-                        if (!formatData) {
-                            formatData = fullAllDataRowIdData[rowid].formatData = {};
-                        }
-                        if (rest && formatData[colid]) {
-                            if (formatData[colid].value === cellValue) {
-                                return formatData[colid].label;
-                            }
-                        }
-                    }
-                    const formatParams = { cellValue, row, rowIndex: tableMethods.getRowIndex(row), column, columnIndex: tableMethods.getColumnIndex(column) };
-                    if (XEUtils.isString(formatter)) {
-                        const gFormatOpts = formats.get(formatter);
-                        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
-                        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
-                    }
-                    else if (XEUtils.isArray(formatter)) {
-                        const gFormatOpts = formats.get(formatter[0]);
-                        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
-                        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
-                    }
-                    else {
-                        cellLabel = formatter(formatParams);
-                    }
-                    if (formatData) {
-                        formatData[colid] = { value: cellValue, label: cellLabel };
-                    }
-                }
-                return cellLabel;
+                return tableMethods.getCellElement(row, column);
             },
             findRowIndexOf(list, row) {
                 return row ? XEUtils.findIndexOf(list, item => $xeTable.eqRow(item, row)) : -1;

package/es/ui/index.js

@@ -1,8 +1,8 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.7.25";
+export const version = "4.7.26";
 VxeUI.version = version;
-VxeUI.tableVersion = "4.7.25";
+VxeUI.tableVersion = "4.7.26";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.25";
+const version = "4.7.26";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.25";
+core_.VxeUI.tableVersion = "4.7.26";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2258,7 +2258,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.25"}`;
+const log_version = `table v${"4.7.26"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -9305,7 +9305,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             column
           }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, sortBy);
         } else {
-          cellValue = tablePrivateMethods.getCellLabel(row, column);
+          cellValue = tableMethods.getCellLabel(row, column);
         }
         if (!sortType || sortType === 'auto') {
           return isNaN(cellValue) ? cellValue : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
@@ -11528,6 +11528,91 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
+      getCellElement(row, fieldOrColumn) {
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (!column) {
+          return null;
+        }
+        const rowid = getRowid($xeTable, row);
+        const tableBody = refTableBody.value;
+        const leftBody = refTableLeftBody.value;
+        const rightBody = refTableRightBody.value;
+        let bodyElem;
+        if (column) {
+          if (column.fixed) {
+            if (column.fixed === 'left') {
+              if (leftBody) {
+                bodyElem = leftBody.$el;
+              }
+            } else {
+              if (rightBody) {
+                bodyElem = rightBody.$el;
+              }
+            }
+          }
+          if (!bodyElem) {
+            bodyElem = tableBody.$el;
+          }
+          if (bodyElem) {
+            return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
+          }
+        }
+        return null;
+      },
+      getCellLabel(row, fieldOrColumn) {
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (!column) {
+          return null;
+        }
+        const formatter = column.formatter;
+        const cellValue = getCellValue(row, column);
+        let cellLabel = cellValue;
+        if (formatter) {
+          let formatData;
+          const {
+            fullAllDataRowIdData
+          } = internalData;
+          const rowid = getRowid($xeTable, row);
+          const colid = column.id;
+          const rest = fullAllDataRowIdData[rowid];
+          if (rest) {
+            formatData = rest.formatData;
+            if (!formatData) {
+              formatData = fullAllDataRowIdData[rowid].formatData = {};
+            }
+            if (rest && formatData[colid]) {
+              if (formatData[colid].value === cellValue) {
+                return formatData[colid].label;
+              }
+            }
+          }
+          const formatParams = {
+            cellValue,
+            row,
+            rowIndex: tableMethods.getRowIndex(row),
+            column,
+            columnIndex: tableMethods.getColumnIndex(column)
+          };
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+            const gFormatOpts = table_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 = table_formats.get(formatter[0]);
+            const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
+            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
+          } else {
+            cellLabel = formatter(formatParams);
+          }
+          if (formatData) {
+            formatData[colid] = {
+              value: cellValue,
+              label: cellLabel
+            };
+          }
+        }
+        return cellLabel;
+      },
       /**
        * 检查是否为临时行数据
        * @param {Row} row 行对象
@@ -11593,6 +11678,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const columns = internalData.visibleColumn;
         return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
       },
+      /**
+       * 根据列获取列的唯一主键
+       */
+      getColid(fieldOrColumn) {
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        return column ? column.id : null;
+      },
       /**
        * 根据列的唯一主键获取列
        * @param {String} colid 列主键
@@ -13102,7 +13194,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const type = 'change';
             if ($xeTable.hasCellRules) {
               if ($xeTable.hasCellRules(type, row, column)) {
-                const cell = tablePrivateMethods.getCell(row, column);
+                const cell = tableMethods.getCellElement(row, column);
                 if (cell) {
                   return $xeTable.validCellRules(type, row, column, cellValue).then(() => {
                     if (customVal && validStore.visible) {
@@ -15322,82 +15414,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         internalData.hoverRow = null;
       },
+      /**
+       * 已废弃，被 getCellElement 替换
+       * @deprecated
+       */
       getCell(row, column) {
-        const rowid = getRowid($xeTable, row);
-        const tableBody = refTableBody.value;
-        const leftBody = refTableLeftBody.value;
-        const rightBody = refTableRightBody.value;
-        let bodyElem;
-        if (column) {
-          if (column.fixed) {
-            if (column.fixed === 'left') {
-              if (leftBody) {
-                bodyElem = leftBody.$el;
-              }
-            } else {
-              if (rightBody) {
-                bodyElem = rightBody.$el;
-              }
-            }
-          }
-          if (!bodyElem) {
-            bodyElem = tableBody.$el;
-          }
-          if (bodyElem) {
-            return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
-          }
-        }
-        return null;
-      },
-      getCellLabel(row, column) {
-        const formatter = column.formatter;
-        const cellValue = getCellValue(row, column);
-        let cellLabel = cellValue;
-        if (formatter) {
-          let formatData;
-          const {
-            fullAllDataRowIdData
-          } = internalData;
-          const rowid = getRowid($xeTable, row);
-          const colid = column.id;
-          const rest = fullAllDataRowIdData[rowid];
-          if (rest) {
-            formatData = rest.formatData;
-            if (!formatData) {
-              formatData = fullAllDataRowIdData[rowid].formatData = {};
-            }
-            if (rest && formatData[colid]) {
-              if (formatData[colid].value === cellValue) {
-                return formatData[colid].label;
-              }
-            }
-          }
-          const formatParams = {
-            cellValue,
-            row,
-            rowIndex: tableMethods.getRowIndex(row),
-            column,
-            columnIndex: tableMethods.getColumnIndex(column)
-          };
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-            const gFormatOpts = table_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 = table_formats.get(formatter[0]);
-            const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
-            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
-          } else {
-            cellLabel = formatter(formatParams);
-          }
-          if (formatData) {
-            formatData[colid] = {
-              value: cellValue,
-              label: cellLabel
-            };
-          }
-        }
-        return cellLabel;
+        return tableMethods.getCellElement(row, column);
       },
       findRowIndexOf(list, row) {
         return row ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(list, item => $xeTable.eqRow(item, row)) : -1;
@@ -16582,7 +16604,7 @@ menu_hook_hooks.add('tableMenuModule', {
               } = params;
               if (keyboard && row && column) {
                 $xeTable.scrollToRow(row, column).then(() => {
-                  const cell = $xeTable.getCell(row, column);
+                  const cell = $xeTable.getCellElement(row, column);
                   if (cell) {
                     const {
                       boundingTop,
@@ -17626,7 +17648,7 @@ edit_hook_hooks.add('tableEditModule', {
         const column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
         if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
           return $xeTable.scrollToRow(row, column).then(() => {
-            const cell = $xeTable.getCell(row, column);
+            const cell = $xeTable.getCellElement(row, column);
             if (cell) {
               editPrivateMethods.handleActived({
                 row,
@@ -17655,7 +17677,7 @@ edit_hook_hooks.add('tableEditModule', {
         if (row && column && editOpts.trigger !== 'manual') {
           const rowIndex = $xeTable.findRowIndexOf(tableData, row);
           if (rowIndex > -1 && column) {
-            const cell = $xeTable.getCell(row, column);
+            const cell = $xeTable.getCellElement(row, column);
             const params = {
               row,
               rowIndex,
@@ -17697,7 +17719,7 @@ edit_hook_hooks.add('tableEditModule', {
         const {
           editRender
         } = column;
-        const cell = params.cell || $xeTable.getCell(row, column);
+        const cell = params.cell || $xeTable.getCellElement(row, column);
         const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
         params.cell = cell;
         if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
@@ -17909,7 +17931,7 @@ edit_hook_hooks.add('tableEditModule', {
         } = selected;
         removeCellSelectedClass();
         if (row && column) {
-          const cell = $xeTable.getCell(row, column);
+          const cell = $xeTable.getCellElement(row, column);
           if (cell) {
             addClass(cell, 'col--selected');
           }
@@ -18338,12 +18360,12 @@ export_hook_hooks.add('tableExportModule', {
                     if (opts.original) {
                       cellValue = getCellValue(row, column);
                     } else {
-                      cellValue = $xeTable.getCellLabel(row, column);
+                      cellValue = `${$xeTable.getCellLabel(row, column)}`;
                       if (column.type === 'html') {
                         htmlCellElem.innerHTML = cellValue;
                         cellValue = htmlCellElem.innerText.trim();
                       } else {
-                        const cell = $xeTable.getCell(row, column);
+                        const cell = $xeTable.getCellElement(row, column);
                         if (cell) {
                           cellValue = cell.innerText.trim();
                         }
@@ -18405,12 +18427,12 @@ export_hook_hooks.add('tableExportModule', {
                 if (opts.original) {
                   cellValue = getCellValue(row, column);
                 } else {
-                  cellValue = $xeTable.getCellLabel(row, column);
+                  cellValue = `${$xeTable.getCellLabel(row, column)}`;
                   if (column.type === 'html') {
                     htmlCellElem.innerHTML = cellValue;
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
-                    const cell = $xeTable.getCell(row, column);
+                    const cell = $xeTable.getCellElement(row, column);
                     if (cell) {
                       cellValue = cell.innerText.trim();
                     }
@@ -19839,7 +19861,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           }
           params.columnIndex = targetColumnIndex;
           params.column = targetColumn;
-          params.cell = $xeTable.getCell(params.row, params.column);
+          params.cell = $xeTable.getCellElement(params.row, params.column);
           if (editConfig) {
             if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
               if (editOpts.mode === 'row') {
@@ -19930,7 +19952,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           params.column = visibleColumn[params.columnIndex];
         }
         $xeTable.scrollToRow(params.row, params.column).then(() => {
-          params.cell = $xeTable.getCell(params.row, params.column);
+          params.cell = $xeTable.getCellElement(params.row, params.column);
           $xeTable.handleSelected(params, evnt);
         });
       },
@@ -20188,7 +20210,7 @@ validator_hook_hooks.add('tableValidatorModule', {
               });
             };
             const posAndFinish = () => {
-              firstErrParams.cell = $xeTable.getCell(firstErrParams.row, firstErrParams.column);
+              firstErrParams.cell = $xeTable.getCellElement(firstErrParams.row, firstErrParams.column);
               scrollToView(firstErrParams.cell);
               handleValidError(firstErrParams).then(finish);
             };