vxe-table 3.12.0-beta.5 → 3.12.0-beta.7

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.0-beta.5";
+const version = "3.12.0-beta.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2808,7 +2808,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0-beta.5"}`;
+const log_version = `table v${"3.12.0-beta.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -11376,6 +11376,14 @@ const Methods = {
       evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
     }
   },
+  handleColDragSwapColumn() {
+    const $xeTable = this;
+    $xeTable.handleUpdateColumn();
+    $xeTable.parseColumns(false).then(() => {
+      $xeTable.updateCellAreas();
+      $xeTable.saveCustomStore('update:sort');
+    });
+  },
   handleColDragSwapEvent(evnt, isSyncColumn, dragCol, prevDragCol, prevDragPos, prevDragToChild) {
     const $xeTable = this;
     const props = $xeTable;
@@ -11532,11 +11540,7 @@ const Methods = {
             }
           }, evnt);
           if (isSyncColumn) {
-            $xeTable.handleUpdateColumn();
-            $xeTable.parseColumns(false).then(() => {
-              $xeTable.updateCellAreas();
-              return $xeTable.saveCustomStore('update:sort');
-            });
+            $xeTable.handleColDragSwapColumn();
           }
         }).catch(() => {});
       }
@@ -14411,6 +14415,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       mouseConfig
     } = tableProps;
     const {
+      isGroup,
       tableData,
       scrollXLoad,
       scrollYLoad,
@@ -14467,7 +14472,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         }
       }
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -15103,7 +15108,7 @@ function renderHeads(h, _vm, headerGroups) {
       }
       renderHeaderList = [renderColumnList];
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -15623,6 +15628,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
       fullColumnIdData
     } = tableInternalData;
     const {
+      isGroup,
       scrollXLoad,
       scrollYLoad,
       scrollbarWidth,
@@ -15643,7 +15649,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         renderColumnList = visibleColumn;
       }
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -16627,7 +16633,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }), immediate ? h(VxeUIButtonComponent, {
         props: {
-          content: customOpts.resetButtonText || panel_getI18n('vxe.custom.customClose')
+          content: customOpts.resetButtonText || panel_getI18n('vxe.table.customClose')
         },
         on: {
           click: _vm.cancelCloseEvent
@@ -17162,11 +17168,7 @@ const renderPopupPanel = (h, _vm) => {
             }, evnt);
             if (immediate) {
               reactData.customColumnList = collectColumn.slice(0);
-              $xeTable.refreshColumn(true).then(() => {
-                $xeTable.updateCellAreas();
-                $xeTable.handleCustom();
-                $xeTable.saveCustomStore('update:sort');
-              });
+              $xeTable.handleColDragSwapColumn();
             }
           }).catch(() => {});
         }