vxe-table 3.15.29 → 3.15.31

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

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
-import { getFuncText, eqEmptyValue } from '../../../ui/src/utils'
+import { getFuncText } from '../../../ui/src/utils'
 import { scrollToView } from '../../../ui/src/dom'
 import { handleFieldOrColumn, getRowid } from '../../src/util'
 import { warnLog, errLog } from '../../../ui/src/log'
@@ -41,27 +41,104 @@ class Rule {
   }
 }
 
-function validErrorRuleValue (rule: any, val: any) {
+// 如果存在 pattern，判断正则
+function validREValue (pattern: string | RegExp | undefined, val: string) {
+  if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
+    return false
+  }
+  return true
+}
+
+// 如果存在 max，判断最大值
+function validMaxValue (max: string | number | undefined, num: number) {
+  if (!XEUtils.eqNull(max) && num > XEUtils.toNumber(max)) {
+    return false
+  }
+  return true
+}
+
+// 如果存在 min，判断最小值
+function validMinValue (min: string | number | undefined, num: number) {
+  if (!XEUtils.eqNull(min) && num < XEUtils.toNumber(min)) {
+    return false
+  }
+  return true
+}
+
+function validRuleValue (rule: VxeTableDefines.ValidatorRule, val: any, required: boolean | undefined) {
   const { type, min, max, pattern } = rule
+  const isArrType = type === 'array'
   const isNumType = type === 'number'
-  const numVal = isNumType ? XEUtils.toNumber(val) : XEUtils.getSize(val)
-  // 判断数值
-  if (isNumType && isNaN(val)) {
-    return true
-  }
-  // 如果存在 min，判断最小值
-  if (!XEUtils.eqNull(min) && numVal < XEUtils.toNumber(min)) {
-    return true
+  const isStrType = type === 'string'
+  const strVal = `${val}`
+  if (!validREValue(pattern, strVal)) {
+    return false
   }
-  // 如果存在 max，判断最大值
-  if (!XEUtils.eqNull(max) && numVal > XEUtils.toNumber(max)) {
-    return true
+  if (isArrType) {
+    if (!XEUtils.isArray(val)) {
+      return false
+    }
+    if (required) {
+      if (!val.length) {
+        return false
+      }
+    }
+    if (!validMinValue(min, val.length)) {
+      return false
+    }
+    if (!validMaxValue(max, val.length)) {
+      return false
+    }
+  } else if (isNumType) {
+    const numVal = Number(val)
+    if (isNaN(numVal)) {
+      return false
+    }
+    if (!validMinValue(min, numVal)) {
+      return false
+    }
+    if (!validMaxValue(max, numVal)) {
+      return false
+    }
+  } else {
+    if (isStrType) {
+      if (!XEUtils.isString(val)) {
+        return false
+      }
+    }
+    if (required) {
+      if (!strVal) {
+        return false
+      }
+    }
+    if (!validMinValue(min, strVal.length)) {
+      return false
+    }
+    if (!validMaxValue(max, strVal.length)) {
+      return false
+    }
   }
-  // 如果存在 pattern，正则校验
-  if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
-    return true
+  return true
+}
+
+function checkRuleStatus (rule: VxeTableDefines.ValidatorRule, val: any) {
+  const { required } = rule
+  const isEmptyVal = XEUtils.eqNull(val)
+  if (required) {
+    if (isEmptyVal) {
+      return false
+    }
+    if (!validRuleValue(rule, val, required)) {
+      return false
+    }
+  } else {
+    if (!isEmptyVal) {
+      if (!validRuleValue(rule, val, required)) {
+        return false
+      }
+    }
   }
-  return false
+  return true
 }
 
 export default {
@@ -70,10 +147,8 @@ export default {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate (rows: any, cb: any) {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (XEUtils.isFunction(cb)) {
-          warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)'])
-        }
+      if (XEUtils.isFunction(cb)) {
+        warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)'])
       }
       return this.beginValidate(rows, null, cb, true)
     },
@@ -81,10 +156,8 @@ export default {
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate (rows: any, cb: any) {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (XEUtils.isFunction(cb)) {
-          warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)'])
-        }
+      if (XEUtils.isFunction(cb)) {
+        warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)'])
       }
       return this.beginValidate(rows, null, cb)
     },
@@ -326,7 +399,7 @@ export default {
         if (rules) {
           const cellValue = XEUtils.isUndefined(val) ? XEUtils.get(row, property) : val
           rules.forEach((rule: any) => {
-            const { type, trigger, required, validator } = rule
+            const { trigger, validator } = rule
             if (validType === 'all' || !trigger || validType === trigger) {
               if (validator) {
                 const validParams: any = {
@@ -348,9 +421,7 @@ export default {
                     if (tcvMethod) {
                       customValid = tcvMethod(validParams)
                     } else {
-                      if (process.env.VUE_APP_VXE_ENV === 'development') {
-                        warnLog('vxe.error.notValidators', [validator])
-                      }
+                      errLog('vxe.error.notValidators', [validator])
                     }
                   } else {
                     errLog('vxe.error.notValidators', [validator])
@@ -373,17 +444,7 @@ export default {
                   }
                 }
               } else {
-                const isArrType = type === 'array'
-                const isArrVal = XEUtils.isArray(cellValue)
-                let hasEmpty = true
-                if (isArrType || isArrVal) {
-                  hasEmpty = !isArrVal || !cellValue.length
-                } else if (XEUtils.isString(cellValue)) {
-                  hasEmpty = eqEmptyValue(cellValue.trim())
-                } else {
-                  hasEmpty = eqEmptyValue(cellValue)
-                }
-                if (required ? (hasEmpty || validErrorRuleValue(rule, cellValue)) : (!hasEmpty && validErrorRuleValue(rule, cellValue))) {
+                if (!checkRuleStatus(rule, cellValue)) {
                   this.validRuleErr = true
                   errorRules.push(new Rule(rule))
                 }

package/packages/table/src/methods.ts

@@ -3127,7 +3127,6 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
     //     }
     //   }
     // }
-    // if (process.env.VUE_APP_VXE_ENV === 'development') {
     // if (props.showHeader && !props.showHeaderOverflow) {
     //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
     // }
@@ -3140,7 +3139,6 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
     if (props.footerSpanMethod) {
       warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
     }
-    // }
     if (isReset) {
       const { visibleSize } = handleVirtualXVisible($xeTable)
       scrollXStore.startIndex = 0
@@ -3838,9 +3836,7 @@ const Methods = {
       }
       this.tableData = tableData.slice(0)
     } else {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        warnLog('vxe.error.reqProp', ['keep-source'])
-      }
+      errLog('vxe.error.reqProp', ['keep-source'])
     }
     return this.$nextTick()
   },
@@ -4084,16 +4080,12 @@ const Methods = {
   getVMRowIndex: createGetRowCacheProp('$index') as ((row: any) => number),
   // 在 v3 中废弃
   _getRowIndex (row: any) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex'])
-    }
+    warnLog('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex'])
     return this.getVTRowIndex(row)
   },
   // 在 v3 中废弃
   $getRowIndex (row: any) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex'])
-    }
+    warnLog('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex'])
     return this.getVMRowIndex(row)
   },
   /**
@@ -4113,16 +4105,12 @@ const Methods = {
   getVMColumnIndex: createGetColumnCacheProp('$index'),
   // 在 v3 中废弃
   _getColumnIndex (column: any) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex'])
-    }
+    warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex'])
     return this.getVTColumnIndex(column)
   },
   // 在 v3 中废弃
   $getColumnIndex (column: any) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex'])
-    }
+    warnLog('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex'])
     return this.getVMColumnIndex(column)
   },
   /**
@@ -4228,9 +4216,7 @@ const Methods = {
     const { transform } = treeOpts
     const { handleGetRowId } = createHandleGetRowId($xeTable)
     if (!keepSource) {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        errLog('vxe.error.reqProp', ['keep-source'])
-      }
+      errLog('vxe.error.reqProp', ['keep-source'])
       return $xeTable.$nextTick()
     }
     let targetRows = rows
@@ -5820,10 +5806,8 @@ const Methods = {
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
       evntList = interceptor.get('event.clearActived')
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (evntList.length) {
-          warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
-        }
+      if (evntList.length) {
+        warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
       }
     }
     // 兼容老版本
@@ -8669,9 +8653,7 @@ const Methods = {
   },
   // 在 v3 中废弃
   getSortColumn () {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['getSortColumn', 'getSortColumns'])
-    }
+    warnLog('vxe.error.delFunc', ['getSortColumn', 'getSortColumns'])
     return XEUtils.find(this.tableFullColumn, column => (column.sortable || column.remoteSort) && column.order)
   },
   isSort (fieldOrColumn: any) {
@@ -8839,9 +8821,7 @@ const Methods = {
     return $xeTable.$nextTick()
   },
   reloadExpandContent (row: any) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
-    }
+    warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
     // 即将废弃
     return this.reloadRowExpand(row)
   },
@@ -8984,9 +8964,7 @@ const Methods = {
     return !!rowExpandedFlag && !!rowExpandedMaps[rowid]
   },
   isExpandByRow (row: any) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
-    }
+    warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
     // 即将废弃
     return this.isRowExpandByRow(row)
   },
@@ -9227,9 +9205,7 @@ const Methods = {
   reloadTreeChilds (row: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
-    }
+    warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
     // 即将废弃
     return $xeTable.reloadTreeExpand(row)
   },

package/packages/table/src/table.ts

@@ -1800,14 +1800,12 @@ export default {
       initTpImg()
     }
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      const { $listeners } = this
-      if (!this.menuConfig && ($listeners['menu-click'] || $listeners['cell-menu'] || $listeners['header-cell-menu'] || $listeners['footer-cell-menu'])) {
-        warnLog('vxe.error.reqProp', ['menu-config'])
-      }
-      if (!this.tooltipConfig && ($listeners['cell-mouseenter'] || $listeners['cell-mouseleave'])) {
-        warnLog('vxe.error.reqProp', ['tooltip-config'])
-      }
+    const { $listeners } = this
+    if (!this.menuConfig && ($listeners['menu-click'] || $listeners['cell-menu'] || $listeners['header-cell-menu'] || $listeners['footer-cell-menu'])) {
+      warnLog('vxe.error.reqProp', ['menu-config'])
+    }
+    if (!this.tooltipConfig && ($listeners['cell-mouseenter'] || $listeners['cell-mouseleave'])) {
+      warnLog('vxe.error.reqProp', ['tooltip-config'])
     }
 
     // 使用已安装的组件，如果未安装则不渲染