vxe-table 3.11.24 → 3.11.25

package/lib/table/src/methods.js

@@ -503,6 +503,7 @@ const updateColDropTipContent = ($xeTable, tdEl) => {
 };
 function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
   const reactData = $xeTable;
+  const internalData = $xeTable;
   const el = $xeTable.$refs.refElem;
   if (!el) {
     return;
@@ -511,6 +512,9 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     scrollbarWidth,
     scrollbarHeight
   } = reactData;
+  const {
+    prevDragToChild
+  } = internalData;
   const wrapperRect = el.getBoundingClientRect();
   if (trEl) {
     const rdLineEl = $xeTable.$refs.refDragRowLineElem;
@@ -522,6 +526,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
         rdLineEl.style.height = `${trRect.height}px`;
         rdLineEl.style.width = `${wrapperRect.width - scrollbarWidth}px`;
         rdLineEl.setAttribute('drag-pos', dragPos);
+        rdLineEl.setAttribute('drag-to-child', prevDragToChild ? 'y' : 'n');
       } else {
         rdLineEl.style.display = '';
       }
@@ -546,7 +551,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     rdTipEl.style.display = 'block';
     rdTipEl.style.top = `${Math.min(el.clientHeight - el.scrollTop - rdTipEl.clientHeight, evnt.clientY - wrapperRect.y)}px`;
     rdTipEl.style.left = `${Math.min(el.clientWidth - el.scrollLeft - rdTipEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`;
-    rdTipEl.setAttribute('drag-status', showLine ? 'normal' : 'disabled');
+    rdTipEl.setAttribute('drag-status', showLine ? prevDragToChild ? 'sub' : 'normal' : 'disabled');
   }
 }
 const hideDropTip = $xeTable => {
@@ -5954,13 +5959,40 @@ const Methods = {
       }
     }
   },
+  handleColumnSortEvent(evnt, column) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const {
+      mouseConfig
+    } = props;
+    const mouseOpts = $xeTable.computeMouseOpts;
+    const {
+      field,
+      sortable
+    } = column;
+    if (sortable) {
+      const params = {
+        $table: $xeTable,
+        $event: evnt,
+        column,
+        field,
+        property: field,
+        order: column.order,
+        sortList: $xeTable.getSortColumns(),
+        sortTime: column.sortTime
+      };
+      if (mouseConfig && mouseOpts.area && $xeTable.handleSortEvent) {
+        $xeTable.handleSortEvent(evnt, params);
+      }
+      $xeTable.dispatchEvent('sort-change', params, evnt);
+    }
+  },
   /**
    * 点击排序事件
    */
   triggerSortEvent(evnt, column, order) {
-    const {
-      sortOpts
-    } = this;
+    const $xeTable = this;
+    const sortOpts = $xeTable.computeSortOpts;
     const {
       field,
       sortable,
@@ -5968,27 +6000,14 @@ const Methods = {
     } = column;
     if (sortable || remoteSort) {
       if (!order || column.order === order) {
-        this.clearSort(sortOpts.multiple ? column : null);
+        $xeTable.clearSort(sortOpts.multiple ? column : null);
       } else {
-        this.sort({
+        $xeTable.sort({
           field,
           order
         });
       }
-      const params = {
-        $table: this,
-        $event: evnt,
-        column,
-        field,
-        property: field,
-        order: column.order,
-        sortList: this.getSortColumns(),
-        sortTime: column.sortTime
-      };
-      if (this.mouseConfig && this.mouseOpts.area && this.handleSortEvent) {
-        this.handleSortEvent(evnt, params);
-      }
-      this.emitEvent('sort-change', params, evnt);
+      $xeTable.handleColumnSortEvent(evnt, column);
     }
   },
   /**
@@ -6011,7 +6030,8 @@ const Methods = {
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      prevDragToChild
     } = internalData;
     const {
       isCrossDrag,
@@ -6021,6 +6041,7 @@ const Methods = {
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
+      rowField,
       mapChildrenField,
       parentField
     } = treeOpts;
@@ -6130,7 +6151,7 @@ const Methods = {
                     childRow[parentField] = dragRow[parentField];
                   });
                 }
-                dragRow[parentField] = prevDragRow[parentField];
+                dragRow[parentField] = prevDragToChild ? prevDragRow[rowField] : prevDragRow[parentField];
                 internalData.tableFullTreeData = _xeUtils.default.toArrayTree(fullList, {
                   key: treeOpts.rowField,
                   parentKey: treeOpts.parentField,
@@ -6203,14 +6224,20 @@ const Methods = {
     const {
       dragRow
     } = reactData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      transform
+    } = treeOpts;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
-      isCrossDrag
+      isCrossDrag,
+      isToChildDrag
     } = rowDragOpts;
     if (!dragRow) {
       evnt.preventDefault();
       return;
     }
+    const hasCtrlKey = evnt.ctrlKey;
     const trEl = evnt.currentTarget;
     const rowid = trEl.getAttribute('rowid') || '';
     const rest = fullAllDataRowIdData[rowid];
@@ -6226,6 +6253,7 @@ const Methods = {
         showDropTip($xeTable, evnt, trEl, null, false, dragPos);
         return;
       }
+      internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && hasCtrlKey);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
       showDropTip($xeTable, evnt, trEl, null, true, dragPos);
@@ -6402,6 +6430,7 @@ const Methods = {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos);
         return;
       }
+      internalData.prevDragToChild = false;
       internalData.prevDragCol = column;
       internalData.prevDragPos = dragPos;
       showDropTip($xeTable, evnt, null, thEl, true, dragPos);
@@ -6579,6 +6608,58 @@ const Methods = {
     }
     return this.$nextTick();
   },
+  setSort(sortConfs, isUpdate) {
+    const $xeTable = this;
+    const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple,
+      remote,
+      orders
+    } = sortOpts;
+    if (!_xeUtils.default.isArray(sortConfs)) {
+      sortConfs = [sortConfs];
+    }
+    if (sortConfs && sortConfs.length) {
+      if (!multiple) {
+        sortConfs = [sortConfs[0]];
+        clearAllSort($xeTable);
+      }
+      let firstColumn = null;
+      sortConfs.forEach((confs, index) => {
+        let {
+          field,
+          order
+        } = confs;
+        let column = field;
+        if (_xeUtils.default.isString(field)) {
+          column = $xeTable.getColumnByField(field);
+        }
+        if (!firstColumn) {
+          firstColumn = column;
+        }
+        if (column && column.sortable) {
+          if (orders.indexOf(order) === -1) {
+            order = getNextSortOrder($xeTable, column);
+          }
+          if (column.order !== order) {
+            column.order = order;
+          }
+          column.sortTime = Date.now() + index;
+        }
+      });
+      if (isUpdate) {
+        if (!remote) {
+          $xeTable.handleTableData(true);
+        }
+        $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
+      }
+      return $xeTable.$nextTick().then(() => {
+        $xeTable.updateCellAreas();
+        return $xeTable.updateStyle();
+      });
+    }
+    return $xeTable.$nextTick();
+  },
   /**
    * 清空指定列的排序条件
    * 如果为空则清空所有列的排序条件