vxe-table 3.7.7 → 3.7.8-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.7.7",
+  "version": "3.7.8-beta.0",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -27,7 +27,7 @@
   "typings": "types/index.d.ts",
   "dependencies": {
     "dom-zindex": "^1.0.1",
-    "xe-utils": "^3.5.14"
+    "xe-utils": "^3.5.15"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.7",

package/packages/edit/src/mixin.js

@@ -431,7 +431,7 @@ export default {
         if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
           // 判断是否禁用编辑
           let type = 'edit-disabled'
-          if (!beforeEditMethod || beforeEditMethod({ ...params, $table: this })) {
+          if (!beforeEditMethod || beforeEditMethod({ ...params, $table: this, $grid: this.$xegrid })) {
             if (mouseConfig) {
               this.clearSelected(evnt)
               this.clearCellAreas(evnt)

package/packages/input/src/input.js

@@ -1657,8 +1657,12 @@ export default {
           this.dateCheckMonth(date)
         } else {
           this.dateChange(date)
-          if (!multiple) {
-            this.hidePanel()
+          if (type === 'datetime') {
+            // 日期带时间
+          } else {
+            if (!multiple) {
+              this.hidePanel()
+            }
           }
         }
       }

package/packages/table/index.js

@@ -8,7 +8,10 @@ export const Table = Object.assign(VxeTable, {
       VxeTable.mixins.push(window.VXETableMixin)
       delete window.VXETableMixin
     }
-    if (typeof window !== 'undefined' && window.VXETablePro && window.VXETablePro.init) {
+    if (typeof window !== 'undefined' && window.VXETableExtendCellArea && window.VXETableExtendCellArea.init) {
+      window.VXETableExtendCellArea.init(VXETable)
+      delete window.VXETableExtendCellArea
+    } else if (typeof window !== 'undefined' && window.VXETablePro && window.VXETablePro.init) {
       window.VXETablePro.init(VXETable)
       delete window.VXETablePro
     }

package/packages/table/src/methods.js

@@ -2706,14 +2706,15 @@ const Methods = {
           // 如果是按下非功能键之外允许直接编辑
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
             const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-            if (!beforeEditMethod || beforeEditMethod({ ...selected.args, $table: this })) {
+            if (!beforeEditMethod || beforeEditMethod({ ...selected.args, $table: this, $grid: this.$xegrid })) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
                   rowIndex: this.getRowIndex(selected.row),
                   column: selected.column,
                   columnIndex: this.getColumnIndex(selected.column),
-                  $table: this
+                  $table: this,
+                  $grid: this.$xegrid
                 })
               } else {
                 setCellValue(selected.row, selected.column, null)
@@ -5174,7 +5175,10 @@ const Methods = {
   getCell (row, column) {
     const { $refs } = this
     const rowid = getRowid(this, row)
-    const bodyElem = $refs[`${column.fixed || 'table'}Body`] || $refs.tableBody
+    let bodyElem = null
+    if (column) {
+      bodyElem = $refs[`${column.fixed || 'table'}Body`] || $refs.tableBody
+    }
     if (bodyElem && bodyElem.$el) {
       return bodyElem.$el.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`)
     }