vxe-table 4.7.25 → 4.7.26

package/lib/table/src/table.js

@@ -1283,7 +1283,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             column
           }) : _xeUtils.default.get(row, sortBy);
         } else {
-          cellValue = tablePrivateMethods.getCellLabel(row, column);
+          cellValue = tableMethods.getCellLabel(row, column);
         }
         if (!sortType || sortType === 'auto') {
           return isNaN(cellValue) ? cellValue : _xeUtils.default.toNumber(cellValue);
@@ -3499,6 +3499,91 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         return (0, _vue.nextTick)();
       },
+      getCellElement(row, fieldOrColumn) {
+        const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
+        if (!column) {
+          return null;
+        }
+        const rowid = (0, _util.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 = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
+        if (!column) {
+          return null;
+        }
+        const formatter = column.formatter;
+        const cellValue = (0, _util.getCellValue)(row, column);
+        let cellLabel = cellValue;
+        if (formatter) {
+          let formatData;
+          const {
+            fullAllDataRowIdData
+          } = internalData;
+          const rowid = (0, _util.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.default.isString(formatter)) {
+            const gFormatOpts = formats.get(formatter);
+            const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
+            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
+          } else if (_xeUtils.default.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 行对象
@@ -3564,6 +3649,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const columns = internalData.visibleColumn;
         return _xeUtils.default.isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
       },
+      /**
+       * 根据列获取列的唯一主键
+       */
+      getColid(fieldOrColumn) {
+        const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
+        return column ? column.id : null;
+      },
       /**
        * 根据列的唯一主键获取列
        * @param {String} colid 列主键
@@ -5067,7 +5159,7 @@ var _default = exports.default = (0, _vue.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(() => {
                     if (customVal && validStore.visible) {
@@ -7282,82 +7374,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         internalData.hoverRow = null;
       },
+      /**
+       * 已废弃，被 getCellElement 替换
+       * @deprecated
+       */
       getCell(row, column) {
-        const rowid = (0, _util.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 = (0, _util.getCellValue)(row, column);
-        let cellLabel = cellValue;
-        if (formatter) {
-          let formatData;
-          const {
-            fullAllDataRowIdData
-          } = internalData;
-          const rowid = (0, _util.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.default.isString(formatter)) {
-            const gFormatOpts = formats.get(formatter);
-            const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
-            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
-          } else if (_xeUtils.default.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.default.findIndexOf(list, item => $xeTable.eqRow(item, row)) : -1;