vxe-table 4.9.20 → 4.9.22

package/lib/table/src/table.js

@@ -5180,6 +5180,57 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         return (0, _vue.nextTick)();
       },
+      setSort(sortConfs, isUpdate) {
+        const sortOpts = computeSortOpts.value;
+        const {
+          multiple,
+          remote,
+          orders
+        } = sortOpts;
+        if (!_xeUtils.default.isArray(sortConfs)) {
+          sortConfs = [sortConfs];
+        }
+        if (sortConfs && sortConfs.length) {
+          if (!multiple) {
+            sortConfs = [sortConfs[0]];
+            clearAllSort();
+          }
+          let firstColumn = null;
+          sortConfs.forEach((confs, index) => {
+            let {
+              field,
+              order
+            } = confs;
+            let column = field;
+            if (_xeUtils.default.isString(field)) {
+              column = tableMethods.getColumnByField(field);
+            }
+            if (!firstColumn) {
+              firstColumn = column;
+            }
+            if (column && column.sortable) {
+              if (orders.indexOf(order) === -1) {
+                order = getNextSortOrder(column);
+              }
+              if (column.order !== order) {
+                column.order = order;
+              }
+              column.sortTime = Date.now() + index;
+            }
+          });
+          if (isUpdate) {
+            if (!remote) {
+              tablePrivateMethods.handleTableData(true);
+            }
+            $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
+          }
+          return (0, _vue.nextTick)().then(() => {
+            tableMethods.updateCellAreas();
+            return updateStyle();
+          });
+        }
+        return (0, _vue.nextTick)();
+      },
       /**
        * 清空指定列的排序条件
        * 如果为空则清空所有列的排序条件
@@ -6822,6 +6873,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         scrollbarWidth,
         scrollbarHeight
       } = reactData;
+      const {
+        prevDragToChild
+      } = internalData;
       const wrapperRect = el.getBoundingClientRect();
       if (trEl) {
         const rdLineEl = refDragRowLineElem.value;
@@ -6833,6 +6887,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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 = '';
           }
@@ -6857,7 +6912,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         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 = () => {
@@ -8163,28 +8218,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }, evnt);
         }
       },
-      /**
-       * 点击排序事件
-       */
-      triggerSortEvent(evnt, column, order) {
+      handleColumnSortEvent(evnt, column) {
         const {
           mouseConfig
         } = props;
-        const sortOpts = computeSortOpts.value;
         const mouseOpts = computeMouseOpts.value;
         const {
           field,
           sortable
         } = column;
         if (sortable) {
-          if (!order || column.order === order) {
-            tableMethods.clearSort(sortOpts.multiple ? column : null);
-          } else {
-            tableMethods.sort({
-              field,
-              order
-            });
-          }
           const params = {
             $table: $xeTable,
             $event: evnt,
@@ -8201,6 +8244,27 @@ var _default = exports.default = (0, _vue.defineComponent)({
           dispatchEvent('sort-change', params, evnt);
         }
       },
+      /**
+       * 点击排序事件
+       */
+      triggerSortEvent(evnt, column, order) {
+        const sortOpts = computeSortOpts.value;
+        const {
+          field,
+          sortable
+        } = column;
+        if (sortable) {
+          if (!order || column.order === order) {
+            tableMethods.clearSort(sortOpts.multiple ? column : null);
+          } else {
+            tableMethods.sort({
+              field,
+              order
+            });
+          }
+          $xeTable.handleColumnSortEvent(evnt, column);
+        }
+      },
       /**
        * 行拖拽
        */
@@ -8217,7 +8281,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const rowDragOpts = computeRowDragOpts.value;
         const {
-          fullAllDataRowIdData
+          fullAllDataRowIdData,
+          prevDragToChild
         } = internalData;
         const {
           isCrossDrag,
@@ -8227,6 +8292,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const treeOpts = computeTreeOpts.value;
         const {
           transform,
+          rowField,
           mapChildrenField,
           parentField
         } = treeOpts;
@@ -8242,6 +8308,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+        console.log(evnt.ctrlKey);
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
@@ -8336,7 +8403,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                         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,
@@ -8405,14 +8472,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           dragRow
         } = reactData;
+        const treeOpts = computeTreeOpts.value;
+        const {
+          transform
+        } = treeOpts;
         const rowDragOpts = computeRowDragOpts.value;
         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];
@@ -8428,6 +8501,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             showDropTip(evnt, trEl, null, false, dragPos);
             return;
           }
+          internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && hasCtrlKey);
           internalData.prevDragRow = row;
           internalData.prevDragPos = dragPos;
           showDropTip(evnt, trEl, null, true, dragPos);
@@ -8592,6 +8666,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             showDropTip(evnt, null, thEl, false, dragPos);
             return;
           }
+          internalData.prevDragToChild = false;
           internalData.prevDragCol = column;
           internalData.prevDragPos = dragPos;
           showDropTip(evnt, null, thEl, true, dragPos);
@@ -9137,6 +9212,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           class: 'vxe-table--drag-sort-tip-status'
         }, [(0, _vue.h)('span', {
           class: ['vxe-table--drag-sort-tip-normal-status', dragRow ? getIcon().TABLE_DRAG_STATUS_ROW : getIcon().TABLE_DRAG_STATUS_COLUMN]
+        }), (0, _vue.h)('span', {
+          class: ['vxe-table--drag-sort-tip-sub-status', getIcon().TABLE_DRAG_STATUS_SUB_ROW]
         }), (0, _vue.h)('span', {
           class: ['vxe-table--drag-sort-tip-disabled-status', getIcon().TABLE_DRAG_DISABLED]
         })]), (0, _vue.h)('div', {