vxe-table 4.17.5 → 4.17.6

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

@@ -264,15 +264,17 @@ hooks.add('tableExportModule', {
         };
         const getSeq = (cellValue, row, $rowIndex, column, $columnIndex) => {
             const seqOpts = computeSeqOpts.value;
-            const seqMethod = seqOpts.seqMethod || column.seqMethod;
-            if (seqMethod) {
-                return seqMethod({
+            const seqMd = seqOpts.seqMethod || column.seqMethod;
+            if (seqMd) {
+                return seqMd({
                     $table: $xeTable,
                     row,
                     rowIndex: $xeTable.getRowIndex(row),
+                    _rowIndex: $xeTable.getVTRowIndex(row),
                     $rowIndex,
                     column,
                     columnIndex: $xeTable.getColumnIndex(column),
+                    _columnIndex: $xeTable.getVTColumnIndex(column),
                     $columnIndex
                 });
             }

package/es/table/src/cell.js

@@ -628,9 +628,9 @@ export const Cell = {
             return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
         }
         const { seq } = params;
-        const seqMethod = seqOpts.seqMethod;
+        const seqMd = seqOpts.seqMethod;
         return renderCellBaseVNs(params, [
-            h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)
+            h('span', `${formatText(seqMd ? seqMd(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)
         ]);
     },
     renderDeepIndexCell(params) {

package/es/toolbar/src/toolbar.js

@@ -342,7 +342,7 @@ export default defineVxeComponent({
                     }
                     return VxeUIButtonComponent
                         ? h(VxeUIButtonComponent, Object.assign(Object.assign({ key: index }, Object.assign({}, child, {
-                            content: child.name,
+                            content: child.content || child.name,
                             options: undefined
                         })), { onClick: (eventParams) => isBtn ? btnEvent(eventParams, child) : tolEvent(eventParams, child) }))
                         : createCommentVNode();
@@ -379,7 +379,7 @@ export default defineVxeComponent({
                         else {
                             if (VxeUIButtonComponent) {
                                 btnVNs.push(h(VxeUIButtonComponent, Object.assign(Object.assign({ key: `bd${item.code || index}` }, Object.assign({}, item, {
-                                    content: item.name,
+                                    content: item.content || item.name,
                                     options: undefined
                                 })), { onClick: (eventParams) => btnEvent(eventParams, item) }), dropdowns && dropdowns.length
                                     ? {
@@ -426,7 +426,7 @@ export default defineVxeComponent({
                         else {
                             if (VxeUIButtonComponent) {
                                 btnVNs.push(h(VxeUIButtonComponent, Object.assign(Object.assign({ key: tIndex }, Object.assign({}, item, {
-                                    content: item.name,
+                                    content: item.content || item.name,
                                     options: undefined
                                 })), { onClick: (eventParams) => tolEvent(eventParams, item) }), dropdowns && dropdowns.length
                                     ? {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.17.5";
+export const version = "4.17.6";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3141,7 +3141,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.5";
+const version = "4.17.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3654,7 +3654,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.5"}`;
+const log_version = `table v${"4.17.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5728,8 +5728,8 @@ const Cell = {
     const {
       seq
     } = params;
-    const seqMethod = seqOpts.seqMethod;
-    return renderCellBaseVNs(params, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)]);
+    const seqMd = seqOpts.seqMethod;
+    return renderCellBaseVNs(params, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', `${formatText(seqMd ? seqMd(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)]);
   },
   renderDeepIndexCell(params) {
     return Cell.renderDeepNodeBtn(params, Cell.renderSeqCell(params));
@@ -14142,15 +14142,17 @@ export_hook_hooks.add('tableExportModule', {
     };
     const getSeq = (cellValue, row, $rowIndex, column, $columnIndex) => {
       const seqOpts = computeSeqOpts.value;
-      const seqMethod = seqOpts.seqMethod || column.seqMethod;
-      if (seqMethod) {
-        return seqMethod({
+      const seqMd = seqOpts.seqMethod || column.seqMethod;
+      if (seqMd) {
+        return seqMd({
           $table: $xeTable,
           row,
           rowIndex: $xeTable.getRowIndex(row),
+          _rowIndex: $xeTable.getVTRowIndex(row),
           $rowIndex,
           column,
           columnIndex: $xeTable.getColumnIndex(column),
+          _columnIndex: $xeTable.getVTColumnIndex(column),
           $columnIndex
         });
       }
@@ -20286,7 +20288,7 @@ function toolbar_createInternalData() {
           return VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
             key: index,
             ...Object.assign({}, child, {
-              content: child.name,
+              content: child.content || child.name,
               options: undefined
             }),
             onClick: eventParams => isBtn ? btnEvent(eventParams, child) : tolEvent(eventParams, child)
@@ -20342,7 +20344,7 @@ function toolbar_createInternalData() {
                 btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
                   key: `bd${item.code || index}`,
                   ...Object.assign({}, item, {
-                    content: item.name,
+                    content: item.content || item.name,
                     options: undefined
                   }),
                   onClick: eventParams => btnEvent(eventParams, item)
@@ -20412,7 +20414,7 @@ function toolbar_createInternalData() {
                 btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
                   key: tIndex,
                   ...Object.assign({}, item, {
-                    content: item.name,
+                    content: item.content || item.name,
                     options: undefined
                   }),
                   onClick: eventParams => tolEvent(eventParams, item)