vxe-table 4.7.66 → 4.7.68

package/packages/table/src/table.ts

@@ -331,6 +331,10 @@ export default defineComponent({
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 列选取状态
+      columnStatusMaps: {},
+      // 行选取状态
+      rowStatusMaps: {},
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -4982,6 +4986,7 @@ export default defineComponent({
           const operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow
           const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow)
           const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row
+          const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
           let params: any
           if (operCtxMenu) {
             // 如果配置了右键菜单; 支持方向键操作、回车
@@ -5108,18 +5113,21 @@ export default defineComponent({
                 columnIndex: tableMethods.getColumnIndex(selected.column),
                 $table: $xeTable
               }
-              if (delMethod) {
-                delMethod(delPaqrams)
-              } else {
-                setCellValue(selected.row, selected.column, null)
+              // 是否被禁用
+              if (!beforeEditMethod || beforeEditMethod(params)) {
+                if (delMethod) {
+                  delMethod(delPaqrams)
+                } else {
+                  setCellValue(selected.row, selected.column, null)
+                }
+                // 如果按下 del 键，更新表尾数据
+                tableMethods.updateFooter()
+                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt)
               }
-              // 如果按下 del 键，更新表尾数据
-              tableMethods.updateFooter()
-              $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt)
             }
           } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
             if (!isEditStatus) {
-              const { delMethod, backMethod } = keyboardOpts
+              const { backMethod } = keyboardOpts
               // 如果是删除键
               if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
                 const delPaqrams = {
@@ -5129,23 +5137,22 @@ export default defineComponent({
                   columnIndex: tableMethods.getColumnIndex(selected.column),
                   $table: $xeTable
                 }
-                if (delMethod) {
-                  delMethod(delPaqrams)
-                } else {
-                  setCellValue(selected.row, selected.column, null)
-                }
-                if (backMethod) {
-                  backMethod({
-                    row: selected.row,
-                    rowIndex: tableMethods.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: tableMethods.getColumnIndex(selected.column),
-                    $table: $xeTable
-                  })
-                } else {
-                  $xeTable.handleActived(selected.args, evnt)
+                // 是否被禁用
+                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
+                    })
+                  } else {
+                    setCellValue(selected.row, selected.column, null)
+                    $xeTable.handleActived(selected.args, evnt)
+                  }
+                  $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt)
                 }
-                $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt)
               }
             }
           } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {

package/styles/components/grid.scss

@@ -40,6 +40,7 @@
   .vxe-grid--right-wrapper {
     flex-shrink: 0;
     overflow: auto;
+    outline: 0;
   }
   .vxe-grid--table-wrapper {
     flex-grow: 1;

package/styles/components/table-module/custom.scss

@@ -220,6 +220,7 @@
 .vxe-table-custom-popup--body {
   overflow: auto;
   height: 100%;
+  outline: 0;
 }
 
 .vxe-table-custom-popup--table-wrapper {

package/styles/components/table-module/export.scss

@@ -5,6 +5,7 @@
   overflow: auto;
   margin: 0;
   padding: 0;
+  outline: 0;
   user-select: none;
   & > li {
     overflow: hidden;

package/styles/components/table-module/filter.scss

@@ -72,6 +72,7 @@
     list-style-type: none;
     padding: 0;
     margin: 0;
+    outline: 0;
     overflow: auto;
     user-select: none;
   }

package/styles/components/table.scss

@@ -42,6 +42,7 @@
 .vxe-table--fixed-right-body-wrapper {
   overflow-y: auto;
   overflow-x: auto;
+  outline: 0;
 }
 
 /*默认的渲染*/
@@ -529,12 +530,14 @@
   .vxe-table--footer-wrapper {
     overflow-x: hidden;
     overflow-y: hidden;
+    outline: 0;
   }
   &:not(.is--empty) {
     &.is--footer {
       &.is--scroll-x {
         .vxe-table--body-wrapper {
           overflow-x: scroll;
+          outline: 0;
         }
       }
     }
@@ -909,8 +912,10 @@
     overflow: hidden;
     background-color: inherit;
     transition: 0.3s box-shadow;
+    outline: 0;
     .vxe-table--body-wrapper {
       overflow-x: hidden;
+      outline: 0;
     }
   }
   .vxe-table--fixed-left-wrapper {
@@ -949,6 +954,7 @@
     &.fixed-right--wrapper {
       position: absolute;
       top: 0;
+      outline: 0;
     }
     &.fixed-left--wrapper {
       left: 0;
@@ -1111,6 +1117,7 @@
     z-index: 1;
     &.is--ellipsis {
       overflow: auto;
+      outline: 0;
     }
   }
 
@@ -1219,6 +1226,7 @@
     overflow: hidden;
     width: 100%;
     pointer-events: none;
+    outline: 0;
   }
   .vxe-table--empty-block {
     display: none;
@@ -1470,6 +1478,7 @@ div.vxe-table--tooltip-wrapper {
   margin-top: -1px;
   &.body--wrapper{
     overflow-x: auto;
+    outline: 0;
   }
 }
 

package/styles/theme/base.scss

@@ -57,6 +57,7 @@
   --vxe-ui-table-cell-dirty-insert-color: #19A15F;
   --vxe-ui-table-cell-area-border-color: var(--vxe-ui-font-primary-color);
   --vxe-ui-table-cell-area-border-width: 1px;
+  --vxe-ui-table-cell-area-status-border-width: var(--vxe-ui-table-cell-area-border-width);
   --vxe-ui-table-cell-main-area-extension-border-color: #fff;
   --vxe-ui-table-cell-main-area-extension-background-color: var(--vxe-ui-font-primary-color);
   --vxe-ui-table-cell-extend-area-border-width: 2px;