vxe-table 4.19.1 → 4.19.2

package/packages/locale/lang/fr-FR.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Déplacer: {0}',
       setting: {
         colSort: 'Trier',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Titre de la colonne',
         colResizable: 'Largeur de colonne (pixels)',
         colVisible: "S'il faut afficher",
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/hu-HU.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Mozgás: {0}',
       setting: {
         colSort: 'Fajta',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Oszlopcím',
         colResizable: 'Oszlop szélessége (pixelek)',
         colVisible: 'Függetlenül attól, hogy megjelenjen',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/hy-AM.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/id-ID.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Pindahkan: {0}',
       setting: {
         colSort: 'Menyortir',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Judul kolom',
         colResizable: 'Lebar kolom (piksel)',
         colVisible: 'Apakah akan menampilkan',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/it-IT.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Muovi: {0}',
       setting: {
         colSort: 'Ordinare',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Titolo della colonna',
         colResizable: 'Larghezza della colonna (pixel)',
         colVisible: 'Se visualizzare',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/ja-JP.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移動：{0}',
       setting: {
         colSort: '選別',
-        sortHelpTip: 'アイコンをクリックしてドラッグして、注文を調整します',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列のタイトル',
         colResizable: '列幅（ピクセル）',
         colVisible: '表示するかどうか',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'ここでグループにドラッグします',
           valuesPlaceholder: 'ここにドラッグして集約します',
           dragExistCol: 'このコラムはすでに存在しています',
-          sortHelpTip: 'アイコンをクリックしてドラッグして、注文を調整します'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '合計を尋ねます',

package/packages/locale/lang/ko-KR.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '움직임 : {0}',
       setting: {
         colSort: '종류',
-        sortHelpTip: '아이콘을 클릭하고 드래그하여 순서를 조정하십시오',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '열 제목',
         colResizable: '열 폭 (픽셀)',
         colVisible: '표시 여부',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '여기로 끌어 그룹화하십시오',
           valuesPlaceholder: '집계를 위해 여기를 끌어냅니다',
           dragExistCol: '이 열은 이미 존재합니다',
-          sortHelpTip: '아이콘을 클릭하고 드래그하여 순서를 조정하십시오'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '합계를 요청하십시오',

package/packages/locale/lang/ms-MY.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Bergerak: {0}',
       setting: {
         colSort: 'Menyusun',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Tajuk lajur',
         colResizable: 'Lebar lajur (piksel)',
         colVisible: 'Sama ada untuk memaparkan',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/nb-NO.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Flytt: {0}',
       setting: {
         colSort: 'Sortere',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Kolonnetittel',
         colResizable: 'Kolonnebredde (piksler)',
         colVisible: 'Om du skal vise',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/pt-BR.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Move: {0}',
       setting: {
         colSort: 'Organizar',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Título da coluna',
         colResizable: 'Largura da coluna (pixels)',
         colVisible: 'Se deve exibir',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/ru-RU.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'MOVE: {0}',
       setting: {
         colSort: 'Сортировка',
-        sortHelpTip: 'Нажмите и перетащите значок, чтобы настроить заказ',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Заголовок столбца',
         colResizable: 'Ширина столбца (пиксели)',
         colVisible: 'Отображать ли',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'Перетащите сюда, чтобы группировать',
           valuesPlaceholder: 'Перетащите сюда, чтобы агрегировать',
           dragExistCol: 'Эта колонка уже существует',
-          sortHelpTip: 'Нажмите и перетащите значок, чтобы настроить заказ'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: 'Попросить сумму',

package/packages/locale/lang/th-TH.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'ย้าย: {0}',
       setting: {
         colSort: 'เรียงลำดับ',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'ชื่อคอลัมน์',
         colResizable: 'ความกว้างของคอลัมน์ (พิกเซล)',
         colVisible: 'ไม่ว่าจะแสดง',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/ug-CN.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'يۆتكەش：{0}',
       setting: {
         colSort: 'تەرتىپلەش',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: 'قۇر كەڭلىڭى(پېكسىل)',
         colVisible: 'كۆرۈنەمدۇ-كۆرۈنمەمدۇ',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/uk-UA.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Перемістити: {0}',
       setting: {
         colSort: 'Сортувати',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Заголовок стовпців',
         colResizable: 'Ширина стовпця (пікселі)',
         colVisible: 'Чи відображати',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/uz-UZ.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: "Ko'chiring: {0}",
       setting: {
         colSort: 'Tartib',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Ustun unvon',
         colResizable: 'Ustun kengligi (piksellar)',
         colVisible: "Ko'rsatish kerakmi",
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/vi-VN.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Di chuyển: {0}',
       setting: {
         colSort: 'Loại',
-        sortHelpTip: 'Nhấp và kéo biểu tượng để điều chỉnh thứ tự',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Tiêu đề cột',
         colResizable: 'Chiều rộng cột (pixel)',
         colVisible: 'Có hiển thị không',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'Kéo ở đây để nhóm',
           valuesPlaceholder: 'Kéo ở đây để tổng hợp',
           dragExistCol: 'Cột này đã tồn tại',
-          sortHelpTip: 'Nhấp và kéo biểu tượng để điều chỉnh thứ tự'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: 'Yêu cầu tổng',

package/packages/locale/lang/zh-CHT.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移動：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '點擊並拖動圖標可以調整順序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列標題',
         colResizable: '列寬（像素）',
         colVisible: '是否顯示',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此處進行分組',
           valuesPlaceholder: '拖至此處進行聚合',
           dragExistCol: '該列已存在',
-          sortHelpTip: '點擊並拖動圖標可以調整順序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/locale/lang/zh-CN.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/table/module/custom/panel.ts

@@ -697,10 +697,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/packages/table/module/validator/hook.ts

@@ -469,7 +469,7 @@ hooks.add('tableValidatorModule', {
         const errorRules: Rule[] = []
         const syncValidList: Promise<any>[] = []
         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) => {
@@ -540,7 +540,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/packages/table/src/cell.ts

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

package/packages/table/src/column.ts

@@ -96,6 +96,8 @@ export const columnProps = {
   filterRender: Object as PropType<VxeColumnPropTypes.FilterRender>,
   // 是否显示浮动筛选
   floatingFilters: Object as PropType<VxeColumnPropTypes.FloatingFilters>,
+  // 列的校验规则
+  rules: Array as PropType<VxeColumnPropTypes.Rules>,
   // 设置为分组节点
   rowGroupNode: Boolean as PropType<VxeColumnPropTypes.RowGroupNode>,
   // 设置为树节点

package/packages/table/src/columnInfo.ts

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