vxe-table 4.7.67 → 4.7.69

package/es/table/src/table.js

@@ -318,6 +318,10 @@ export default defineComponent({
             fullDataRowIdData: {},
             fullColumnIdData: {},
             fullColumnFieldData: {},
+            // 列选取状态
+            columnStatusMaps: {},
+            // 行选取状态
+            rowStatusMaps: {},
             inited: false,
             tooltipTimeout: null,
             initStatus: false,
@@ -4918,7 +4922,6 @@ export default defineComponent({
                     const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
                     const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
                     const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-                    let params;
                     if (operCtxMenu) {
                         // 如果配置了右键菜单; 支持方向键操作、回车
                         evnt.preventDefault();
@@ -4982,7 +4985,7 @@ export default defineComponent({
                         if (hasCtrlKey) {
                             // 如果是激活编辑状态，则取消编辑
                             if (actived.row) {
-                                params = actived.args;
+                                const params = actived.args;
                                 $xeTable.clearEdit(evnt);
                                 // 如果配置了选中功能，则为选中状态
                                 if (mouseOpts.selected) {
@@ -5017,7 +5020,7 @@ export default defineComponent({
                                 if (childrens && childrens.length) {
                                     evnt.preventDefault();
                                     const targetRow = childrens[0];
-                                    params = {
+                                    const params = {
                                         $table: $xeTable,
                                         row: targetRow,
                                         rowIndex: tableMethods.getRowIndex(targetRow),
@@ -5055,24 +5058,25 @@ export default defineComponent({
                         // 如果是删除键
                         if (!isEditStatus) {
                             const { delMethod } = keyboardOpts;
-                            const delPaqrams = {
+                            const params = {
                                 row: selected.row,
                                 rowIndex: tableMethods.getRowIndex(selected.row),
                                 column: selected.column,
                                 columnIndex: tableMethods.getColumnIndex(selected.column),
-                                $table: $xeTable
+                                $table: $xeTable,
+                                $grid: $xeGrid
                             };
                             // 是否被禁用
                             if (!beforeEditMethod || beforeEditMethod(params)) {
                                 if (delMethod) {
-                                    delMethod(delPaqrams);
+                                    delMethod(params);
                                 }
                                 else {
                                     setCellValue(selected.row, selected.column, null);
                                 }
                                 // 如果按下 del 键，更新表尾数据
                                 tableMethods.updateFooter();
-                                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
+                                $xeTable.dispatchEvent('cell-delete-value', params, evnt);
                             }
                         }
                     }
@@ -5081,29 +5085,24 @@ export default defineComponent({
                             const { backMethod } = keyboardOpts;
                             // 如果是删除键
                             if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
-                                const delPaqrams = {
+                                const params = {
                                     row: selected.row,
                                     rowIndex: tableMethods.getRowIndex(selected.row),
                                     column: selected.column,
                                     columnIndex: tableMethods.getColumnIndex(selected.column),
-                                    $table: $xeTable
+                                    $table: $xeTable,
+                                    $grid: $xeGrid
                                 };
                                 // 是否被禁用
                                 if (!beforeEditMethod || beforeEditMethod(params)) {
                                     if (backMethod) {
-                                        backMethod({
-                                            row: selected.row,
-                                            rowIndex: tableMethods.getRowIndex(selected.row),
-                                            column: selected.column,
-                                            columnIndex: tableMethods.getColumnIndex(selected.column),
-                                            $table: $xeTable
-                                        });
+                                        backMethod(params);
                                     }
                                     else {
                                         setCellValue(selected.row, selected.column, null);
                                         $xeTable.handleActived(selected.args, evnt);
                                     }
-                                    $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
+                                    $xeTable.dispatchEvent('cell-backspace-value', params, evnt);
                                 }
                             }
                         }
@@ -5113,11 +5112,12 @@ export default defineComponent({
                         const { parent: parentRow } = XEUtils.findTree(internalData.afterTreeFullData, item => item === currentRow, { children: childrenField });
                         if (parentRow) {
                             evnt.preventDefault();
-                            params = {
-                                $table: $xeTable,
+                            const params = {
                                 row: parentRow,
                                 rowIndex: tableMethods.getRowIndex(parentRow),
-                                $rowIndex: tableMethods.getVMRowIndex(parentRow)
+                                $rowIndex: tableMethods.getVMRowIndex(parentRow),
+                                $table: $xeTable,
+                                $grid: $xeGrid
                             };
                             tableMethods.setTreeExpand(parentRow, false)
                                 .then(() => tableMethods.scrollToRow(parentRow))
@@ -5133,16 +5133,17 @@ export default defineComponent({
                         // 如果是按下非功能键之外允许直接编辑
                         if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
                             const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+                            const params = {
+                                row: selected.row,
+                                rowIndex: tableMethods.getRowIndex(selected.row),
+                                column: selected.column,
+                                columnIndex: tableMethods.getColumnIndex(selected.column),
+                                $table: $xeTable,
+                                $grid: $xeGrid
+                            };
                             if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, selected.args), { $table: $xeTable, $grid: $xeGrid }))) {
                                 if (editMethod) {
-                                    editMethod({
-                                        row: selected.row,
-                                        rowIndex: tableMethods.getRowIndex(selected.row),
-                                        column: selected.column,
-                                        columnIndex: tableMethods.getColumnIndex(selected.column),
-                                        $table: $xeTable,
-                                        $grid: $xeGrid
-                                    });
+                                    editMethod(params);
                                 }
                                 else {
                                     setCellValue(selected.row, selected.column, null);
@@ -5151,14 +5152,7 @@ export default defineComponent({
                                 const afterEditMethod = editOpts.afterEditMethod;
                                 if (afterEditMethod) {
                                     nextTick(() => {
-                                        afterEditMethod({
-                                            row: selected.row,
-                                            rowIndex: tableMethods.getRowIndex(selected.row),
-                                            column: selected.column,
-                                            columnIndex: tableMethods.getColumnIndex(selected.column),
-                                            $table: $xeTable,
-                                            $grid: $xeGrid
-                                        });
+                                        afterEditMethod(params);
                                     });
                                 }
                             }

package/es/table/style.css

@@ -1002,6 +1002,7 @@
 .vxe-table-custom-popup--body {
   overflow: auto;
   height: 100%;
+  outline: 0;
 }
 
 .vxe-table-custom-popup--table-wrapper {
@@ -1173,6 +1174,7 @@
   overflow: auto;
   margin: 0;
   padding: 0;
+  outline: 0;
   -webkit-user-select: none;
      -moz-user-select: none;
           user-select: none;
@@ -1429,6 +1431,7 @@
   list-style-type: none;
   padding: 0;
   margin: 0;
+  outline: 0;
   overflow: auto;
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -1666,6 +1669,7 @@
 .vxe-table--fixed-right-body-wrapper {
   overflow-y: auto;
   overflow-x: auto;
+  outline: 0;
 }
 
 /*默认的渲染*/
@@ -2083,9 +2087,11 @@
 .vxe-table--render-default .vxe-table--footer-wrapper {
   overflow-x: hidden;
   overflow-y: hidden;
+  outline: 0;
 }
 .vxe-table--render-default:not(.is--empty).is--footer.is--scroll-x .vxe-table--body-wrapper {
   overflow-x: scroll;
+  outline: 0;
 }
 .vxe-table--render-default .vxe-body--row.row--stripe {
   background-color: var(--vxe-ui-table-row-striped-background-color);
@@ -2388,10 +2394,12 @@
   overflow: hidden;
   background-color: inherit;
   transition: 0.3s box-shadow;
+  outline: 0;
 }
 .vxe-table--render-default .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper,
 .vxe-table--render-default .vxe-table--fixed-right-wrapper .vxe-table--body-wrapper {
   overflow-x: hidden;
+  outline: 0;
 }
 .vxe-table--render-default .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper {
   width: calc(100% + 40px);
@@ -2425,6 +2433,7 @@
 .vxe-table--render-default .vxe-table--footer-wrapper.fixed-right--wrapper {
   position: absolute;
   top: 0;
+  outline: 0;
 }
 .vxe-table--render-default .vxe-table--header-wrapper.fixed-left--wrapper,
 .vxe-table--render-default .vxe-table--body-wrapper.fixed-left--wrapper,
@@ -2558,6 +2567,7 @@
 }
 .vxe-table--render-default .vxe-body--expanded-cell.is--ellipsis {
   overflow: auto;
+  outline: 0;
 }
 .vxe-table--render-default .vxe-header--column.col--ellipsis:not(.col--active) > .vxe-cell,
 .vxe-table--render-default .vxe-body--column.col--ellipsis:not(.col--active) > .vxe-cell,
@@ -2613,6 +2623,7 @@
   overflow: hidden;
   width: 100%;
   pointer-events: none;
+  outline: 0;
 }
 .vxe-table--render-default .vxe-table--empty-block {
   display: none;
@@ -2797,6 +2808,7 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .vxe-table--footer-wrapper.body--wrapper {
   overflow-x: auto;
+  outline: 0;
 }
 
 .vxe-footer--column.col--ellipsis > .vxe-cell {