vxe-table 3.11.10 → 3.11.13

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.10";
+const version = "3.11.13";
 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.10"}`;
+const log_version = `table v${"3.11.13"}`;
 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,
@@ -5648,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}']);
         }
@@ -10842,6 +10853,7 @@ const Methods = {
               oldIndex: oafIndex
             }
           }, evnt);
+          $xeTable.saveCustomStore('update:sort');
         }).catch(() => {});
       }
     }
@@ -11574,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) {
@@ -13323,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;
@@ -13364,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,
@@ -15223,6 +15235,7 @@ const renderSimplePanel = (h, _vm) => {
 };
 const renderPopupPanel = (h, _vm) => {
   const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
+  const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
   const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
   const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeInput');
   const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
@@ -15240,7 +15253,9 @@ const renderPopupPanel = (h, _vm) => {
     isMaxFixedColumn
   } = $xeTable;
   const {
+    mode,
     modalOptions,
+    drawerOptions,
     allowVisible,
     allowSort,
     allowFixed,
@@ -15257,6 +15272,7 @@ const renderPopupPanel = (h, _vm) => {
     maxWidth: reMaxWidth
   } = resizableOpts;
   const modalOpts = Object.assign({}, modalOptions);
+  const drawerOpts = Object.assign({}, drawerOptions);
   const slots = customOpts.slots || {};
   const headerSlot = slots.header;
   const topSlot = slots.top;
@@ -15510,6 +15526,27 @@ const renderPopupPanel = (h, _vm) => {
   if (headerSlot) {
     scopedSlots.header = () => $xeTable.callSlot(headerSlot, params, h);
   }
+  if (mode === 'drawer') {
+    return VxeUIDrawerComponent ? h(VxeUIDrawerComponent, {
+      key: 'drawer',
+      props: {
+        className: ['vxe-table-custom-drawer-wrapper', 'vxe-table--ignore-clear', drawerOpts.className || ''].join(' '),
+        value: customStore.visible,
+        title: drawerOpts.title || panel_getI18n('vxe.custom.cstmTitle'),
+        width: drawerOpts.width || Math.min(880, Math.floor(document.documentElement.clientWidth * 0.6)),
+        position: drawerOpts.position,
+        escClosable: !!drawerOpts.escClosable,
+        destroyOnClose: true,
+        showFooter: true
+      },
+      on: {
+        input(value) {
+          customStore.visible = value;
+        }
+      },
+      scopedSlots
+    }) : panel_renderEmptyElement($xeTableCustomPanel);
+  }
   return VxeUIModalComponent ? h(VxeUIModalComponent, {
     key: 'modal',
     props: {
@@ -15606,7 +15643,7 @@ const renderPopupPanel = (h, _vm) => {
     const {
       customOpts
     } = $xetable;
-    if (['modal', 'popup'].includes(`${customOpts.mode}`)) {
+    if (['modal', 'drawer', 'popup'].includes(`${customOpts.mode}`)) {
       return renderPopupPanel(h, this);
     }
     return renderSimplePanel(h, this);
@@ -16197,6 +16234,7 @@ const {
     const $xeTable = this.$xeTable;
     const {
       hasFile,
+      loading,
       parseTypeLabel,
       defaultOptions,
       storeData,
@@ -16223,7 +16261,7 @@ const {
         maskClosable: true,
         showMaximize: true,
         resize: true,
-        loading: this.loading
+        loading
       },
       on: {
         input(value) {
@@ -16303,7 +16341,7 @@ const {
           }, import_panel_getI18n('vxe.import.impCancel')), h('vxe-button', {
             props: {
               status: 'primary',
-              disabled: !hasFile
+              disabled: !hasFile || loading
             },
             on: {
               click: this.importEvent