vxe-table 4.9.8 → 4.9.10

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.9.8";
+const version = "4.9.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2394,7 +2394,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.9.8"}`;
+const log_version = `table v${"4.9.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2418,6 +2418,9 @@ class ColumnInfo {
     const $xeGrid = $xeTable.xegrid;
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
+    const {
+      props: tableProps
+    } = $xeTable;
     if (true) {
       const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
       if (_vm.type && types.indexOf(_vm.type) === -1) {
@@ -2433,9 +2436,6 @@ class ColumnInfo {
         warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
       }
       if (_vm.type === 'expand') {
-        const {
-          props: tableProps
-        } = $xeTable;
         const {
           treeConfig
         } = tableProps;
@@ -2816,16 +2816,6 @@ function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     }
   });
 }
-// export function removeScrollListener (scrollElem: XEBodyScrollElement | null) {
-//   if (scrollElem && scrollElem._onscroll) {
-//     scrollElem.onscroll = null
-//   }
-// }
-// export function restoreScrollListener (scrollElem: XEBodyScrollElement | null) {
-//   if (scrollElem && scrollElem._onscroll) {
-//     scrollElem.onscroll = scrollElem._onscroll
-//   }
-// }
 /**
  * 生成行的唯一主键
  */
@@ -5312,12 +5302,6 @@ const lineOffsetSizes = {
             $xeTable.clearHoverRow();
           };
         }
-        // 拖拽行事件
-        if (rowOpts.drag) {
-          trOn.onDragstart = $xeTable.handleRowDragDragstartEvent;
-          trOn.onDragend = $xeTable.handleRowDragDragendEvent;
-          trOn.onDragover = $xeTable.handleRowDragDragoverEvent;
-        }
         const rowid = getRowid($xeTable, row);
         const rest = fullAllDataRowIdData[rowid];
         let rowLevel = 0;
@@ -5354,6 +5338,12 @@ const lineOffsetSizes = {
           rowChildren = row[childrenField];
           isExpandTree = rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
         }
+        // 拖拽行事件
+        if (rowOpts.drag && !rowLevel) {
+          trOn.onDragstart = $xeTable.handleRowDragDragstartEvent;
+          trOn.onDragend = $xeTable.handleRowDragDragendEvent;
+          trOn.onDragover = $xeTable.handleRowDragDragoverEvent;
+        }
         const trClass = ['vxe-body--row', treeConfig ? `row--level-${rowLevel}` : '', {
           'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
           'is--new': isNewRow,
@@ -5480,6 +5470,9 @@ const lineOffsetSizes = {
       const headerElem = tableHeader ? tableHeader.$el : null;
       const footerElem = tableFooter ? tableFooter.$el : null;
       const bodyElem = tableBody.$el;
+      if (!bodyElem) {
+        return;
+      }
       const leftElem = leftBody ? leftBody.$el : null;
       const rightElem = rightBody ? rightBody.$el : null;
       const xHandleEl = refScrollXHandleElem.value;
@@ -6341,7 +6334,13 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       const tableBody = refTableBody.value;
       const headerElem = tableHeader ? tableHeader.$el : null;
       const footerElem = refElem.value;
-      const bodyElem = tableBody.$el;
+      if (!footerElem) {
+        return;
+      }
+      const bodyElem = tableBody ? tableBody.$el : null;
+      if (!bodyElem) {
+        return;
+      }
       const xHandleEl = refScrollXHandleElem.value;
       const scrollLeft = footerElem.scrollLeft;
       const isRollX = true;
@@ -8128,7 +8127,7 @@ const {
             onClick: cancelEvent
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
             status: 'primary',
-            disabled: !hasFile,
+            disabled: !hasFile || reactData.loading,
             content: import_panel_getI18n('vxe.import.impConfirm'),
             onClick: importEvent
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]);
@@ -11533,7 +11532,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const loadTableData = datas => {
       const {
         keepSource,
-        treeConfig
+        treeConfig,
+        showOverflow
       } = props;
       const {
         editStore,
@@ -11609,8 +11609,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (keepSource) {
         tablePrivateMethods.cacheSourceMap(fullData);
       }
-      if (true) {
-        if (sYLoad) {
+      if (sYLoad) {
+        if (showOverflow) {
+          const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
+          if (errColumn) {
+            errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+          }
+        }
+        if (true) {
           if (!(props.height || props.maxHeight)) {
             errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
           }
@@ -12801,7 +12807,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           editStore
         } = reactData;
         const rowid = getRowid($xeTable, row);
-        return editStore.insertMaps[rowid];
+        return !!editStore.insertMaps[rowid];
       },
       /**
        * 删除所有新增的临时数据
@@ -14119,7 +14125,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = treeOpts;
         const rowid = getRowid($xeTable, row);
         if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-          tableMethods.clearTreeExpandLoaded(row).then(() => {
+          return tableMethods.clearTreeExpandLoaded(row).then(() => {
             return handleAsyncTreeExpandChilds(row);
           }).then(() => {
             if (transform) {
@@ -16829,6 +16835,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const trEl = evnt.currentTarget;
         const rowid = trEl.getAttribute('rowid');
         const row = $xeTable.getRowById(rowid);
+        console.log(rowid);
         if (row) {
           evnt.preventDefault();
           evnt.preventDefault();
@@ -16966,6 +16973,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                   oldIndex: oafIndex
                 }
               }, evnt);
+              $xeTable.saveCustomStore('update:sort');
             }).catch(() => {});
           }
         }
@@ -19289,8 +19297,25 @@ edit_hook_hooks.add('tableEditModule', {
         if (treeConfig && transform) {
           insertTreeRow(newRecords, false);
         } else {
-          afterFullData.unshift(...newRecords);
-          tableFullData.unshift(...newRecords);
+          newRecords.forEach(item => {
+            const rowid = getRowid($xeTable, item);
+            const rest = {
+              row: item,
+              rowid,
+              seq: -1,
+              index: -1,
+              _index: -1,
+              $index: -1,
+              items: afterFullData,
+              parent: null,
+              level: 0,
+              height: 0
+            };
+            fullDataRowIdData[rowid] = rest;
+            fullAllDataRowIdData[rowid] = rest;
+            afterFullData.push(item);
+            tableFullData.push(item);
+          });
           // 刷新单元格合并
           mergeList.forEach(mergeItem => {
             const {
@@ -19307,8 +19332,25 @@ edit_hook_hooks.add('tableEditModule', {
           if (treeConfig && transform) {
             insertTreeRow(newRecords, true);
           } else {
-            afterFullData.push(...newRecords);
-            tableFullData.push(...newRecords);
+            newRecords.forEach(item => {
+              const rowid = getRowid($xeTable, item);
+              const rest = {
+                row: item,
+                rowid,
+                seq: -1,
+                index: -1,
+                _index: -1,
+                $index: -1,
+                items: afterFullData,
+                parent: null,
+                level: 0,
+                height: 0
+              };
+              fullDataRowIdData[rowid] = rest;
+              fullAllDataRowIdData[rowid] = rest;
+              afterFullData.push(item);
+              tableFullData.push(item);
+            });
             // 刷新单元格合并
             mergeList.forEach(mergeItem => {
               const {