vxe-table 3.8.4 → 3.8.5-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.4",
+  "version": "3.8.5-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.2",
-    "xe-utils": "^3.5.25"
+    "xe-utils": "^3.5.26"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/edit/src/mixin.js

@@ -422,85 +422,90 @@ export default {
     handleActived (params, evnt) {
       const { editStore, editOpts, tableColumn, editConfig, mouseConfig } = this
       const { mode } = editOpts
-      const { actived } = editStore
+      const { actived, focused } = editStore
       const { row, column } = params
       const { editRender } = column
       const cell = params.cell = (params.cell || this.getCell(row, column))
       const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-      if (isEnableConf(editConfig) && isEnableConf(editRender) && !this.hasPendingByRow(row) && cell) {
-        if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
-          // 判断是否禁用编辑
-          let type = 'edit-disabled'
-          if (!beforeEditMethod || beforeEditMethod({ ...params, $table: this, $grid: this.$xegrid })) {
+      if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
+        // 激活编辑
+        if (!this.hasPendingByRow(row)) {
+          if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
+            // 判断是否禁用编辑
+            let type = 'edit-disabled'
+            if (!beforeEditMethod || beforeEditMethod({ ...params, $table: this, $grid: this.$xegrid })) {
+              if (mouseConfig) {
+                this.clearSelected(evnt)
+                this.clearCellAreas(evnt)
+                this.clearCopyCellArea(evnt)
+              }
+              this.closeTooltip()
+              if (actived.column) {
+                this.clearEdit(evnt)
+              }
+              type = 'edit-activated'
+              column.renderHeight = cell.offsetHeight
+              actived.args = params
+              actived.row = row
+              actived.column = column
+              if (mode === 'row') {
+                tableColumn.forEach(column => this._getColumnModel(row, column))
+              } else {
+                this._getColumnModel(row, column)
+              }
+              const afterEditMethod = editOpts.afterEditMethod
+              this.$nextTick(() => {
+                this.handleFocus(params, evnt)
+                if (afterEditMethod) {
+                  afterEditMethod({ ...params, $table: this, $grid: this.$xegrid })
+                }
+              })
+            }
+            this.emitEvent(type, {
+              row,
+              rowIndex: this.getRowIndex(row),
+              $rowIndex: this.getVMRowIndex(row),
+              column,
+              columnIndex: this.getColumnIndex(column),
+              $columnIndex: this.getVMColumnIndex(column)
+            }, evnt)
+
+            // v4已废弃
+            if (type === 'edit-activated') {
+              this.emitEvent('edit-actived', {
+                row,
+                rowIndex: this.getRowIndex(row),
+                $rowIndex: this.getVMRowIndex(row),
+                column,
+                columnIndex: this.getColumnIndex(column),
+                $columnIndex: this.getVMColumnIndex(column)
+              }, evnt)
+            }
+          } else {
+            const { column: oldColumn } = actived
             if (mouseConfig) {
               this.clearSelected(evnt)
               this.clearCellAreas(evnt)
               this.clearCopyCellArea(evnt)
             }
-            this.closeTooltip()
-            if (actived.column) {
-              this.clearEdit(evnt)
+            if (oldColumn !== column) {
+              const { model: oldModel } = oldColumn
+              if (oldModel.update) {
+                UtilTools.setCellValue(row, oldColumn, oldModel.value)
+              }
+              this.clearValidate()
             }
-            type = 'edit-activated'
             column.renderHeight = cell.offsetHeight
             actived.args = params
-            actived.row = row
             actived.column = column
-            if (mode === 'row') {
-              tableColumn.forEach(column => this._getColumnModel(row, column))
-            } else {
-              this._getColumnModel(row, column)
-            }
-            const afterEditMethod = editOpts.afterEditMethod
-            this.$nextTick(() => {
+            setTimeout(() => {
               this.handleFocus(params, evnt)
-              if (afterEditMethod) {
-                afterEditMethod({ ...params, $table: this, $grid: this.$xegrid })
-              }
             })
           }
-          this.emitEvent(type, {
-            row,
-            rowIndex: this.getRowIndex(row),
-            $rowIndex: this.getVMRowIndex(row),
-            column,
-            columnIndex: this.getColumnIndex(column),
-            $columnIndex: this.getVMColumnIndex(column)
-          }, evnt)
-
-          // v4已废弃
-          if (type === 'edit-activated') {
-            this.emitEvent('edit-actived', {
-              row,
-              rowIndex: this.getRowIndex(row),
-              $rowIndex: this.getVMRowIndex(row),
-              column,
-              columnIndex: this.getColumnIndex(column),
-              $columnIndex: this.getVMColumnIndex(column)
-            }, evnt)
-          }
-        } else {
-          const { column: oldColumn } = actived
-          if (mouseConfig) {
-            this.clearSelected(evnt)
-            this.clearCellAreas(evnt)
-            this.clearCopyCellArea(evnt)
-          }
-          if (oldColumn !== column) {
-            const { model: oldModel } = oldColumn
-            if (oldModel.update) {
-              UtilTools.setCellValue(row, oldColumn, oldModel.value)
-            }
-            this.clearValidate()
-          }
-          column.renderHeight = cell.offsetHeight
-          actived.args = params
-          actived.column = column
-          setTimeout(() => {
-            this.handleFocus(params, evnt)
-          })
+          focused.column = null
+          focused.row = null
+          this.focus()
         }
-        this.focus()
       }
       return this.$nextTick()
     },
@@ -570,9 +575,9 @@ export default {
       return this.$nextTick()
     },
     _getActiveRecord () {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord'])
-      // }
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord'])
+      }
       // 即将废弃
       return this.getEditRecord()
     },
@@ -586,9 +591,9 @@ export default {
       return null
     },
     _isActiveByRow (row) {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
-      // }
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
+      }
       // 即将废弃
       return this.isEditByRow(row)
     },
@@ -642,9 +647,9 @@ export default {
       }
     },
     _setActiveRow (row) {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow'])
-      // }
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow'])
+      }
       // 即将废弃
       return this.setEditRow(row)
     },
@@ -659,9 +664,9 @@ export default {
       return this.setEditCell(row, column)
     },
     _setActiveCell (row) {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell'])
-      // }
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell'])
+      }
       // 即将废弃
       return this.setEditCell(row)
     },

package/packages/table/src/methods.js

@@ -2420,6 +2420,11 @@ const Methods = {
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
       evntList = VXETable.interceptor.get('event.clearActived')
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (evntList.length) {
+          warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
+        }
+      }
     }
     // 兼容老版本
 
@@ -3897,8 +3902,8 @@ const Methods = {
    * 如果是双击模式，则单击后选中状态
    */
   triggerCellClickEvent (evnt, params) {
-    const { highlightCurrentRow, editStore, radioOpts, expandOpts, treeOpts, editConfig, editOpts, checkboxOpts, rowOpts } = this
-    const { actived } = editStore
+    const { highlightCurrentRow, editStore, radioOpts, expandOpts, treeOpts, keyboardOpts, editConfig, editOpts, checkboxOpts, rowOpts } = this
+    const { actived, focused } = editStore
     const { row, column } = params
     const { type, treeNode } = column
     const isRadioType = type === 'radio'
@@ -3940,6 +3945,11 @@ const Methods = {
       }
       // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
       if (isEnableConf(editConfig)) {
+        // 记录点击输入框聚焦状态
+        if (keyboardOpts.arrowCursorLock && evnt && editOpts.mode === 'cell' && evnt.target && /^input|textarea$/i.test(evnt.target.tagName)) {
+          focused.column = column
+          focused.row = row
+        }
         if (editOpts.trigger === 'manual') {
           if (actived.args && actived.row === row && column !== actived.column) {
             this.handleChangeCell(evnt, params)

package/packages/table/src/table.js

@@ -778,15 +778,15 @@ export default {
     })
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      // if (this.rowId) {
-      //   warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
-      // }
-      // if (this.rowKey) {
-      //   warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
-      // }
-      // if (this.columnKey) {
-      //   warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
-      // }
+      if (this.rowId) {
+        warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
+      }
+      if (this.rowKey) {
+        warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey'])
+      }
+      if (this.columnKey) {
+        warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey'])
+      }
       if (!(this.rowId || rowOpts.keyField) && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
         warnLog('vxe.error.reqProp', ['row-config.keyField'])
       }

package/styles/table.scss

@@ -937,20 +937,20 @@
   }
 
   /*树形节点*/
-  &.is--tree-line {
-    .vxe-body--row {
-      &:first-child {
-        .vxe-tree--line {
-          border-width: 0 0 1px 0;
-        }
-      }
-    }
-    .vxe-body--row {
-      .vxe-body--column {
-        background-image: none;
-      }
-    }
-  }
+  // &.is--tree-line {
+  //   .vxe-body--row {
+  //     &:first-child {
+  //       .vxe-tree--line {
+  //         border-width: 0 0 1px 0;
+  //       }
+  //     }
+  //   }
+  //   .vxe-body--row {
+  //     .vxe-body--column {
+  //       background-image: none;
+  //     }
+  //   }
+  // }
   .vxe-tree--line-wrapper {
     position: relative;
     display: block;