vxe-table 3.11.32 → 3.11.33

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.11.32";
+export const version = "3.11.33";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -42,10 +42,12 @@ VxeUI.setConfig({
             strict: true
         },
         rowDragConfig: {
-            showIcon: true
+            showIcon: true,
+            animation: true
         },
         columnDragConfig: {
-            showIcon: true
+            showIcon: true,
+            animation: true
         },
         checkboxConfig: {
             // trigger: 'default',

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.11.32"}`;
+const version = `table v${"3.11.33"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.32";
+const version = "3.11.33";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2262,10 +2262,12 @@ core_.VxeUI.setConfig({
       strict: true
     },
     rowDragConfig: {
-      showIcon: true
+      showIcon: true,
+      animation: true
     },
     columnDragConfig: {
-      showIcon: true
+      showIcon: true,
+      animation: true
     },
     checkboxConfig: {
       // trigger: 'default',
@@ -2790,7 +2792,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.32"}`;
+const log_version = `table v${"3.11.33"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -14068,6 +14070,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   }, tdVNs);
 }
 function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
+  const columnOpts = $xeTable.computeColumnOpts;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
     stripe,
     rowKey,
@@ -14090,7 +14094,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     fullAllDataRowIdData,
     rowOpts,
     pendingRowMaps,
-    columnOpts,
     isDragColMove
   } = $xeTable;
   const {
@@ -14186,7 +14189,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     const tdVNs = tableColumn.map((column, $columnIndex) => {
       return renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
     });
-    rows.push(columnOpts.drag ? h('transition-group', {
+    rows.push(columnOpts.drag && columnDragOpts.animation ? h('transition-group', {
       props: {
         tag: 'tr',
         name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`
@@ -14330,6 +14333,8 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       fixedColumn,
       fixedType
     } = this;
+    const rowOpts = $xeTable.computeRowOpts;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
     let {
       $scopedSlots,
       tId,
@@ -14349,7 +14354,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       mouseConfig,
       mouseOpts,
       sYOpts,
-      rowOpts,
       isDragRowMove
     } = $xetable;
     // 如果是使用优化模式
@@ -14434,7 +14438,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     /**
      * 内容
      */
-    rowOpts.drag ? h('transition-group', {
+    rowOpts.drag && rowDragOpts.animation ? h('transition-group', {
       props: {
         tag: 'tbody',
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`
@@ -14830,29 +14834,28 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
   })] : []);
 };
 function renderHeads(h, _vm, headerGroups) {
-  const {
-    $parent: $xetable
-  } = _vm;
-  const tableProps = $xetable;
+  const $xeTable = _vm.$parent;
+  const tableProps = $xeTable;
   const {
     fixedType
   } = _vm;
+  const columnOpts = $xeTable.computeColumnOpts;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
     headerRowClassName,
     headerRowStyle
   } = tableProps;
   const {
     isDragColMove
-  } = $xetable;
-  const columnOpts = $xetable.columnOpts;
+  } = $xeTable;
   return headerGroups.map((cols, $rowIndex) => {
     const params = {
-      $table: $xetable,
+      $table: $xeTable,
       $rowIndex,
       fixed: fixedType,
       type: cellType
     };
-    if (columnOpts.drag) {
+    if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
         props: {
           tag: 'tr',
@@ -15337,6 +15340,9 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
   })] : []);
 }
 function footer_renderHeads(h, _vm, footerTableData) {
+  const $xeTable = _vm.$parent;
+  const columnOpts = $xeTable.computeColumnOpts;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
     $parent: $xetable,
     fixedType,
@@ -15347,7 +15353,6 @@ function footer_renderHeads(h, _vm, footerTableData) {
     footerRowStyle,
     isDragColMove
   } = $xetable;
-  const columnOpts = $xetable.columnOpts;
   return footerTableData.map((row, $rowIndex) => {
     const _rowIndex = $rowIndex;
     const rowParams = {
@@ -15358,7 +15363,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
       fixed: fixedType,
       type: footer_renderType
     };
-    if (columnOpts.drag) {
+    if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
         props: {
           tag: 'tr',
@@ -16543,12 +16548,8 @@ const renderPopupPanel = (h, _vm) => {
     }
   },
   render(h) {
-    const {
-      $xetable
-    } = this;
-    const {
-      customOpts
-    } = $xetable;
+    const $xeTable = this.$xeTable;
+    const customOpts = $xeTable.computeCustomOpts;
     if (['modal', 'drawer', 'popup'].includes(`${customOpts.mode}`)) {
       return renderPopupPanel(h, this);
     }
@@ -16642,12 +16643,11 @@ const renderPopupPanel = (h, _vm) => {
       }
     },
     handleOptionCheck(column) {
-      const {
-        $xetable
-      } = this;
+      const $xeTable = this.$xeTable;
+      const reactData = $xeTable;
       const {
         customColumnList
-      } = $xetable;
+      } = reactData;
       const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(customColumnList, item => item === column);
       if (matchObj && matchObj.parent) {
         const {
@@ -16661,11 +16661,9 @@ const renderPopupPanel = (h, _vm) => {
       }
     },
     changeCheckboxOption(column) {
-      const $xeTable = this.$xetable;
+      const $xeTable = this.$xeTable;
       const reactData = $xeTable;
-      const {
-        customOpts
-      } = $xeTable.customOpts;
+      const customOpts = $xeTable.computeCustomOpts;
       const isChecked = !column.renderVisible;
       if (customOpts.immediate) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], item => {