vxe-table 4.7.30 → 4.7.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.30",
+  "version": "4.7.32",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.0.27"
+    "vxe-pc-ui": "^4.0.30"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/table/src/emits.ts

@@ -23,6 +23,7 @@ export default [
   'cell-mouseleave',
   'cell-selected',
   'cell-delete-value',
+  'cell-backspace-value',
   'header-cell-click',
   'header-cell-dblclick',
   'header-cell-menu',

package/packages/table/src/table.ts

@@ -2829,6 +2829,9 @@ export default defineComponent({
         }
         return nextTick()
       },
+      getParams () {
+        return props.params
+      },
       /**
        * 用于树结构，给行数据加载子节点
        */
@@ -4876,7 +4879,7 @@ export default defineComponent({
           const childrenField = treeOpts.children || treeOpts.childrenField
           const keyCode = evnt.keyCode
           const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE)
-          const isBack = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE)
+          const hasBackspaceKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE)
           const isTab = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB)
           const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER)
           const isSpacebar = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR)
@@ -4884,7 +4887,7 @@ export default defineComponent({
           const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP)
           const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT)
           const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN)
-          const isDel = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE)
+          const hasDeleteKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE)
           const isF2 = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2)
           const isContextMenu = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU)
           const hasMetaKey = evnt.metaKey
@@ -5009,11 +5012,31 @@ export default defineComponent({
             } else if (actived.row || actived.column) {
               $xeTable.moveTabSelected(actived.args, hasShiftKey, evnt)
             }
-          } else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+          } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
+            // 如果是删除键
+            if (!isEditStatus) {
+              const { delMethod } = keyboardOpts
+              const delPaqrams = {
+                row: selected.row,
+                rowIndex: tableMethods.getRowIndex(selected.row),
+                column: selected.column,
+                columnIndex: tableMethods.getColumnIndex(selected.column),
+                $table: $xeTable
+              }
+              if (delMethod) {
+                delMethod(delPaqrams)
+              } else {
+                setCellValue(selected.row, selected.column, null)
+              }
+              // 如果按下 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
               // 如果是删除键
-              if (keyboardOpts.isDel && (selected.row || selected.column)) {
+              if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
                 const delPaqrams = {
                   row: selected.row,
                   rowIndex: tableMethods.getRowIndex(selected.row),
@@ -5026,39 +5049,34 @@ export default defineComponent({
                 } else {
                   setCellValue(selected.row, selected.column, null)
                 }
-                if (isBack) {
-                  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)
-                  }
-                } else if (isDel) {
-                  // 如果按下 del 键，更新表尾数据
-                  tableMethods.updateFooter()
-                }
-                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt)
-              } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
-                // 如果树形表格回退键关闭当前行返回父节点
-                const { parent: parentRow } = XEUtils.findTree(internalData.afterFullData, item => item === currentRow, { children: childrenField })
-                if (parentRow) {
-                  evnt.preventDefault()
-                  params = {
-                    $table: $xeTable,
-                    row: parentRow,
-                    rowIndex: tableMethods.getRowIndex(parentRow),
-                    $rowIndex: tableMethods.getVMRowIndex(parentRow)
-                  }
-                  tableMethods.setTreeExpand(parentRow, false)
-                    .then(() => tableMethods.scrollToRow(parentRow))
-                    .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params))
+                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)
                 }
+                $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt)
+              }
+            }
+          } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+            // 如果树形表格回退键关闭当前行返回父节点
+            const { parent: parentRow } = XEUtils.findTree(internalData.afterTreeFullData, item => item === currentRow, { children: childrenField })
+            if (parentRow) {
+              evnt.preventDefault()
+              params = {
+                $table: $xeTable,
+                row: parentRow,
+                rowIndex: tableMethods.getRowIndex(parentRow),
+                $rowIndex: tableMethods.getVMRowIndex(parentRow)
               }
+              tableMethods.setTreeExpand(parentRow, false)
+                .then(() => tableMethods.scrollToRow(parentRow))
+                .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params))
             }
           } else if (keyboardConfig && isEnableConf(editConfig) && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
             const { editMethod } = keyboardOpts

package/styles/theme/base.scss

@@ -1,5 +1,3 @@
-$vxe-ui-status-error-color: #f56c6c;
-
 :root {
   /*font*/
   --vxe-ui-font-family: -apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;

package/styles/theme/dark.scss

@@ -3,12 +3,10 @@
 [data-vxe-ui-theme="dark"] {
   color-scheme: dark;
 
-  $vxe-ui-font-color: #a0a3a7;
-  
   /*font*/
-  --vxe-ui-font-color: #{$vxe-ui-font-color};
-  --vxe-ui-font-lighten-color: #{lighten($vxe-ui-font-color, 10%)};
-  --vxe-ui-font-darken-color: #{darken($vxe-ui-font-color, 10%)};
+  --vxe-ui-font-color: #a0a3a7;
+  --vxe-ui-font-lighten-color: #babdc0;
+  --vxe-ui-font-darken-color: #86898e;
 
   /*base*/
   --vxe-ui-base-popup-border-color: var(--vxe-ui-layout-background-color);

package/styles/theme/light.scss

@@ -1,12 +1,10 @@
 @import './base.scss';
 
 [data-vxe-ui-theme="light"] {
-  $vxe-ui-font-color: #606266;
-
   /*font*/
-  --vxe-ui-font-color: #{$vxe-ui-font-color};
-  --vxe-ui-font-lighten-color: #{lighten($vxe-ui-font-color, 10%)};
-  --vxe-ui-font-darken-color: #{darken($vxe-ui-font-color, 10%)};
+  --vxe-ui-font-color: #606266;
+  --vxe-ui-font-lighten-color: #797b80;
+  --vxe-ui-font-darken-color: #47494c;
 
   /*base*/
   --vxe-ui-base-popup-border-color: #DADCE0;