vxe-table 4.9.26 → 4.9.28

package/lib/table/src/table.js

@@ -128,8 +128,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       reColumnFlag: 0,
       // 已标记的对象集
       pendingRowMaps: {},
-      // 已标记的行
-      pendingRowList: [],
       // 初始化标识
       initStore: {
         filter: false,
@@ -3710,7 +3708,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       loadData(datas) {
         const {
-          inited,
           initStatus
         } = internalData;
         return loadTableData(datas).then(() => {
@@ -3719,9 +3716,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (!initStatus) {
             handleLoadDefaults();
           }
-          if (!inited) {
-            handleInitDefaults();
-          }
           return tableMethods.recalculate();
         });
       },
@@ -3730,18 +3724,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * @param {Array} datas 数据
        */
       reloadData(datas) {
-        const {
-          inited
-        } = internalData;
         return tableMethods.clearAll().then(() => {
           internalData.inited = true;
           internalData.initStatus = true;
           return loadTableData(datas);
         }).then(() => {
           handleLoadDefaults();
-          if (!inited) {
-            handleInitDefaults();
-          }
           return tableMethods.recalculate();
         });
       },
@@ -5150,7 +5138,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       setPendingRow(rows, status) {
         const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
-        const pendingList = [...reactData.pendingRowList];
         if (rows && !_xeUtils.default.isArray(rows)) {
           rows = [rows];
         }
@@ -5158,7 +5145,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
           rows.forEach(row => {
             const rowid = (0, _util.getRowid)($xeTable, row);
             if (rowid && !pendingMaps[rowid]) {
-              pendingList.push(row);
               pendingMaps[rowid] = row;
             }
           });
@@ -5166,21 +5152,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           rows.forEach(row => {
             const rowid = (0, _util.getRowid)($xeTable, row);
             if (rowid && pendingMaps[rowid]) {
-              const pendingIndex = $xeTable.findRowIndexOf(pendingList, row);
-              if (pendingIndex > -1) {
-                pendingList.splice(pendingIndex, 1);
-              }
               delete pendingMaps[rowid];
             }
           });
         }
         reactData.pendingRowMaps = pendingMaps;
-        reactData.pendingRowList = pendingList;
         return (0, _vue.nextTick)();
       },
       togglePendingRow(rows) {
         const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
-        const pendingList = [...reactData.pendingRowList];
         if (rows && !_xeUtils.default.isArray(rows)) {
           rows = [rows];
         }
@@ -5188,19 +5168,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const rowid = (0, _util.getRowid)($xeTable, row);
           if (rowid) {
             if (pendingMaps[rowid]) {
-              const pendingIndex = $xeTable.findRowIndexOf(pendingList, row);
-              if (pendingIndex > -1) {
-                pendingList.splice(pendingIndex, 1);
-              }
               delete pendingMaps[rowid];
             } else {
-              pendingList.push(row);
               pendingMaps[rowid] = row;
             }
           }
         });
         reactData.pendingRowMaps = pendingMaps;
-        reactData.pendingRowList = pendingList;
         return (0, _vue.nextTick)();
       },
       hasPendingByRow(row) {
@@ -5215,13 +5189,21 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       getPendingRecords() {
         const {
-          pendingRowList
+          pendingRowMaps
         } = reactData;
-        return pendingRowList.slice(0);
+        const {
+          fullAllDataRowIdData
+        } = internalData;
+        const insertRecords = [];
+        _xeUtils.default.each(pendingRowMaps, (row, rowid) => {
+          if (fullAllDataRowIdData[rowid]) {
+            insertRecords.push(row);
+          }
+        });
+        return insertRecords;
       },
       clearPendingRow() {
         reactData.pendingRowMaps = {};
-        reactData.pendingRowList = [];
         return (0, _vue.nextTick)();
       },
       sort(sortConfs, sortOrder) {
@@ -7978,6 +7960,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }
           }
         }
+        // 如果是双击编辑模式
+        if ((0, _utils.isEnableConf)(editConfig) && editOpts.trigger === 'dblclick') {
+          if (actived.row && actived.column) {
+            if (editOpts.mode === 'row') {
+              if (!$xeTable.eqRow(actived.row, row)) {
+                $xeTable.handleClearEdit(evnt);
+              }
+            } else if (editOpts.mode === 'cell') {
+              if (!$xeTable.eqRow(actived.row, row) || actived.column.id !== column.id) {
+                $xeTable.handleClearEdit(evnt);
+              }
+            }
+          }
+        }
         dispatchEvent('cell-click', params, evnt);
       },
       /**
@@ -8295,6 +8291,91 @@ var _default = exports.default = (0, _vue.defineComponent)({
           $xeTable.handleColumnSortEvent(evnt, column);
         }
       },
+      /**
+       * 表头单元格按下事件
+       */
+      triggerHeaderCellMousedownEvent(evnt, params) {
+        const {
+          mouseConfig
+        } = props;
+        const mouseOpts = computeMouseOpts.value;
+        const columnOpts = computeColumnOpts.value;
+        const columnDragOpts = computeColumnDragOpts.value;
+        const {
+          trigger,
+          disabledMethod
+        } = columnDragOpts;
+        const cell = evnt.currentTarget;
+        const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+        const triggerCheckbox = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--checkbox').flag;
+        const triggerSort = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--sort').flag;
+        const triggerFilter = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--filter').flag;
+        let triggerDrag = false;
+        if (!(triggerInput || triggerCheckbox || triggerSort || triggerFilter)) {
+          if (columnOpts.drag && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
+            triggerDrag = true;
+            $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
+          }
+        }
+        if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
+          $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({
+            cell,
+            triggerSort,
+            triggerFilter
+          }, params));
+        }
+        $xeTable.focus();
+        if ($xeTable.closeMenu) {
+          $xeTable.closeMenu();
+        }
+      },
+      /**
+       * 单元格按下事件
+       */
+      triggerCellMousedownEvent(evnt, params) {
+        const {
+          column
+        } = params;
+        const {
+          type,
+          treeNode
+        } = column;
+        const isRadioType = type === 'radio';
+        const isCheckboxType = type === 'checkbox';
+        const isExpandType = type === 'expand';
+        const rowOpts = computeRowOpts.value;
+        const rowDragOpts = computeRowDragOpts.value;
+        const {
+          trigger,
+          disabledMethod
+        } = rowDragOpts;
+        const cell = evnt.currentTarget;
+        params.cell = cell;
+        const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+        const triggerRadio = isRadioType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--radio').flag;
+        const triggerCheckbox = isCheckboxType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--checkbox').flag;
+        const triggerTreeNode = treeNode && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+        const triggerExpandNode = isExpandType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-table--expanded').flag;
+        let isColDragCell = false;
+        if (rowOpts.drag) {
+          isColDragCell = trigger === 'row' || column.dragSort && trigger === 'cell';
+        }
+        let triggerDrag = false;
+        if (!(triggerInput || triggerRadio || triggerCheckbox || triggerTreeNode || triggerExpandNode)) {
+          if (isColDragCell && !(disabledMethod && disabledMethod(params))) {
+            triggerDrag = true;
+            $xeTable.handleCellDragMousedownEvent(evnt, params);
+          }
+        }
+        if (!triggerDrag && $xeTable.handleCellMousedownEvent) {
+          $xeTable.handleCellMousedownEvent(evnt, params);
+        }
+        $xeTable.focus();
+        $xeTable.closeFilter();
+        if ($xeTable.closeMenu) {
+          $xeTable.closeMenu();
+        }
+      },
       /**
        * 行拖拽
        */
@@ -8545,21 +8626,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       handleCellDragMousedownEvent(evnt, params) {
         var _a;
+        evnt.stopPropagation();
         const {
           dragConfig
         } = props;
         const rowDragOpts = computeRowDragOpts.value;
         const {
+          trigger,
           dragStartMethod
         } = rowDragOpts;
         const {
           row
         } = params;
         const dragEl = evnt.currentTarget;
-        const tdEl = (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+        const tdEl = trigger === 'cell' || trigger === 'row' ? dragEl : (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
         const trEl = tdEl.parentElement;
         const dStartMethod = dragStartMethod || (dragConfig ? dragConfig.dragStartMethod : null);
-        reactData.isDragRowMove = false;
         clearRowDropOrigin();
         if (dStartMethod && !dStartMethod(params)) {
           trEl.draggable = false;
@@ -8814,15 +8896,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       handleHeaderCellDragMousedownEvent(evnt, params) {
         var _a;
+        evnt.stopPropagation();
         const columnDragOpts = computeColumnDragOpts.value;
         const {
+          trigger,
           dragStartMethod
         } = columnDragOpts;
         const {
           column
         } = params;
         const dragEl = evnt.currentTarget;
-        const thEl = (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+        const thEl = trigger === 'cell' ? dragEl : (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
         reactData.isDragColMove = false;
         clearColDropOrigin();
         if (dragStartMethod && !dragStartMethod(params)) {
@@ -8911,6 +8995,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
           internalData.lastScrollTop = scrollTop;
         }
+        reactData.isDragColMove = false;
+        reactData.isDragRowMove = false;
         reactData.lastScrollTime = Date.now();
         const evntParams = Object.assign({
           scrollTop,
@@ -9418,6 +9504,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const resizableOpts = computeResizableOpts.value;
       const isArea = mouseConfig && mouseOpts.area;
       const tableStyle = computeTableStyle.value;
+      const columnDragOpts = computeColumnDragOpts.value;
       return (0, _vue.h)('div', {
         ref: refElem,
         class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
@@ -9434,6 +9521,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           'column--highlight': columnOpts.isHover || highlightHoverColumn,
           'checkbox--range': checkboxOpts.range,
           'column--calc': isCalcColumn,
+          'col--drag-cell': columnOpts.drag && columnDragOpts.trigger === 'cell',
           'is--header': showHeader,
           'is--footer': showFooter,
           'is--group': isGroup,
@@ -9653,7 +9741,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
     });
     (0, _vue.watch)(dataFlag, () => {
       const {
-        inited,
         initStatus
       } = internalData;
       loadTableData(props.data || []).then(() => {
@@ -9667,9 +9754,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (!initStatus) {
           handleLoadDefaults();
         }
-        if (!inited) {
-          handleInitDefaults();
-        }
         if (process.env.NODE_ENV === 'development') {
           // const checkboxOpts = computeCheckboxOpts.value
           // const checkboxColumn = internalData.tableFullColumn.find(column => column.type === 'checkbox')
@@ -9945,7 +10029,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (props.editRules && !$xeTable.validate) {
             (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
           }
-          if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.triggerCellMousedownEvent) {
+          if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
             (0, _log.errLog)('vxe.error.reqModule', ['Keyboard']);
           }
           if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
@@ -9968,8 +10052,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
             internalData.inited = true;
             internalData.initStatus = true;
             handleLoadDefaults();
-            handleInitDefaults();
           }
+          handleInitDefaults();
           updateStyle();
         });
         if (props.autoResize) {
@@ -10013,7 +10097,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         $table: $xeTable
       });
     });
-    window.aaaa = $xeTable;
     (0, _vue.onBeforeUnmount)(() => {
       if (resizeObserver) {
         resizeObserver.disconnect();