vxe-table 3.7.0-beta.1 → 3.7.0-beta.10

package/packages/table/src/table.js

@@ -96,6 +96,8 @@ export default {
     data: Array,
     // 表格的高度
     height: [Number, String],
+    // 表格的最小高度
+    minHeight: { type: [Number, String], default: () => GlobalConfig.table.minHeight },
     // 表格的最大高度
     maxHeight: [Number, String],
     // 已废弃，被 column-config.resizable 替换
@@ -303,7 +305,7 @@ export default {
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
       // 复选框属性，已选中的行
-      selection: [],
+      selectCheckboxRows: [],
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
@@ -773,7 +775,7 @@ export default {
       if (this.editConfig && editOpts.showStatus && !this.keepSource) {
         warnLog('vxe.error.reqProp', ['keep-source'])
       }
-      if (treeConfig && treeOpts.line && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
+      if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
         warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
       }
       if (this.showFooter && !this.footerMethod) {
@@ -830,6 +832,12 @@ export default {
           return
         }
       }
+      if (this.treeConfig && treeOpts.children) {
+        warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])
+      }
+      if (this.treeConfig && treeOpts.line) {
+        warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine'])
+      }
       if (this.mouseOpts.area && this.mouseOpts.selected) {
         warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
       }
@@ -874,9 +882,9 @@ export default {
       if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
         warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}'])
       }
-      // if (this.editConfig && this.editConfig.activeMethod) {
-      //   warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
-      // }
+      if (this.editConfig && this.editOpts.activeMethod) {
+        warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
+      }
     }
 
     // 检查是否有安装需要的模块
@@ -1015,11 +1023,13 @@ export default {
       hasTip,
       columnOpts,
       rowOpts,
-      loadingOpts
+      loadingOpts,
+      editRules
     } = this
     const { leftList, rightList } = columnStore
     return h('div', {
       class: ['vxe-table', 'vxe-table--render-default', `tid_${tId}`, vSize ? `size--${vSize}` : '', `border--${tableBorder}`, {
+        [`vaild-msg--${validOpts.msgMode}`]: !!editRules,
         'vxe-editable': !!editConfig,
         'cell--highlight': highlightCell,
         'cell--selected': mouseConfig && mouseOpts.selected,
@@ -1029,7 +1039,7 @@ export default {
         'is--header': showHeader,
         'is--footer': showFooter,
         'is--group': isGroup,
-        'is--tree-line': treeConfig && treeOpts.line,
+        'is--tree-line': treeConfig && (treeOpts.showLine || treeOpts.line),
         'is--fixed-left': leftList.length,
         'is--fixed-right': rightList.length,
         'is--animat': !!this.animat,

package/packages/table/src/util.js

@@ -157,7 +157,9 @@ function countTreeExpand (prevRow, params) {
     return count
   }
   const { $table } = params
-  const rowChildren = prevRow[$table.treeOpts.children]
+  const { treeOpts } = $table
+  const childrenField = treeOpts.children || treeOpts.childrenField
+  const rowChildren = prevRow[childrenField]
   if ($table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)

package/packages/textarea/src/textarea.js

@@ -18,7 +18,10 @@ export default {
     name: String,
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => XEUtils.eqNull(GlobalConfig.textarea.placeholder) ? GlobalConfig.i18n('vxe.base.pleaseInput') : GlobalConfig.textarea.placeholder
+    },
     maxlength: [String, Number],
     rows: { type: [String, Number], default: 2 },
     cols: { type: [String, Number], default: null },

package/packages/toolbar/src/toolbar.js

@@ -352,7 +352,7 @@ export default {
     }
   },
   created () {
-    const { refresh, refreshOpts } = this
+    const { refresh, refreshOpts, customOpts } = this
     this.$nextTick(() => {
       const $xetable = this.fintTable()
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query
@@ -363,6 +363,9 @@ export default {
         $xetable.connect(this)
       }
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (customOpts.isFooter) {
+          warnLog('vxe.error.notValidators', ['custom.isFooter', 'custom.showFooter'])
+        }
         if (this.buttons) {
           this.buttons.forEach(item => {
             const { buttonRender } = item
@@ -649,10 +652,16 @@ export default {
         if ($xegrid) {
           $xegrid.triggerToolbarBtnEvent(item, evnt)
         } else {
-          const commandMethod = VXETable.commands.get(code)
+          const gCommandOpts = VXETable.commands.get(code)
           const params = { code, button: item, $table: $xetable, $grid: $xegrid, $event: evnt }
-          if (commandMethod) {
-            commandMethod.call(this, params, evnt)
+          if (gCommandOpts) {
+            if (gCommandOpts.commandMethod) {
+              gCommandOpts.commandMethod(params)
+            } else {
+              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                errLog('vxe.error.notCommands', [code])
+              }
+            }
           }
           this.$emit('button-click', params)
         }
@@ -665,10 +674,16 @@ export default {
         if ($xegrid) {
           $xegrid.triggerToolbarTolEvent(item, evnt)
         } else {
-          const commandMethod = VXETable.commands.get(code)
+          const gCommandOpts = VXETable.commands.get(code)
           const params = { code, tool: item, $xegrid, $table: $xetable, $event: evnt }
-          if (commandMethod) {
-            commandMethod.call(this, params, evnt)
+          if (gCommandOpts) {
+            if (gCommandOpts.commandMethod) {
+              gCommandOpts.commandMethod(params)
+            } else {
+              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                errLog('vxe.error.notCommands', [code])
+              }
+            }
           }
           this.$emit('tool-click', params)
         }

package/packages/tooltip/src/tooltip.js

@@ -75,6 +75,7 @@ export default {
     content: { type: [String, Number], default: null },
     useHTML: Boolean,
     zIndex: [String, Number],
+    popupClassName: [String, Function],
     isArrow: { type: Boolean, default: true },
     enterable: Boolean,
     enterDelay: { type: Number, default: () => GlobalConfig.tooltip.enterDelay },
@@ -159,7 +160,7 @@ export default {
     }
   },
   render (h) {
-    const { $scopedSlots, vSize, theme, tipActive, isArrow, visible, tipStore, enterable } = this
+    const { $scopedSlots, vSize, popupClassName, theme, tipActive, isArrow, visible, tipStore, enterable } = this
     let on
     if (enterable) {
       on = {
@@ -168,7 +169,7 @@ export default {
       }
     }
     return h('div', {
-      class: ['vxe-table--tooltip-wrapper', `theme--${theme}`, {
+      class: ['vxe-table--tooltip-wrapper', `theme--${theme}`, popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $tooltip: this }) : popupClassName) : '', {
         [`size--${vSize}`]: vSize,
         [`placement--${tipStore.placement}`]: tipStore.placement,
         'is--enterable': enterable,

package/packages/v-x-e-table/index.js

@@ -5,6 +5,7 @@ import { renderer } from './src/renderer'
 import { commands } from './src/commands'
 import { menus } from './src/menus'
 import { formats } from './src/formats'
+import { validators } from './src/validators'
 import { setup } from './src/setup'
 import { UtilTools } from '../tools/utils'
 import { errLog } from '../tools/log'
@@ -98,6 +99,7 @@ export const VXETable = {
   commands,
   formats,
   menus,
+  validators,
   config,
   t,
   _t

package/packages/v-x-e-table/src/commands.js

@@ -1,6 +1,54 @@
-import VXEStore from './store'
+import XEUtils from 'xe-utils'
+import { warnLog } from '../../tools/log'
 
-export const commands = new VXEStore()
+class VXECommandsStore {
+  constructor () {
+    this.store = {}
+  }
+
+  mixin (options) {
+    XEUtils.each(options, (item, key) => {
+      this.add(key, item)
+    })
+    return VXECommandsStore
+  }
+
+  get (name) {
+    return this.store[name]
+  }
+
+  add (name, render) {
+    const conf = this.store[name]
+    // 兼容
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (XEUtils.isFunction(render)) {
+        warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+        render = {
+          commandMethod: render
+        }
+      }
+    }
+
+    // 检测是否覆盖
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      const confKeys = XEUtils.keys(conf)
+      XEUtils.each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          warnLog('vxe.error.coverProp', [name, key])
+        }
+      })
+    }
+    this.store[name] = conf ? XEUtils.merge(conf, render) : render
+    return VXECommandsStore
+  }
+
+  delete (name) {
+    delete this.store[name]
+    return VXECommandsStore
+  }
+}
+
+export const commands = new VXECommandsStore()
 
 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
   Object.assign(commands, { _name: 'Commands' })

package/packages/v-x-e-table/src/conf.js

@@ -13,6 +13,7 @@ export default {
     animat: true,
     delayHover: 250,
     autoResize: true,
+    minHeight: 144,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -46,7 +47,9 @@ export default {
     },
     validConfig: {
       showMessage: true,
-      message: 'default'
+      autoClear: true,
+      message: 'inline',
+      msgMode: 'single'
     },
     columnConfig: {
       maxFixedSize: 4
@@ -73,9 +76,9 @@ export default {
     treeConfig: {
       rowField: 'id',
       parentField: 'parentId',
-      children: 'children',
-      hasChild: 'hasChild',
-      mapChildren: '_X_ROW_CHILD',
+      childrenField: 'children',
+      hasChildField: 'hasChild',
+      mapChildrenField: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },

package/packages/v-x-e-table/src/formats.js

@@ -1,6 +1,54 @@
-import VXEStore from './store'
+import XEUtils from 'xe-utils'
+import { warnLog } from '../../tools/log'
 
-export const formats = new VXEStore()
+class VXEFormatsStore {
+  constructor () {
+    this.store = {}
+  }
+
+  mixin (options) {
+    XEUtils.each(options, (item, key) => {
+      this.add(key, item)
+    })
+    return VXEFormatsStore
+  }
+
+  get (name) {
+    return this.store[name]
+  }
+
+  add (name, render) {
+    const conf = this.store[name]
+    // 兼容
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (XEUtils.isFunction(render)) {
+        warnLog('vxe.error.delProp', ['callback', 'cellFormatMethod'])
+        render = {
+          cellFormatMethod: render
+        }
+      }
+    }
+
+    // 检测是否覆盖
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      const confKeys = XEUtils.keys(conf)
+      XEUtils.each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          warnLog('vxe.error.coverProp', [name, key])
+        }
+      })
+    }
+    this.store[name] = conf ? XEUtils.merge(conf, render) : render
+    return VXEFormatsStore
+  }
+
+  delete (name) {
+    delete this.store[name]
+    return VXEFormatsStore
+  }
+}
+
+export const formats = new VXEFormatsStore()
 
 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
   Object.assign(formats, { _name: 'Formats' })

package/packages/v-x-e-table/src/menus.js

@@ -1,6 +1,54 @@
-import VXEStore from './store'
+import XEUtils from 'xe-utils'
+import { warnLog } from '../../tools/log'
 
-export const menus = new VXEStore()
+class VXEMenusStore {
+  constructor () {
+    this.store = {}
+  }
+
+  mixin (options) {
+    XEUtils.each(options, (item, key) => {
+      this.add(key, item)
+    })
+    return VXEMenusStore
+  }
+
+  get (name) {
+    return this.store[name]
+  }
+
+  add (name, render) {
+    const conf = this.store[name]
+    // 兼容
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (XEUtils.isFunction(render)) {
+        warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+        render = {
+          menuMethod: render
+        }
+      }
+    }
+
+    // 检测是否覆盖
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      const confKeys = XEUtils.keys(conf)
+      XEUtils.each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          warnLog('vxe.error.coverProp', [name, key])
+        }
+      })
+    }
+    this.store[name] = conf ? XEUtils.merge(conf, render) : render
+    return VXEMenusStore
+  }
+
+  delete (name) {
+    delete this.store[name]
+    return VXEMenusStore
+  }
+}
+
+export const menus = new VXEMenusStore()
 
 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
   Object.assign(menus, { _name: 'Menus' })

package/packages/v-x-e-table/src/renderer.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import UtilTools, { getFuncText } from '../../tools/utils'
-import { warnLog } from '../../tools/log'
+import { errLog, warnLog } from '../../tools/log'
 
 const defaultCompProps = { transfer: true }
 
@@ -103,6 +103,11 @@ function getNativeOns (renderOpts, params) {
   const nativeOns = {}
   XEUtils.objectEach(nativeEvents, (func, key) => {
     nativeOns[key] = function (...args) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (!XEUtils.isFunction(key)) {
+          errLog('vxe.error.errFunc', [key])
+        }
+      }
       func(params, ...args)
     }
   })
@@ -117,6 +122,11 @@ function getOns (renderOpts, params, inputFunc, changeFunc) {
   const ons = {}
   XEUtils.objectEach(events, (func, key) => {
     ons[key] = function (...args) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (!XEUtils.isFunction(key)) {
+          errLog('vxe.error.errFunc', [key])
+        }
+      }
       func(params, ...args)
     }
   })

package/packages/v-x-e-table/src/store.js

@@ -9,8 +9,10 @@ class Store {
     this.store = {}
   }
 
-  mixin (map) {
-    Object.assign(this.store, map)
+  mixin (options) {
+    XEUtils.each(options, (item, key) => {
+      this.add(key, item)
+    })
     return Store
   }
 

package/packages/v-x-e-table/src/validators.js

@@ -0,0 +1,7 @@
+import VXEStore from './store'
+
+export const validators = new VXEStore()
+
+if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+  Object.assign(validators, { _name: 'Validators' })
+}

package/packages/validator/src/mixin.js

@@ -1,6 +1,8 @@
 import XEUtils from 'xe-utils'
+import VXETable from '../../v-x-e-table'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { eqEmptyValue, getFuncText } from '../../tools/utils'
+import { warnLog, errLog } from '../../tools/log'
 import DomTools from '../../tools/dom'
 
 /**
@@ -63,12 +65,22 @@ export default {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate (rows, cb) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (XEUtils.isFunction(cb)) {
+          warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)'])
+        }
+      }
       return this.beginValidate(rows, cb, true)
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate (rows, cb) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (XEUtils.isFunction(cb)) {
+          warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)'])
+        }
+      }
       return this.beginValidate(rows, cb)
     },
     /**
@@ -248,10 +260,10 @@ export default {
         if (rules) {
           const cellValue = XEUtils.isUndefined(val) ? XEUtils.get(row, property) : val
           rules.forEach(rule => {
-            const { type, trigger, required } = rule
+            const { type, trigger, required, validator } = rule
             if (validType === 'all' || !trigger || validType === trigger) {
-              if (XEUtils.isFunction(rule.validator)) {
-                const customValid = rule.validator({
+              if (validator) {
+                const validParams = {
                   cellValue,
                   rule,
                   rules,
@@ -261,7 +273,26 @@ export default {
                   columnIndex: this.getColumnIndex(column),
                   field: column.property,
                   $table: this
-                })
+                }
+                let customValid
+                if (XEUtils.isString(validator)) {
+                  const gvItem = VXETable.validators.get(validator)
+                  if (gvItem) {
+                    if (gvItem.cellValidatorMethod) {
+                      customValid = gvItem.cellValidatorMethod(validParams)
+                    } else {
+                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        warnLog('vxe.error.notValidators', [validator])
+                      }
+                    }
+                  } else {
+                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                      errLog('vxe.error.notValidators', [validator])
+                    }
+                  }
+                } else {
+                  customValid = validator(validParams)
+                }
                 if (customValid) {
                   if (XEUtils.isError(customValid)) {
                     this.validRuleErr = true

package/styles/all.scss

@@ -0,0 +1,30 @@
+@import './variable.scss';
+// @import './css-variable.scss';
+@import './icon.scss';
+@import './filter.scss';
+@import './menu.scss';
+@import './export.scss';
+
+@import './table.scss';
+@import './grid.scss';
+@import './toolbar.scss';
+@import './pager.scss';
+@import './checkbox.scss';
+@import './checkbox-group.scss';
+@import './radio.scss';
+@import './radio-group.scss';
+@import './radio-button.scss';
+@import './input.scss';
+@import './textarea.scss';
+@import './button.scss';
+@import './modal.scss';
+@import './tooltip.scss';
+@import './form.scss';
+@import './form-item.scss';
+@import './form-gather.scss';
+@import './select.scss';
+@import './optgroup.scss';
+@import './option.scss';
+@import './switch.scss';
+@import './list.scss';
+@import './pulldown.scss';