vxe-table 4.23.1 → 4.23.3

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Megy',
       gotoTitle: 'Oldalak száma',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '前往',
       gotoTitle: '页数',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Pergi',
       gotoTitle: 'Jumlah halaman',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Andare',
       gotoTitle: 'Numero di pagine',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: 'すべて拡張します',
       clearExpand: 'すべてを閉じます',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '検索',
       emptyText: 'まだデータはありません'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '行く',
       gotoTitle: 'ページ数',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '모든 것을 확장하십시오',
       clearExpand: '모두 닫으십시오',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '찾다',
       emptyText: '아직 데이터가 없습니다'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '가다',
       gotoTitle: '페이지 수',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Pergi',
       gotoTitle: 'Bilangan halaman',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Gå',
       gotoTitle: 'Antall sider',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Ir',
       gotoTitle: 'Número de páginas',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: 'Расширить все',
       clearExpand: 'Закрыть все',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: 'поиск',
       emptyText: 'Нет данных пока'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Идти',
       gotoTitle: 'Количество страниц',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'ไป',
       gotoTitle: 'จำนวนหน้า',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'ئالغا',
       gotoTitle: 'بەت سانى',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Йти',
       gotoTitle: 'Кількість сторінок',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Bormoq',
       gotoTitle: 'Sahifalar soni',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: 'Mở rộng tất cả',
       clearExpand: 'Đóng tất cả',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: 'tìm kiếm',
       emptyText: 'Chưa có dữ liệu'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Đi',
       gotoTitle: 'Số lượng trang',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展開',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜尋',
       emptyText: '暫無數據'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '前往',
       gotoTitle: '頁數',

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

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '前往',
       gotoTitle: '页数',

package/packages/table/module/validator/hook.ts

@@ -157,6 +157,48 @@ hooks.add('tableValidatorModule', {
     let validatorMethods = {} as TableValidatorMethods
     let validatorPrivateMethods = {} as TableValidatorPrivateMethods
 
+    const handleClearValid = (rows: any, fieldOrColumn: string | string[] | VxeTableDefines.ColumnInfo | VxeTableDefines.ColumnInfo[] | undefined) => {
+      const { validErrorMaps } = reactData
+      const validOpts = computeValidOpts.value
+      const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : [])
+      const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn($xeTable, column)) as VxeTableDefines.ColumnInfo<any>[]
+      let validErrMaps: Record<string, {
+          row: any;
+          column: any;
+          rule: any;
+          content: any;
+        }> = {}
+        // 如果是多个提示模式
+      if (validOpts.msgMode === 'full') {
+        validErrMaps = Object.assign({}, validErrorMaps)
+        if (rowList.length && colList.length) {
+          rowList.forEach(row => {
+            colList.forEach((column) => {
+              const validKey = `${getRowid($xeTable, row)}:${column.id}`
+              if (validErrMaps[validKey]) {
+                delete validErrMaps[validKey]
+              }
+            })
+          })
+        } else if (rowList.length) {
+          const rowIdList = rowList.map(row => `${getRowid($xeTable, row)}`)
+          XEUtils.each(validErrorMaps, (item, key) => {
+            if (rowIdList.indexOf(key.split(':')[0]) > -1) {
+              delete validErrMaps[key]
+            }
+          })
+        } else if (colList.length) {
+          const colidList = colList.map(column => `${column.id}`)
+          XEUtils.each(validErrorMaps, (item, key) => {
+            if (colidList.indexOf(key.split(':')[1]) > -1) {
+              delete validErrMaps[key]
+            }
+          })
+        }
+      }
+      return validErrMaps
+    }
+
     /**
      * 聚焦到校验通过的单元格并弹出校验错误提示
      */
@@ -306,7 +348,7 @@ hooks.add('tableValidatorModule', {
         }
         return Promise.all(rowValidErrs).then(() => {
           const ruleProps = Object.keys(validRest)
-          reactData.validErrorMaps = handleErrMsgMode(validErrMaps)
+          reactData.validErrorMaps = Object.assign(handleClearValid(rows, columns), handleErrMsgMode(validErrMaps))
           return nextTick().then(() => {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0])
@@ -398,51 +440,11 @@ hooks.add('tableValidatorModule', {
         return nextTick()
       },
       clearValidate (rows, fieldOrColumn) {
-        const { validErrorMaps } = reactData
         const validTip = refValidTooltip.value
-        const validOpts = computeValidOpts.value
-        const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : [])
-        const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn($xeTable, column)) as VxeTableDefines.ColumnInfo<any>[]
-        let validErrMaps: Record<string, {
-          row: any;
-          column: any;
-          rule: any;
-          content: any;
-        }> = {}
         if (validTip && validTip.reactData.visible) {
           validTip.close()
         }
-        // 如果是单个提示模式
-        if (validOpts.msgMode === 'single') {
-          reactData.validErrorMaps = {}
-          return nextTick()
-        }
-        if (rowList.length && colList.length) {
-          validErrMaps = Object.assign({}, validErrorMaps)
-          rowList.forEach(row => {
-            colList.forEach((column) => {
-              const validKey = `${getRowid($xeTable, row)}:${column.id}`
-              if (validErrMaps[validKey]) {
-                delete validErrMaps[validKey]
-              }
-            })
-          })
-        } else if (rowList.length) {
-          const rowIdList = rowList.map(row => `${getRowid($xeTable, row)}`)
-          XEUtils.each(validErrorMaps, (item, key) => {
-            if (rowIdList.indexOf(key.split(':')[0]) > -1) {
-              validErrMaps[key] = item
-            }
-          })
-        } else if (colList.length) {
-          const colidList = colList.map(column => `${column.id}`)
-          XEUtils.each(validErrorMaps, (item, key) => {
-            if (colidList.indexOf(key.split(':')[1]) > -1) {
-              validErrMaps[key] = item
-            }
-          })
-        }
-        reactData.validErrorMaps = validErrMaps
+        reactData.validErrorMaps = handleClearValid(rows, fieldOrColumn)
         return nextTick()
       }
     }