vxe-table 3.11.9 → 3.11.12

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.9";
+const version = "3.11.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2774,7 +2774,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.9"}`;
+const log_version = `table v${"3.11.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2799,6 +2799,7 @@ class ColumnInfo {
     const proxyOpts = $xegrid ? $xegrid.proxyOpts : null;
     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 tableProps = $xetable;
     if (true) {
       const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
       if (_vm.type && types.indexOf(_vm.type) === -1) {
@@ -2814,7 +2815,10 @@ class ColumnInfo {
         warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
       }
       if (_vm.type === 'expand') {
-        if ($xetable.treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
+        const {
+          treeConfig
+        } = tableProps;
+        if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
           errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
         }
       }
@@ -5577,6 +5581,7 @@ const Methods = {
   loadTableData(datas) {
     const {
       keepSource,
+      showOverflow,
       treeConfig,
       treeOpts,
       editStore,
@@ -5631,7 +5636,6 @@ const Methods = {
     scrollYStore.endIndex = 1;
     scrollXStore.startIndex = 0;
     scrollXStore.endIndex = 1;
-    editStore.insertList = [];
     editStore.insertMaps = {};
     editStore.removeList = [];
     editStore.removeMaps = {};
@@ -5649,8 +5653,14 @@ const Methods = {
     if (keepSource) {
       this.cacheSourceMap(fullData);
     }
-    if (true) {
-      if (sYLoad) {
+    if (sYLoad) {
+      if (showOverflow) {
+        const errColumn = this.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 (!(this.height || this.maxHeight)) {
           errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
         }
@@ -6609,14 +6619,20 @@ const Methods = {
       editStore
     } = this;
     const rowid = getRowid(this, row);
-    return editStore.insertList.length && editStore.insertMaps[rowid];
+    return !!editStore.insertMaps[rowid];
   },
   /**
    * 删除所有新增的临时数据
    * @returns
    */
   removeInsertRow() {
-    return this.remove(this.editStore.insertList);
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      editStore
+    } = reactData;
+    editStore.insertMaps = {};
+    return $xeTable.remove($xeTable.getInsertRecords());
   },
   /**
    * 检查行或列数据是否发生改变
@@ -10837,6 +10853,7 @@ const Methods = {
               oldIndex: oafIndex
             }
           }, evnt);
+          $xeTable.saveCustomStore('update:sort');
         }).catch(() => {});
       }
     }
@@ -11569,7 +11586,7 @@ const Methods = {
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowid = getRowid(this, row);
     if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-      this.clearTreeExpandLoaded(row).then(() => {
+      return this.clearTreeExpandLoaded(row).then(() => {
         return this.handleAsyncTreeExpandChilds(row);
       }).then(() => {
         if (transform) {
@@ -13318,18 +13335,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         $xeTable.clearHoverRow();
       };
     }
-    // 拖拽行事件
-    if (rowOpts.drag) {
-      trOn.dragstart = evnt => {
-        $xeTable.handleRowDragDragstartEvent(evnt);
-      };
-      trOn.dragover = evnt => {
-        $xeTable.handleRowDragDragoverEvent(evnt);
-      };
-      trOn.dragend = evnt => {
-        $xeTable.handleRowDragDragendEvent(evnt);
-      };
-    }
     const rowid = getRowid($xeTable, row);
     const rest = fullAllDataRowIdData[rowid];
     const rowLevel = rest ? rest.level : 0;
@@ -13359,6 +13364,18 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       rowChildren = row[childrenField];
       isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
     }
+    // 拖拽行事件
+    if (rowOpts.drag && !rowLevel) {
+      trOn.dragstart = evnt => {
+        $xeTable.handleRowDragDragstartEvent(evnt);
+      };
+      trOn.dragover = evnt => {
+        $xeTable.handleRowDragDragoverEvent(evnt);
+      };
+      trOn.dragend = evnt => {
+        $xeTable.handleRowDragDragendEvent(evnt);
+      };
+    }
     const trClass = ['vxe-body--row', treeConfig ? `row--level-${rowLevel}` : '', {
       'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
       'is--new': isNewRow,
@@ -16192,6 +16209,7 @@ const {
     const $xeTable = this.$xeTable;
     const {
       hasFile,
+      loading,
       parseTypeLabel,
       defaultOptions,
       storeData,
@@ -16218,7 +16236,7 @@ const {
         maskClosable: true,
         showMaximize: true,
         resize: true,
-        loading: this.loading
+        loading
       },
       on: {
         input(value) {
@@ -16298,7 +16316,7 @@ const {
           }, import_panel_getI18n('vxe.import.impCancel')), h('vxe-button', {
             props: {
               status: 'primary',
-              disabled: !hasFile
+              disabled: !hasFile || loading
             },
             on: {
               click: this.importEvent
@@ -17757,17 +17775,25 @@ function insertTreeRow(_vm, newRecords, isAppend) {
   });
 }
 function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
+  const $xeTable = _vm;
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
   const {
-    tableFullTreeData,
     mergeList,
+    editStore
+  } = reactData;
+  const {
+    tableFullTreeData,
     afterFullData,
-    editStore,
     tableFullData,
-    treeConfig,
     fullDataRowIdData,
-    fullAllDataRowIdData,
-    treeOpts
-  } = _vm;
+    fullAllDataRowIdData
+  } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
   const {
     transform,
     rowField,
@@ -17786,8 +17812,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     if (treeConfig && transform) {
       insertTreeRow(_vm, 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 {
@@ -17804,8 +17847,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       if (treeConfig && transform) {
         insertTreeRow(_vm, 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 {
@@ -17920,14 +17980,12 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     }
   }
   const {
-    insertList,
     insertMaps
   } = editStore;
   newRecords.forEach(newRow => {
-    const rowid = getRowid(_vm, newRow);
+    const rowid = getRowid($xeTable, newRow);
     insertMaps[rowid] = newRow;
   });
-  insertList.unshift(...newRecords);
   _vm.cacheRowMap();
   _vm.updateScrollYStatus();
   _vm.handleTableData(treeConfig && transform);
@@ -17981,18 +18039,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
      * 如果为空则删除所有
      */
     _remove(rows) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        treeConfig
+      } = props;
       const {
-        afterFullData,
-        tableFullData,
-        tableFullTreeData,
-        treeConfig,
         mergeList,
         editStore,
-        checkboxOpts,
-        selectCheckboxMaps,
-        isInsertByRow,
-        treeOpts
-      } = this;
+        selectCheckboxMaps
+      } = reactData;
+      const {
+        tableFullTreeData,
+        afterFullData,
+        tableFullData
+      } = internalData;
+      const checkboxOpts = $xeTable.computeCheckboxOpts;
+      const treeOpts = $xeTable.computeTreeOpts;
       const {
         transform,
         mapChildrenField
@@ -18001,7 +18066,6 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       const {
         actived,
         removeList,
-        insertList,
         insertMaps
       } = editStore;
       const {
@@ -18015,7 +18079,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       }
       // 如果是新增，则保存记录
       rows.forEach(row => {
-        if (!isInsertByRow(row)) {
+        if (!$xeTable.isInsertByRow(row)) {
           removeList.push(row);
         }
       });
@@ -18088,27 +18152,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         }
       }
       // 如果当前行被激活编辑，则清除激活状态
-      if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
-        this.clearEdit();
+      if (actived.row && $xeTable.findRowIndexOf(rows, actived.row) > -1) {
+        $xeTable.clearEdit();
       }
       // 从新增中移除已删除的数据
       rows.forEach(row => {
-        const rowid = getRowid(this, row);
-        const iIndex = this.findRowIndexOf(insertList, row);
-        if (iIndex > -1) {
-          insertList.splice(iIndex, 1);
+        const rowid = getRowid($xeTable, row);
+        if (insertMaps[rowid]) {
+          delete insertMaps[rowid];
         }
-        delete insertMaps[rowid];
       });
-      this.handleTableData(treeConfig && transform);
+      $xeTable.updateFooter();
+      $xeTable.cacheRowMap();
+      $xeTable.handleTableData(treeConfig && transform);
       if (!(treeConfig && transform)) {
-        this.updateAfterDataIndex();
+        $xeTable.updateAfterDataIndex();
       }
-      this.updateFooter();
-      this.cacheRowMap();
-      this.checkSelectionStatus();
-      if (this.scrollYLoad) {
-        this.updateScrollYSpace();
+      $xeTable.checkSelectionStatus();
+      if (reactData.scrollYLoad) {
+        $xeTable.updateScrollYSpace();
       }
       return this.$nextTick().then(() => {
         this.updateCellAreas();
@@ -18171,13 +18233,20 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
      * 获取新增的临时数据
      */
     _getInsertRecords() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        editStore
+      } = reactData;
       const {
         fullAllDataRowIdData
-      } = this;
-      const insertList = this.editStore.insertList;
+      } = internalData;
+      const {
+        insertMaps
+      } = editStore;
       const insertRecords = [];
-      insertList.forEach(row => {
-        const rowid = getRowid(this, row);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(insertMaps, (row, rowid) => {
         if (fullAllDataRowIdData[rowid]) {
           insertRecords.push(row);
         }
@@ -22179,7 +22248,6 @@ function handleUupdateResize(_vm) {
           row: null,
           column: null
         },
-        insertList: [],
         insertMaps: {},
         removeList: [],
         removeMaps: {}