vxe-table 3.20.13 → 3.21.0-beta.0

package/es/table/module/edit/mixin.js

@@ -36,7 +36,7 @@ function syncActivedCell($xeTable) {
     const editOpts = $xeTable.computeEditOpts;
     const { actived } = editStore;
     const { row, column } = actived;
-    if (row || column) {
+    if (row && column) {
         if (editOpts.mode === 'row') {
             tableColumn.forEach((column) => setEditColumnModel(row, column));
         }
@@ -85,6 +85,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
             fullAllDataRowIdData[rowid] = rest;
         }
     });
+    $xeTable.handleClearStack();
 }
 // function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
 // }
@@ -142,6 +143,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
                     mergeItem.row = mergeRowIndex + newRecords.length;
                 }
             });
+            $xeTable.handleClearStack();
         }
     }
     else {
@@ -167,6 +169,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
                     afterFullData.push(item);
                     tableFullData.push(item);
                 });
+                $xeTable.handleClearStack();
             }
         }
         else {
@@ -220,6 +223,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
                             parentChilds.splice(targetIndex, 0, ...treeRecords);
                         }
                     }
+                    $xeTable.handleClearStack();
                 }
                 else {
                     warnLog('vxe.error.unableInsert');
@@ -272,6 +276,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
                         mergeItem.rowspan = mergeRowspan + newRecords.length;
                     }
                 });
+                $xeTable.handleClearStack();
             }
         }
     }
@@ -355,10 +360,10 @@ function handleClearEdit($xeTable, evnt, targetRow) {
             return $xeTable.$nextTick();
         }
         syncActivedCell($xeTable);
+        $xeTable.updateFooter();
         actived.args = null;
         actived.row = null;
         actived.column = null;
-        $xeTable.updateFooter();
         $xeTable.dispatchEvent('edit-closed', {
             row,
             rowIndex: $xeTable.getRowIndex(row),
@@ -379,7 +384,7 @@ function handleClearEdit($xeTable, evnt, targetRow) {
     }
     return $xeTable.$nextTick().then(() => $xeTable.updateCellAreas());
 }
-function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
+function handleEditActive($xeTable, params, evnt, options) {
     const props = $xeTable;
     const reactData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
@@ -390,6 +395,7 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
     const { actived, focused } = editStore;
     const { row, column } = params;
     const { editRender } = column;
+    const { isFocus, isPos, isClear } = options;
     const cell = (params.cell || $xeTable.getCellElement(row, column));
     const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
     params.cell = cell;
@@ -416,6 +422,10 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
                     actived.args = params;
                     actived.row = row;
                     actived.column = column;
+                    $xeTable.handlePushStack();
+                    if (isClear) {
+                        setCellValue(row, column, null);
+                    }
                     if (mode === 'row') {
                         tableColumn.forEach((column) => getEditColumnModel(row, column));
                     }
@@ -461,7 +471,7 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
                         $xeTable.clearCopyCellArea();
                     }
                 }
-                if (oldColumn !== column) {
+                if (oldColumn && oldColumn !== column) {
                     const { model: oldModel } = oldColumn;
                     if (oldModel.update) {
                         setCellValue(row, oldColumn, oldModel.value);
@@ -486,10 +496,11 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
     }
     return $xeTable.$nextTick();
 }
-function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
+function handleEditCell($xeTable, row, fieldOrColumn, options) {
     const props = $xeTable;
     const internalData = $xeTable;
     const { editConfig } = props;
+    const { isPos } = options;
     const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
     if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender) && !$xeTable.isAggregateRecord(row)) {
         return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
@@ -502,7 +513,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
                     columnIndex: $xeTable.getColumnIndex(column),
                     cell,
                     $table: $xeTable
-                }, null, isPos, isPos);
+                }, null, options);
                 internalData._lastCallTime = Date.now();
             }
             return $xeTable.$nextTick();
@@ -658,6 +669,7 @@ export default {
             reactData.removeRowFlag++;
             reactData.insertRowFlag++;
             reactData.pendingRowFlag++;
+            $xeTable.handleClearStack();
             $xeTable.cacheRowMap(false);
             $xeTable.handleTableData(treeConfig && transform);
             $xeTable.updateFooter();
@@ -779,9 +791,12 @@ export default {
         /**
          * 处理激活编辑
          */
-        handleEdit(params, evnt) {
+        handleEdit(params, evnt, options) {
             const $xeTable = this;
-            return handleEditActive($xeTable, params, evnt, true, true);
+            return handleEditActive($xeTable, params, evnt, Object.assign({
+                isFocus: true,
+                isPos: true
+            }, options));
         },
         /**
          * @deprecated
@@ -948,7 +963,7 @@ export default {
         /**
          * 激活行编辑
          */
-        _setEditRow(row, fieldOrColumn) {
+        _setEditRow(row, fieldOrColumn, options) {
             const $xeTable = this;
             const internalData = $xeTable;
             const { visibleColumn } = internalData;
@@ -960,7 +975,10 @@ export default {
                     column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
                 }
             }
-            return handleEditCell($xeTable, row, column, isPos);
+            return handleEditCell($xeTable, row, column, Object.assign({
+                isPos,
+                isFocus: isPos
+            }, options));
         },
         _setActiveCell(row, fieldOrColumn) {
             const $xeTable = this;
@@ -971,9 +989,12 @@ export default {
         /**
          * 激活单元格编辑
          */
-        _setEditCell(row, fieldOrColumn) {
+        _setEditCell(row, fieldOrColumn, options) {
             const $xeTable = this;
-            return handleEditCell($xeTable, row, fieldOrColumn, true);
+            return handleEditCell($xeTable, row, fieldOrColumn, Object.assign({
+                isFocus: true,
+                isPos: true
+            }, options));
         },
         /**
          * 只对 trigger=dblclick 有效，选中单元格

package/es/table/module/keyboard/mixin.js

@@ -510,8 +510,8 @@ export default {
             const checkboxOpts = $xeTable.computeCheckboxOpts;
             const mouseOpts = $xeTable.computeMouseOpts;
             const editOpts = $xeTable.computeEditOpts;
-            if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaModnEvent) {
-                return $xeTable.triggerClAreaModnEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.triggerCelllAreaMnEvent) {
+                return $xeTable.triggerCelllAreaMnEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

package/es/table/src/cell.js

@@ -323,8 +323,8 @@ function renderFooterHandle(h, params) {
     return Cell.renderDefaultFooter(h, params);
 }
 export const Cell = {
-    createColumn($xeTable, _vm) {
-        const { type } = _vm;
+    createColumn($xeTable, columnOpts) {
+        const { type } = columnOpts;
         const renConfs = {
             renderHeader: renderHeaderHandle,
             renderCell: renderCellHandle,
@@ -333,7 +333,7 @@ export const Cell = {
         if (type === 'expand') {
             renConfs.renderData = Cell.renderExpandData;
         }
-        return createColumn($xeTable, _vm, renConfs);
+        return createColumn($xeTable, columnOpts, renConfs);
     },
     /**
      * 列头标题

package/es/table/src/column.js

@@ -1,6 +1,6 @@
-import Cell from './cell';
 import { defineVxeComponent } from '../../ui/src/comp';
 import { assembleColumn, destroyColumn } from './util';
+import Cell from './cell';
 export const columnProps = {
     // 列唯一主键
     colId: [String, Number],
@@ -163,8 +163,9 @@ export default {
     name: 'VxeColumn',
     props: columnProps,
     provide() {
+        const $xeColumn = this;
         return {
-            $xeColumn: this,
+            $xeColumn,
             $xeGrid: null,
             $xeGantt: null
         };
@@ -179,8 +180,10 @@ export default {
     },
     watch: columnWatch,
     created() {
+        const $xeColumn = this;
+        const props = $xeColumn;
         const $xeTable = this.$xeTable;
-        this.columnConfig = this.createColumn($xeTable, this);
+        this.columnConfig = Cell.createColumn($xeTable, props);
     },
     mounted() {
         this.columnConfig.slots = this.$scopedSlots;

package/es/table/src/group.js

@@ -1,13 +1,14 @@
-import Cell from './cell';
 import { defineVxeComponent } from '../../ui/src/comp';
 import { assembleColumn, destroyColumn } from './util';
 import { columnProps, columnWatch } from './column';
+import Cell from './cell';
 export default {
     name: 'VxeColgroup',
     props: columnProps,
     provide() {
+        const $xeColgroup = this;
         return {
-            $xeColumn: this,
+            $xeColumn: $xeColgroup,
             $xeGrid: null,
             $xeGantt: null
         };
@@ -22,8 +23,10 @@ export default {
     },
     watch: columnWatch,
     created() {
+        const $xeColgroup = this;
+        const props = $xeColgroup;
         const $xeTable = this.$xeTable;
-        this.columnConfig = this.createColumn($xeTable, this);
+        this.columnConfig = Cell.createColumn($xeTable, props);
     },
     mounted() {
         const { $scopedSlots } = this;