vxe-table 4.10.12 → 4.10.14

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.12";
+const version = "4.10.14";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3585,7 +3585,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.12"}`;
+const log_version = `table v${"4.10.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6606,6 +6606,7 @@ const renderType = 'body';
           'fixed--width': !isAutoCellWidth,
           'fixed--hidden': fixedHiddenColumn,
           'is--padding': isCellPadding,
+          'is--progress': fixedHiddenColumn && isAllOverflow || isVNPreEmptyStatus,
           'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
           'is--drag-disabled': isDisabledDrag,
           'col--dirty': isDirty,
@@ -12059,7 +12060,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const treeOpts = computeTreeOpts.value;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
-        transform
+        transform,
+        rowField,
+        parentField,
+        mapChildrenField
       } = treeOpts;
       const {
         remote: allRemoteFilter,
@@ -12073,7 +12077,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = sortOpts;
       let tableData = [];
       let tableTree = [];
-      // 处理列
+      // 处理数据
       if (!allRemoteFilter || !allRemoteSort) {
         const filterColumns = [];
         let orderColumns = [];
@@ -12175,7 +12179,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             });
             tableData = tableTree;
@@ -12189,7 +12193,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             });
             tableData = tableTree;
@@ -12211,10 +12215,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               });
               tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
             } else {
-              tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableTree, orderColumns.map(({
+              const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
+                children: mapChildrenField
+              });
+              tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
                 column,
                 order
-              }) => [getOrderField(column), order]));
+              }) => [getOrderField(column), order])), {
+                key: rowField,
+                parentKey: parentField,
+                children: childrenField,
+                mapChildren: mapChildrenField
+              });
             }
             tableData = tableTree;
           } else {
@@ -20152,6 +20164,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       },
       triggerBodyScrollEvent(evnt, fixedType) {
+        const {
+          scrollYLoad,
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           intoRunScroll,
@@ -20217,13 +20233,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             setScrollTop(rightScrollElem, scrollTop);
           }
           setScrollTop(yHandleEl, scrollTop);
-          $xeTable.triggerScrollYEvent(evnt);
+          if (scrollYLoad) {
+            $xeTable.triggerScrollYEvent(evnt);
+          }
         }
         if (isRollX) {
           setScrollLeft(xHandleEl, scrollLeft);
           setScrollLeft(headerScrollElem, scrollLeft);
           setScrollLeft(footerScrollElem, scrollLeft);
-          $xeTable.triggerScrollXEvent(evnt);
+          if (scrollXLoad) {
+            $xeTable.triggerScrollXEvent(evnt);
+          }
         }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'body',
@@ -20231,6 +20251,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         });
       },
       triggerHeaderScrollEvent(evnt, fixedType) {
+        const {
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           intoRunScroll,
@@ -20267,13 +20290,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollLeft(xHandleEl, scrollLeft);
         setScrollLeft(footerScrollElem, scrollLeft);
         setScrollLeft(bodyScrollElem, scrollLeft);
-        $xeTable.triggerScrollXEvent(evnt);
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'header',
           fixed: fixedType
         });
       },
       triggerFooterScrollEvent(evnt, fixedType) {
+        const {
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           intoRunScroll,
@@ -20310,7 +20338,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollLeft(xHandleEl, scrollLeft);
         setScrollLeft(headerScrollElem, scrollLeft);
         setScrollLeft(bodyScrollElem, scrollLeft);
-        $xeTable.triggerScrollXEvent(evnt);
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'footer',
           fixed: fixedType
@@ -20328,6 +20358,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           highlightHoverRow
         } = src_props;
+        const {
+          scrollYLoad
+        } = reactData;
         const {
           elemStore,
           lastScrollTop,
@@ -20374,7 +20407,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             setScrollTop(bodyScrollElem, currTopNum);
             setScrollTop(leftScrollElem, currTopNum);
             setScrollTop(rightScrollElem, currTopNum);
-            $xeTable.triggerScrollYEvent(evnt);
+            if (scrollYLoad) {
+              $xeTable.triggerScrollYEvent(evnt);
+            }
             $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
               type: 'table',
               fixed: ''
@@ -20393,6 +20428,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       },
       triggerVirtualScrollXEvent(evnt) {
+        const {
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           inWheelScroll,
@@ -20426,13 +20464,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollLeft(bodyScrollElem, scrollLeft);
         setScrollLeft(headerScrollElem, scrollLeft);
         setScrollLeft(footerScrollElem, scrollLeft);
-        $xeTable.triggerScrollXEvent(evnt);
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'table',
           fixed: ''
         });
       },
       triggerVirtualScrollYEvent(evnt) {
+        const {
+          scrollYLoad
+        } = reactData;
         const {
           elemStore,
           inWheelScroll,
@@ -20466,7 +20509,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollTop(bodyScrollElem, scrollTop);
         setScrollTop(leftScrollElem, scrollTop);
         setScrollTop(rightScrollElem, scrollTop);
-        $xeTable.triggerScrollYEvent(evnt);
+        if (scrollYLoad) {
+          $xeTable.triggerScrollYEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'table',
           fixed: ''
@@ -22617,7 +22662,7 @@ edit_hook_hooks.add('tableEditModule', {
         }
       }
     };
-    function syncActivedCell() {
+    const syncActivedCell = () => {
       const {
         editStore,
         tableColumn
@@ -22637,8 +22682,8 @@ edit_hook_hooks.add('tableEditModule', {
           setEditColumnModel(row, column);
         }
       }
-    }
-    function insertTreeRow(newRecords, isAppend) {
+    };
+    const insertTreeRow = (newRecords, isAppend) => {
       const {
         tableFullTreeData,
         afterFullData,
@@ -22719,7 +22764,7 @@ edit_hook_hooks.add('tableEditModule', {
           fullAllDataRowIdData[rowid] = rest;
         }
       });
-    }
+    };
     const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
       const {
         treeConfig
@@ -23038,6 +23083,160 @@ edit_hook_hooks.add('tableEditModule', {
         }
       });
     };
+    const handleEditActive = (params, evnt, isFocus) => {
+      const {
+        editConfig,
+        mouseConfig
+      } = props;
+      const {
+        editStore,
+        tableColumn
+      } = reactData;
+      const editOpts = computeEditOpts.value;
+      const {
+        mode
+      } = editOpts;
+      const {
+        actived,
+        focused
+      } = editStore;
+      const {
+        row,
+        column
+      } = params;
+      const {
+        editRender
+      } = column;
+      const cell = params.cell || $xeTable.getCellElement(row, column);
+      const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+      params.cell = cell;
+      if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
+        // 激活编辑
+        if (!$xeTable.isPendingByRow(row)) {
+          if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
+            // 判断是否禁用编辑
+            let type = 'edit-disabled';
+            if (!beforeEditMethod || beforeEditMethod({
+              ...params,
+              $table: $xeTable,
+              $grid: $xeTable.xegrid
+            })) {
+              if (mouseConfig) {
+                $xeTable.clearSelected();
+                if ($xeTable.clearCellAreas) {
+                  $xeTable.clearCellAreas();
+                  $xeTable.clearCopyCellArea();
+                }
+              }
+              $xeTable.closeTooltip();
+              if (actived.column) {
+                handleClearEdit(evnt);
+              }
+              type = 'edit-activated';
+              column.renderHeight = cell.offsetHeight;
+              actived.args = params;
+              actived.row = row;
+              actived.column = column;
+              if (mode === 'row') {
+                tableColumn.forEach(column => getEditColumnModel(row, column));
+              } else {
+                getEditColumnModel(row, column);
+              }
+              const afterEditMethod = editOpts.afterEditMethod;
+              (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+                if (isFocus) {
+                  $xeTable.handleFocus(params, evnt);
+                }
+                if (afterEditMethod) {
+                  afterEditMethod({
+                    ...params,
+                    $table: $xeTable,
+                    $grid: $xeTable.xegrid
+                  });
+                }
+              });
+            }
+            $xeTable.dispatchEvent(type, {
+              row,
+              rowIndex: $xeTable.getRowIndex(row),
+              $rowIndex: $xeTable.getVMRowIndex(row),
+              column,
+              columnIndex: $xeTable.getColumnIndex(column),
+              $columnIndex: $xeTable.getVMColumnIndex(column)
+            }, evnt);
+            // v4已废弃
+            if (type === 'edit-activated') {
+              $xeTable.dispatchEvent('edit-actived', {
+                row,
+                rowIndex: $xeTable.getRowIndex(row),
+                $rowIndex: $xeTable.getVMRowIndex(row),
+                column,
+                columnIndex: $xeTable.getColumnIndex(column),
+                $columnIndex: $xeTable.getVMColumnIndex(column)
+              }, evnt);
+            }
+          } else {
+            const {
+              column: oldColumn
+            } = actived;
+            if (mouseConfig) {
+              $xeTable.clearSelected();
+              if ($xeTable.clearCellAreas) {
+                $xeTable.clearCellAreas();
+                $xeTable.clearCopyCellArea();
+              }
+            }
+            if (oldColumn !== column) {
+              const {
+                model: oldModel
+              } = oldColumn;
+              if (oldModel.update) {
+                setCellValue(row, oldColumn, oldModel.value);
+              }
+              if ($xeTable.clearValidate) {
+                $xeTable.clearValidate(row, column);
+              }
+            }
+            column.renderHeight = cell.offsetHeight;
+            actived.args = params;
+            actived.column = column;
+            if (isFocus) {
+              setTimeout(() => {
+                $xeTable.handleFocus(params, evnt);
+              });
+            }
+          }
+          focused.column = null;
+          focused.row = null;
+          $xeTable.focus();
+        }
+      }
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
+    const handleEditCell = (row, fieldOrColumn, isPos) => {
+      const {
+        editConfig
+      } = props;
+      const column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
+      if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
+        return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
+          const cell = $xeTable.getCellElement(row, column);
+          if (cell) {
+            handleEditActive({
+              row,
+              rowIndex: $xeTable.getRowIndex(row),
+              column,
+              columnIndex: $xeTable.getColumnIndex(column),
+              cell,
+              $table: $xeTable
+            }, null, false);
+            internalData._lastCallTime = Date.now();
+          }
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        });
+      }
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
     editMethods = {
       /**
        * 往表格中插入临时数据
@@ -23432,7 +23631,7 @@ edit_hook_hooks.add('tableEditModule', {
         if (fieldOrColumn) {
           column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
         }
-        return $xeTable.setEditCell(row, column);
+        return handleEditCell(row, column, false);
       },
       setActiveCell(row, fieldOrColumn) {
         if (true) {
@@ -23445,28 +23644,7 @@ edit_hook_hooks.add('tableEditModule', {
        * 激活单元格编辑
        */
       setEditCell(row, fieldOrColumn) {
-        const {
-          editConfig
-        } = props;
-        const column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
-        if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
-          return $xeTable.scrollToRow(row, column).then(() => {
-            const cell = $xeTable.getCellElement(row, column);
-            if (cell) {
-              editPrivateMethods.handleEdit({
-                row,
-                rowIndex: $xeTable.getRowIndex(row),
-                column,
-                columnIndex: $xeTable.getColumnIndex(column),
-                cell,
-                $table: $xeTable
-              });
-              internalData._lastCallTime = Date.now();
-            }
-            return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
-          });
-        }
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return handleEditCell(row, fieldOrColumn, true);
       },
       /**
        * 只对 trigger=dblclick 有效，选中单元格
@@ -23499,130 +23677,7 @@ edit_hook_hooks.add('tableEditModule', {
        * 处理激活编辑
        */
       handleEdit(params, evnt) {
-        const {
-          editConfig,
-          mouseConfig
-        } = props;
-        const {
-          editStore,
-          tableColumn
-        } = reactData;
-        const editOpts = computeEditOpts.value;
-        const {
-          mode
-        } = editOpts;
-        const {
-          actived,
-          focused
-        } = editStore;
-        const {
-          row,
-          column
-        } = params;
-        const {
-          editRender
-        } = column;
-        const cell = params.cell || $xeTable.getCellElement(row, column);
-        const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-        params.cell = cell;
-        if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
-          // 激活编辑
-          if (!$xeTable.isPendingByRow(row)) {
-            if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
-              // 判断是否禁用编辑
-              let type = 'edit-disabled';
-              if (!beforeEditMethod || beforeEditMethod({
-                ...params,
-                $table: $xeTable,
-                $grid: $xeTable.xegrid
-              })) {
-                if (mouseConfig) {
-                  editMethods.clearSelected();
-                  if ($xeTable.clearCellAreas) {
-                    $xeTable.clearCellAreas();
-                    $xeTable.clearCopyCellArea();
-                  }
-                }
-                $xeTable.closeTooltip();
-                if (actived.column) {
-                  handleClearEdit(evnt);
-                }
-                type = 'edit-activated';
-                column.renderHeight = cell.offsetHeight;
-                actived.args = params;
-                actived.row = row;
-                actived.column = column;
-                if (mode === 'row') {
-                  tableColumn.forEach(column => getEditColumnModel(row, column));
-                } else {
-                  getEditColumnModel(row, column);
-                }
-                const afterEditMethod = editOpts.afterEditMethod;
-                (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-                  editPrivateMethods.handleFocus(params, evnt);
-                  if (afterEditMethod) {
-                    afterEditMethod({
-                      ...params,
-                      $table: $xeTable,
-                      $grid: $xeTable.xegrid
-                    });
-                  }
-                });
-              }
-              $xeTable.dispatchEvent(type, {
-                row,
-                rowIndex: $xeTable.getRowIndex(row),
-                $rowIndex: $xeTable.getVMRowIndex(row),
-                column,
-                columnIndex: $xeTable.getColumnIndex(column),
-                $columnIndex: $xeTable.getVMColumnIndex(column)
-              }, evnt);
-              // v4已废弃
-              if (type === 'edit-activated') {
-                $xeTable.dispatchEvent('edit-actived', {
-                  row,
-                  rowIndex: $xeTable.getRowIndex(row),
-                  $rowIndex: $xeTable.getVMRowIndex(row),
-                  column,
-                  columnIndex: $xeTable.getColumnIndex(column),
-                  $columnIndex: $xeTable.getVMColumnIndex(column)
-                }, evnt);
-              }
-            } else {
-              const {
-                column: oldColumn
-              } = actived;
-              if (mouseConfig) {
-                editMethods.clearSelected();
-                if ($xeTable.clearCellAreas) {
-                  $xeTable.clearCellAreas();
-                  $xeTable.clearCopyCellArea();
-                }
-              }
-              if (oldColumn !== column) {
-                const {
-                  model: oldModel
-                } = oldColumn;
-                if (oldModel.update) {
-                  setCellValue(row, oldColumn, oldModel.value);
-                }
-                if ($xeTable.clearValidate) {
-                  $xeTable.clearValidate(row, column);
-                }
-              }
-              column.renderHeight = cell.offsetHeight;
-              actived.args = params;
-              actived.column = column;
-              setTimeout(() => {
-                editPrivateMethods.handleFocus(params, evnt);
-              });
-            }
-            focused.column = null;
-            focused.row = null;
-            $xeTable.focus();
-          }
-        }
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return handleEditActive(params, evnt, true);
       },
       /**
        * @deprecated
@@ -23803,6 +23858,7 @@ function createHtmlPage(opts, content) {
 
 
 
+
 const {
   getI18n: export_hook_getI18n,
   hooks: export_hook_hooks,
@@ -24204,7 +24260,7 @@ export_hook_hooks.add('tableExportModule', {
                         cellValue = htmlCellElem.innerText.trim();
                       } else {
                         const cell = $xeTable.getCellElement(row, column);
-                        if (cell) {
+                        if (cell && !hasClass(cell, 'is--progress')) {
                           cellValue = cell.innerText.trim();
                         }
                       }
@@ -24274,7 +24330,7 @@ export_hook_hooks.add('tableExportModule', {
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
                     const cell = $xeTable.getCellElement(row, column);
-                    if (cell) {
+                    if (cell && !hasClass(cell, 'is--progress')) {
                       cellValue = cell.innerText.trim();
                     }
                   }