vxe-table 4.19.1 → 4.19.2

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

@@ -648,10 +648,9 @@ export default defineVxeComponent({
             const { treeConfig, rowGroupConfig, aggregateConfig } = tableProps;
             const { isCustomStatus, customColumnList, isCustomDragStatus } = tableReactData;
             const customOpts = computeCustomOpts.value;
-            const { immediate } = customOpts;
             const columnDragOpts = computeColumnDragOpts.value;
             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 = computeIsMaxFixedColumn.value;
             const vSize = computeSize.value;
             const { isCrossDrag } = columnDragOpts;

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

@@ -440,7 +440,7 @@ hooks.add('tableValidatorModule', {
                 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) => {
@@ -514,7 +514,7 @@ hooks.add('tableValidatorModule', {
                 const { editRules } = props;
                 const { field } = column;
                 if (field && editRules) {
-                    const rules = XEUtils.get(editRules, field);
+                    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;

package/es/table/src/cell.js

@@ -1089,7 +1089,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

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

package/es/table/src/columnInfo.js

@@ -101,6 +101,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 = "4.19.1";
+export const version = "4.19.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${"4.19.1"}`;
+const version = `table v${"4.19.2"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "4.19.1";
+const version = "4.19.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3848,7 +3848,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.19.1"}`;
+const log_version = `table v${"4.19.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3972,6 +3972,7 @@ class ColumnInfo {
       filterRecoverMethod: _vm.filterRecoverMethod,
       filterRender: filterRender,
       floatingFilters: _vm.floatingFilters,
+      rules: _vm.rules,
       rowGroupNode: _vm.rowGroupNode,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
@@ -6913,7 +6914,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);
       }
@@ -7161,6 +7162,8 @@ const columnProps = {
   filterRender: Object,
   // 是否显示浮动筛选
   floatingFilters: Object,
+  // 列的校验规则
+  rules: Array,
   // 设置为分组节点
   rowGroupNode: Boolean,
   // 设置为树节点
@@ -10524,14 +10527,12 @@ function panel_createInternalData() {
         isCustomDragStatus
       } = tableReactData;
       const customOpts = computeCustomOpts.value;
-      const {
-        immediate
-      } = customOpts;
       const columnDragOpts = computeColumnDragOpts.value;
       const {
         popupStyle
       } = customStore;
       const {
+        immediate,
         checkMethod,
         visibleMethod,
         allowVisible,
@@ -17666,7 +17667,7 @@ validator_hook_hooks.add('tableValidatorModule', {
         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 => {
@@ -17755,7 +17756,7 @@ validator_hook_hooks.add('tableValidatorModule', {
           field
         } = column;
         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);
           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;
@@ -23994,7 +23995,7 @@ const Toolbar = VxeToolbar;
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -24480,7 +24481,7 @@ const Toolbar = VxeToolbar;
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',