vxe-table 4.9.20 → 4.9.22

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.9.20";
+const version = "4.9.22";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2248,6 +2248,7 @@ core_.VxeUI.setIcon({
   TABLE_DRAG_ROW: iconPrefix + 'drag-handle',
   TABLE_DRAG_COLUMN: iconPrefix + 'drag-handle',
   TABLE_DRAG_STATUS_ROW: iconPrefix + 'sort',
+  TABLE_DRAG_STATUS_SUB_ROW: iconPrefix + 'add-sub',
   TABLE_DRAG_STATUS_COLUMN: iconPrefix + 'swap',
   TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
   // toolbar
@@ -2409,7 +2410,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.9.20"}`;
+const log_version = `table v${"4.9.22"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -13966,6 +13967,57 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
+      setSort(sortConfs, isUpdate) {
+        const sortOpts = computeSortOpts.value;
+        const {
+          multiple,
+          remote,
+          orders
+        } = sortOpts;
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+            tableMethods.updateCellAreas();
+            return updateStyle();
+          });
+        }
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      },
       /**
        * 清空指定列的排序条件
        * 如果为空则清空所有列的排序条件
@@ -15612,6 +15664,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         scrollbarWidth,
         scrollbarHeight
       } = reactData;
+      const {
+        prevDragToChild
+      } = internalData;
       const wrapperRect = el.getBoundingClientRect();
       if (trEl) {
         const rdLineEl = refDragRowLineElem.value;
@@ -15623,6 +15678,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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 = '';
           }
@@ -15647,7 +15703,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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 = () => {
@@ -16955,28 +17011,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }, 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,
@@ -16993,6 +17037,27 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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);
+        }
+      },
       /**
        * 行拖拽
        */
@@ -17009,7 +17074,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = props;
         const rowDragOpts = computeRowDragOpts.value;
         const {
-          fullAllDataRowIdData
+          fullAllDataRowIdData,
+          prevDragToChild
         } = internalData;
         const {
           isCrossDrag,
@@ -17019,6 +17085,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const treeOpts = computeTreeOpts.value;
         const {
           transform,
+          rowField,
           mapChildrenField,
           parentField
         } = treeOpts;
@@ -17034,6 +17101,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+        console.log(evnt.ctrlKey);
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
@@ -17128,7 +17196,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                         childRow[parentField] = dragRow[parentField];
                       });
                     }
-                    dragRow[parentField] = prevDragRow[parentField];
+                    dragRow[parentField] = prevDragToChild ? prevDragRow[rowField] : prevDragRow[parentField];
                     internalData.tableFullTreeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullList, {
                       key: treeOpts.rowField,
                       parentKey: treeOpts.parentField,
@@ -17197,14 +17265,20 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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];
@@ -17220,6 +17294,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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);
@@ -17383,6 +17458,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             showDropTip(evnt, null, thEl, false, dragPos);
             return;
           }
+          internalData.prevDragToChild = false;
           internalData.prevDragCol = column;
           internalData.prevDragPos = dragPos;
           showDropTip(evnt, null, thEl, true, dragPos);
@@ -17928,6 +18004,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           class: 'vxe-table--drag-sort-tip-status'
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
           class: ['vxe-table--drag-sort-tip-normal-status', dragRow ? table_getIcon().TABLE_DRAG_STATUS_ROW : table_getIcon().TABLE_DRAG_STATUS_COLUMN]
+        }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          class: ['vxe-table--drag-sort-tip-sub-status', table_getIcon().TABLE_DRAG_STATUS_SUB_ROW]
         }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
           class: ['vxe-table--drag-sort-tip-disabled-status', table_getIcon().TABLE_DRAG_DISABLED]
         })]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -18917,25 +18995,16 @@ hook_hooks.add('tableFilterModule', {
           }
         }
       },
-      /**
-       * 确认筛选
-       * 当筛选面板中的确定按钮被按下时触发
-       * @param {Event} evnt 事件
-       */
-      confirmFilterEvent(evnt) {
+      handleColumnConfirmFilter(column, evnt) {
         const {
           mouseConfig
         } = props;
         const {
-          filterStore,
           scrollXLoad: oldScrollXLoad,
           scrollYLoad: oldScrollYLoad
         } = reactData;
         const filterOpts = computeFilterOpts.value;
         const mouseOpts = computeMouseOpts.value;
-        const {
-          column
-        } = filterStore;
         const {
           field
         } = column;
@@ -18971,7 +19040,7 @@ hook_hooks.add('tableFilterModule', {
           $xeTable.dispatchEvent('filter-change', params, evnt);
         }
         $xeTable.closeFilter();
-        $xeTable.updateFooter().then(() => {
+        return $xeTable.updateFooter().then(() => {
           const {
             scrollXLoad,
             scrollYLoad
@@ -18993,6 +19062,20 @@ hook_hooks.add('tableFilterModule', {
           setTimeout(() => $xeTable.recalculate(), 50);
         });
       },
+      /**
+       * 确认筛选
+       * 当筛选面板中的确定按钮被按下时触发
+       * @param {Event} evnt 事件
+       */
+      confirmFilterEvent(evnt) {
+        const {
+          filterStore
+        } = reactData;
+        const {
+          column
+        } = filterStore;
+        $xeTable.handleColumnConfirmFilter(column, evnt);
+      },
       handleFilterChangeRadioOption: changeRadioOption,
       handleFilterChangeMultipleOption: changeMultipleOption,
       // 筛选发生改变
@@ -19038,10 +19121,13 @@ hook_hooks.add('tableFilterModule', {
        * @param {ColumnInfo} fieldOrColumn 列或字段名
        * @param {Array} options 选项
        */
-      setFilter(fieldOrColumn, options) {
+      setFilter(fieldOrColumn, options, isUpdate) {
         const column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column && column.filters) {
           column.filters = toFilters(options || []);
+          if (isUpdate) {
+            return $xeTable.handleColumnConfirmFilter(column, new Event('click'));
+          }
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -25470,7 +25556,7 @@ const {
   GLOBAL_EVENT_KEYS: grid_GLOBAL_EVENT_KEYS
 } = core_.VxeUI;
 const tableComponentPropKeys = Object.keys(props);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',