vxe-table 4.2.2-beta.1 → 4.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.2.2-beta.1",
+  "version": "4.2.2",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/edit/src/hook.ts

@@ -482,7 +482,7 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
             $columnIndex: $xetable.getVMColumnIndex(column)
           }, evnt || null)
         }
-        return ($xetable.clearValidate ? $xetable.clearValidate() : nextTick()).then(() => $xetable.recalculate())
+        return $xetable.clearValidate ? $xetable.clearValidate() : nextTick()
       },
       /**
        * 清除所选中源状态
@@ -575,7 +575,9 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
                 }
               }
               $xetable.closeTooltip()
-              editMethods.clearActived(evnt)
+              if (actived.column) {
+                editMethods.clearActived(evnt)
+              }
               type = 'edit-actived'
               column.renderHeight = cell.offsetHeight
               actived.args = params

package/packages/grid/src/grid.ts

@@ -772,7 +772,7 @@ export default defineComponent({
                   if (rest) {
                     if (isEnableConf(pagerConfig)) {
                       const total = XEUtils.get(rest, proxyProps.total || 'page.total') || 0
-                      tablePage.total = total
+                      tablePage.total = XEUtils.toNumber(total)
                       reactData.tableData = XEUtils.get(rest, proxyProps.result || 'result') || []
                       // 检验当前页码，不能超出当前最大页数
                       const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1)