vxe-table 3.21.0 → 3.21.2

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.0";
+const version = "3.21.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3476,6 +3476,7 @@ core_.VxeUI.setConfig({
     },
     aggregateConfig: {
       padding: true,
+      placement: 'left',
       rowField: 'id',
       parentField: '_X_ROW_PARENT_KEY',
       childrenField: '_X_ROW_CHILDREN',
@@ -3841,7 +3842,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.21.0"}`;
+const log_version = `table v${"3.21.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3970,6 +3971,7 @@ class ColumnInfo {
       filterRecoverMethod: _vm.filterRecoverMethod,
       filterRender: filterRender,
       floatingFilters: _vm.floatingFilters,
+      rules: _vm.rules,
       rowGroupNode: _vm.rowGroupNode,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
@@ -6778,7 +6780,7 @@ const Cell = {
     const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
     let isRequired = false;
     if (editRules) {
-      const columnRules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, column.field);
+      const columnRules = column.rules ? column.rules : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, column.field);
       if (columnRules) {
         isRequired = columnRules.some(rule => rule.required);
       }
@@ -7032,6 +7034,8 @@ const columnProps = {
   filterRender: Object,
   // 是否显示浮动筛选
   floatingFilters: Object,
+  // 列的校验规则
+  rules: Array,
   // 设置为分组节点
   rowGroupNode: Boolean,
   // 设置为树节点
@@ -11207,6 +11211,8 @@ function panel_hideDropTip($xeTableCustomPanel) {
       } = customPanelReactData;
       const customOpts = $xeTable.computeCustomOpts;
       const {
+        showSortDragButton,
+        allowSort,
         immediate
       } = customOpts;
       const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -11225,7 +11231,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
         evnt.preventDefault();
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y;
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom';
-        if (!dragCol || dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1) {
+        if (!dragCol || !(showSortDragButton && allowSort) || dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1 || !isCrossDrag && dragCol.level > 1 || !immediate && dragCol.level > 1) {
           panel_showDropTip($xeTableCustomPanel, evnt, optEl, false, dragPos);
           return;
         }
@@ -11402,19 +11408,19 @@ function panel_hideDropTip($xeTableCustomPanel) {
         isCustomDragStatus
       } = tableReactData;
       const customOpts = $xeTable.computeCustomOpts;
-      const {
-        immediate
-      } = customOpts;
       const columnDragOpts = $xeTable.computeColumnDragOpts;
       const {
         popupStyle
       } = customStore;
       const {
+        immediate,
         checkMethod,
         visibleMethod,
         allowVisible,
         allowSort,
         allowFixed,
+        allowGroup,
+        allowValues,
         trigger,
         placement,
         showSortDragButton,
@@ -11500,7 +11506,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
           })]) : panel_renderEmptyElement($xeTable), h('div', {
             class: 'vxe-table-custom--name-option'
-          }, [allowSort && showSortDragButton && showSortBtn ? h('div', {
+          }, [allowSort && showSortDragButton || allowGroup || allowValues ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? h('div', {
             class: 'vxe-table-custom--sort-option'
           }, [h('span', {
             class: ['vxe-table-custom--sort-btn', {
@@ -11515,7 +11521,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             }
           }, [h('i', {
             class: panel_getIcon().TABLE_CUSTOM_SORT
-          })])]) : panel_renderEmptyElement($xeTable), column.type === 'html' ? h('div', {
+          })])]) : panel_renderEmptyElement($xeTable) : panel_renderEmptyElement($xeTable), column.type === 'html' ? h('div', {
             key: '1',
             class: 'vxe-table-custom--checkbox-label',
             domProps: {
@@ -11734,21 +11740,25 @@ function panel_hideDropTip($xeTableCustomPanel) {
         customColumnList
       } = tableReactData;
       const customOpts = $xeTable.computeCustomOpts;
+      const columnDragOpts = $xeTable.computeColumnDragOpts;
+      const aggregateOpts = $xeTable.computeAggregateOpts;
+      const {
+        placement: aggPlacement
+      } = aggregateOpts;
       const {
+        mode,
         immediate,
         showSortDragButton,
         showSortMoveButton,
-        showSortPutButton
-      } = customOpts;
-      const columnDragOpts = $xeTable.computeColumnDragOpts;
-      const {
-        mode,
+        showSortPutButton,
         modalOptions,
         drawerOptions,
         allowVisible,
         allowSort,
         allowFixed,
         allowResizable,
+        allowGroup,
+        allowValues,
         checkMethod,
         visibleMethod
       } = customOpts;
@@ -11776,6 +11786,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
       const trVNs = [];
       const isAllChecked = customStore.isAll;
       const isAllIndeterminate = customStore.isIndeterminate;
+      const isAggRtBmLayout = aggPlacement === 'right' || aggPlacement === 'bottom';
       const params = {
         $table: $xeTable,
         $grid: $xeGrid,
@@ -11856,7 +11867,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             class: 'vxe-table-custom-popup--column-item col--name'
           }, [h('div', {
             class: 'vxe-table-custom-popup--name'
-          }, [allowSort ? showSortDragButton && (showSortBtn ? h('div', {
+          }, [allowSort && showSortDragButton || allowGroup || allowValues ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? h('div', {
             class: ['vxe-table-custom-popup--column-sort-btn', {
               'is--disabled': isHidden
             }],
@@ -11871,7 +11882,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             class: panel_getIcon().TABLE_CUSTOM_SORT
           })]) : h('div', {
             class: 'vxe-table-custom-popup--column-sort-placeholder'
-          })) : panel_renderEmptyElement($xeTable), column.type === 'html' ? h('div', {
+          }) : panel_renderEmptyElement($xeTable), column.type === 'html' ? h('div', {
             key: '1',
             class: 'vxe-table-custom-popup--title',
             domProps: {
@@ -11989,8 +12000,8 @@ function panel_hideDropTip($xeTableCustomPanel) {
         default: () => {
           return h('div', {
             ref: 'refBodyWrapperElem',
-            class: 'vxe-table-custom-popup--body-wrapper'
-          }, defaultSlot ? $xeTable.callSlot(defaultSlot, params, h) : [!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+            class: ['vxe-table-custom-popup--body-wrapper', `agg-layout--${aggPlacement}`]
+          }, defaultSlot ? $xeTable.callSlot(defaultSlot, params, h) : [!isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
             props: {
               customStore
             }
@@ -12032,7 +12043,11 @@ function panel_hideDropTip($xeTableCustomPanel) {
             }
           }, trVNs)])]), bottomSlot ? h('div', {
             class: 'vxe-table-custom-popup--table-bottom'
-          }, $xeTable.callSlot(bottomSlot, params, h)) : panel_renderEmptyElement($xeTable), $xeTableCustomPanel.renderDragTip(h)])]);
+          }, $xeTable.callSlot(bottomSlot, params, h)) : panel_renderEmptyElement($xeTable), $xeTableCustomPanel.renderDragTip(h)]), isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+            props: {
+              customStore
+            }
+          }) : panel_renderEmptyElement($xeTable)]);
         },
         footer: () => {
           if (footerSlot) {
@@ -14468,8 +14483,9 @@ const {
           $gantt: $xeGantt,
           $event: evnt
         });
-        if (gMenuOpts && gMenuOpts.menuMethod) {
-          gMenuOpts.menuMethod(params, evnt);
+        const tmMethod = gMenuOpts ? gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod : null;
+        if (tmMethod) {
+          tmMethod(params, evnt);
         }
         // 在 v4 中废弃事件 context-menu-click
         if ($xeTable.$listeners['context-menu-click']) {
@@ -18825,10 +18841,10 @@ function beginValidate($xeTable, rows, cols, cb, isFull) {
         editRules
       } = this;
       const {
-        property
+        field
       } = column;
-      if (property && editRules) {
-        const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, property);
+      if (field && editRules) {
+        const rules = column.rules ? column.rules : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
         return rules && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(rules, rule => type === 'all' || !rule.trigger || type === rule.trigger);
       }
       return false;
@@ -18860,7 +18876,7 @@ function beginValidate($xeTable, rows, cols, cb, isFull) {
       const errorRules = [];
       const syncValidList = [];
       if (field && editRules) {
-        const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
+        const rules = column.rules ? column.rules : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
         if (rules) {
           const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, field) : val;
           rules.forEach(rule => {
@@ -21507,7 +21523,7 @@ function renderBody(h, $xeTable) {
       warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
     }
     if (mouseOpts.area && props.treeConfig && !treeOpts.transform) {
-      errLog('vxe.error.noTree', ['mouse-config.area']);
+      errLog('vxe.error.notSupportProp', ['mouse-config.area', 'tree-config.transform=false', 'tree-config.transform=true']);
     }
     if (props.editConfig && editOpts.activeMethod) {
       warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod']);
@@ -26988,7 +27004,8 @@ const Toolbar = VxeToolbar;
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       loadingText: '加载中...',
       emptyText: '暂无数据',
@@ -27005,7 +27022,8 @@ const Toolbar = VxeToolbar;
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
@@ -27048,7 +27066,7 @@ const Toolbar = VxeToolbar;
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -27534,7 +27552,7 @@ const Toolbar = VxeToolbar;
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',