vxe-table 3.4.5 → 3.4.6

package/packages/grid/src/grid.js

@@ -670,7 +670,11 @@ export default {
               body.insertRecords = insertRecords.filter(row => pendingRecords.indexOf(row) === -1)
             }
             // 只校验新增和修改的数据
-            return this.validate(body.insertRecords.concat(updateRecords)).then(() => {
+            return this.validate(body.insertRecords.concat(updateRecords)).then((errMap) => {
+              if (errMap) {
+                // 如果校验不通过
+                return
+              }
               if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
                 this.tableLoading = true
                 return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs))
@@ -715,7 +719,7 @@ export default {
                   VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' })
                 }
               }
-            }).catch(errMap => errMap)
+            })
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
               UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.save'])

package/packages/table/src/methods.js

@@ -2097,7 +2097,7 @@ const Methods = {
    * 表格键盘事件
    */
   keydownEvent (evnt) {
-    const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts } = this
+    const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts, keyboardOpts } = this
     const { actived } = editStore
     const { keyCode } = evnt
     const isEsc = keyCode === 27
@@ -2110,13 +2110,15 @@ const Methods = {
           // 如果按下了 Esc 键，关闭快捷菜单、筛选
           this.closeFilter()
           this.closeMenu()
-          // 如果是激活编辑状态，则取消编辑
-          if (actived.row) {
-            const params = actived.args
-            this.clearActived(evnt)
-            // 如果配置了选中功能，则为选中状态
-            if (mouseConfig && mouseOpts.selected) {
-              this.$nextTick(() => this.handleSelected(params, evnt))
+          if (keyboardConfig && keyboardOpts.isEsc) {
+            // 如果是激活编辑状态，则取消编辑
+            if (actived.row) {
+              const params = actived.args
+              this.clearActived(evnt)
+              // 如果配置了选中功能，则为选中状态
+              if (mouseConfig && mouseOpts.selected) {
+                this.$nextTick(() => this.handleSelected(params, evnt))
+              }
             }
           }
         }

package/packages/table/src/table.js

@@ -114,15 +114,15 @@ export default {
     footerAlign: { type: String, default: () => GlobalConfig.table.footerAlign },
     // 是否显示表头
     showHeader: { type: Boolean, default: () => GlobalConfig.table.showHeader },
-    // 是否要高亮当前选中行
+    // （即将废弃）是否要高亮当前选中行
     highlightCurrentRow: { type: Boolean, default: () => GlobalConfig.table.highlightCurrentRow },
-    // 鼠标移到行是否要高亮显示
+    // （即将废弃）鼠标移到行是否要高亮显示
     highlightHoverRow: { type: Boolean, default: () => GlobalConfig.table.highlightHoverRow },
-    // 是否要高亮当前选中列
+    // （即将废弃）是否要高亮当前选中列
     highlightCurrentColumn: { type: Boolean, default: () => GlobalConfig.table.highlightCurrentColumn },
-    // 鼠标移到列是否要高亮显示
+    // （即将废弃）鼠标移到列是否要高亮显示
     highlightHoverColumn: { type: Boolean, default: () => GlobalConfig.table.highlightHoverColumn },
-    // 激活单元格编辑时是否高亮显示
+    // （即将废弃）激活单元格编辑时是否高亮显示
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
@@ -235,7 +235,7 @@ export default {
     scrollX: Object,
     // 纵向虚拟滚动配置项
     scrollY: Object,
-    // 优化相关
+    // （即将废弃）优化相关
     animat: { type: Boolean, default: () => GlobalConfig.table.animat },
     delayHover: { type: Number, default: () => GlobalConfig.table.delayHover },
     // 额外的参数

package/packages/v-x-e-table/src/conf.js

@@ -91,6 +91,9 @@ export default {
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },