vxe-table 3.21.1 → 3.21.2

package/es/table/module/custom/panel.js

@@ -747,10 +747,9 @@ export default {
             const { treeConfig, rowGroupConfig, aggregateConfig } = tableProps;
             const { isCustomStatus, customColumnList, isCustomDragStatus } = tableReactData;
             const customOpts = $xeTable.computeCustomOpts;
-            const { immediate } = customOpts;
             const columnDragOpts = $xeTable.computeColumnDragOpts;
             const { popupStyle } = customStore;
-            const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, allowGroup, allowValues, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts;
+            const { immediate, checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, allowGroup, allowValues, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts;
             const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
             const vSize = $xeTable.computeSize;
             const { isCrossDrag } = columnDragOpts;

package/es/table/module/menu/mixin.js

@@ -309,8 +309,9 @@ export default {
             if (!menu.loading && !menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
                 const gMenuOpts = menus.get(menu.code);
                 const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $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']) {

package/es/table/module/validator/mixin.js

@@ -378,9 +378,9 @@ export default {
         },
         hasCellRules(type, row, column) {
             const { editRules } = this;
-            const { property } = column;
-            if (property && editRules) {
-                const rules = XEUtils.get(editRules, property);
+            const { field } = column;
+            if (field && editRules) {
+                const rules = column.rules ? column.rules : XEUtils.get(editRules, field);
                 return rules && XEUtils.find(rules, rule => type === 'all' || !rule.trigger || type === rule.trigger);
             }
             return false;
@@ -408,7 +408,7 @@ export default {
             const errorRules = [];
             const syncValidList = [];
             if (field && editRules) {
-                const rules = XEUtils.get(editRules, field);
+                const rules = column.rules ? column.rules : XEUtils.get(editRules, field);
                 if (rules) {
                     const cellValue = XEUtils.isUndefined(val) ? XEUtils.get(row, field) : val;
                     rules.forEach((rule) => {

package/es/table/src/cell.js

@@ -1110,7 +1110,7 @@ export const Cell = {
         const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         let isRequired = false;
         if (editRules) {
-            const columnRules = XEUtils.get(editRules, column.field);
+            const columnRules = column.rules ? column.rules : XEUtils.get(editRules, column.field);
             if (columnRules) {
                 isRequired = columnRules.some((rule) => rule.required);
             }

package/es/table/src/column.js

@@ -99,6 +99,8 @@ export const columnProps = {
     filterRender: Object,
     // 是否显示浮动筛选
     floatingFilters: Object,
+    // 列的校验规则
+    rules: Array,
     // 设置为分组节点
     rowGroupNode: Boolean,
     // 设置为树节点

package/es/table/src/columnInfo.js

@@ -108,6 +108,7 @@ export class ColumnInfo {
             filterRecoverMethod: _vm.filterRecoverMethod,
             filterRender: filterRender,
             floatingFilters: _vm.floatingFilters,
+            rules: _vm.rules,
             rowGroupNode: _vm.rowGroupNode,
             treeNode: _vm.treeNode,
             dragSort: _vm.dragSort,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.21.1";
+export const version = "3.21.2";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.1";
+const version = "3.21.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3842,7 +3842,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.21.1"}`;
+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
@@ -3971,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,
@@ -6779,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);
       }
@@ -7033,6 +7034,8 @@ const columnProps = {
   filterRender: Object,
   // 是否显示浮动筛选
   floatingFilters: Object,
+  // 列的校验规则
+  rules: Array,
   // 设置为分组节点
   rowGroupNode: Boolean,
   // 设置为树节点
@@ -11405,14 +11408,12 @@ 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,
@@ -14482,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']) {
@@ -18839,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;
@@ -18874,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 => {
@@ -27064,7 +27066,7 @@ const Toolbar = VxeToolbar;
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -27550,7 +27552,7 @@ const Toolbar = VxeToolbar;
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',