vxe-table 3.5.9-beta.8 → 3.6.0-beta.0

package/packages/form/src/form-item.js

@@ -2,8 +2,9 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import { isEnableConf, getFuncText } from '../../tools/utils'
-import { createItem, destroyItem, assemItem } from './util'
+import { createItem, destroyItem, assemItem, isActivetem } from './util'
 import { renderTitle } from './render'
+import { getSlotVNs } from '../../tools/vn'
 
 const props = {
   title: String,
@@ -41,15 +42,14 @@ Object.keys(props).forEach(name => {
 })
 
 const renderItem = (h, _vm, item, slots) => {
-  const { rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
-  const { title, folding, visible, visibleMethod, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
+  const { _e, rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
+  const { title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
   const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
   const itemClassName = compConf ? compConf.itemClassName : ''
   const span = item.span || _vm.span
   const align = item.align || _vm.align
   const titleAlign = item.titleAlign || _vm.titleAlign
   const titleWidth = item.titleWidth || _vm.titleWidth
-  let itemVisibleMethod = visibleMethod
   const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
   const showEllipsis = itemOverflow === 'ellipsis'
   const showTitle = itemOverflow === 'title'
@@ -57,8 +57,8 @@ const renderItem = (h, _vm, item, slots) => {
   const hasEllipsis = showTitle || showTooltip || showEllipsis
   const params = { data, field, property: field, item, $form: _vm }
   let isRequired
-  if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-    itemVisibleMethod = compConf.itemVisibleMethod
+  if (visible === false) {
+    return _e()
   }
   if (rules) {
     const itemRules = rules[field]
@@ -70,9 +70,9 @@ const renderItem = (h, _vm, item, slots) => {
   if (slots && slots.default) {
     contentVNs = _vm.callSlot(slots.default, params, h)
   } else if (compConf && compConf.renderItemContent) {
-    contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params)
+    contentVNs = getSlotVNs(compConf.renderItemContent.call(_vm, h, itemRender, params))
   } else if (compConf && compConf.renderItem) {
-    contentVNs = compConf.renderItem.call(_vm, h, itemRender, params)
+    contentVNs = getSlotVNs(compConf.renderItem.call(_vm, h, itemRender, params))
   } else if (field) {
     contentVNs = [`${XEUtils.get(data, field)}`]
   }
@@ -88,12 +88,12 @@ const renderItem = (h, _vm, item, slots) => {
       item.id,
       span ? `vxe-col--${span} is--span` : '',
       className ? (XEUtils.isFunction(className) ? className(params) : className) : '',
-      itemClassName ? (XEUtils.isFunction(itemClassName) ? itemClassName(params) : className) : '',
+      itemClassName ? (XEUtils.isFunction(itemClassName) ? itemClassName(params) : itemClassName) : '',
       {
         'is--title': title,
         'is--required': isRequired,
-        'is--hidden': visible === false || (folding && collapseAll),
-        'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+        'is--hidden': folding && collapseAll,
+        'is--active': isActivetem(_vm, item),
         'is--error': showError
       }
     ]
@@ -156,9 +156,7 @@ export default {
   provide () {
     return {
       $xeformitem: this,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     }
   },
   data () {

package/packages/form/src/form.js

@@ -4,10 +4,11 @@ import vSize from '../../mixins/size'
 import VXETable from '../../v-x-e-table'
 import { isEnableConf, eqEmptyValue, getFuncText } from '../../tools/utils'
 import DomTools, { browse } from '../../tools/dom'
-import { createItem, handleFieldOrItem } from './util'
+import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util'
 import { errLog } from '../../tools/log'
 import VxeFormConfigItem from './form-config-item'
 import VxeLoading from '../../loading/index'
+import { getSlotVNs } from '../../tools/vn'
 
 class Rule {
   constructor (rule) {
@@ -79,6 +80,7 @@ export default {
     titleAsterisk: { type: Boolean, default: () => GlobalConfig.form.titleAsterisk },
     titleOverflow: { type: [Boolean, String], default: null },
     className: [String, Function],
+    readonly: Boolean,
     items: Array,
     rules: Object,
     preventSubmit: { type: Boolean, default: () => GlobalConfig.form.preventSubmit },
@@ -193,7 +195,7 @@ export default {
           slotFunc = $scopedSlots[slotFunc] || null
         }
         if (XEUtils.isFunction(slotFunc)) {
-          return slotFunc.call(this, params, h)
+          return getSlotVNs(slotFunc.call(this, params, h))
         }
       }
       return []
@@ -357,7 +359,7 @@ export default {
       if (data && formRules) {
         itemList.forEach(item => {
           const { field } = item
-          if (field) {
+          if (field && !isHiddenItem(this, item) && isActivetem(this, item)) {
             itemValids.push(
               this.validItemRules(type || 'all', field).then(() => {
                 item.errRule = null
@@ -506,7 +508,7 @@ export default {
     },
     triggerItemEvent (evnt, field, itemValue) {
       if (field) {
-        return this.validItemRules(evnt ? evnt.type : 'all', field, itemValue)
+        return this.validItemRules(evnt ? (['blur'].includes(evnt.type) ? 'blur' : 'change') : 'all', field, itemValue)
           .then(() => {
             this.clearValidate(field)
           })

package/packages/form/src/util.js

@@ -1,6 +1,7 @@
 import XEUtils from 'xe-utils'
 import VXETable from '../../v-x-e-table'
 import { warnLog } from '../../tools/log'
+import { isEnableConf } from '../../tools/utils'
 
 class ItemConfig {
   constructor ($xeform, item) {
@@ -58,6 +59,28 @@ export const handleFieldOrItem = ($xeform, fieldOrItem) => {
   return null
 }
 
+export function isHiddenItem ($xeform, formItem) {
+  const { collapseAll } = $xeform
+  const { folding, visible } = formItem
+  return visible === false || (folding && collapseAll)
+}
+
+export function isActivetem ($xeform, formItem) {
+  let { visibleMethod, itemRender, visible, field } = formItem
+  if (visible === false) {
+    return visible
+  }
+  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
+  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
+    visibleMethod = compConf.itemVisibleMethod
+  }
+  if (!visibleMethod) {
+    return true
+  }
+  const { data } = $xeform
+  return visibleMethod({ data, field, property: field, item: formItem, $form: $xeform })
+}
+
 export function createItem ($xeform, _vm) {
   return getItemConfig($xeform, _vm)
 }

package/packages/grid/src/grid.js

@@ -7,6 +7,7 @@ import UtilTools, { isEnableConf } from '../../tools/utils'
 import DomTools, { getOffsetHeight, getPaddingTopBottomSize } from '../../tools/dom'
 import { GlobalEvent } from '../../tools/event'
 import { warnLog, errLog } from '../../tools/log'
+import { getSlotVNs } from '../../tools/vn'
 
 const methods = {}
 const propKeys = Object.keys(Table.props)
@@ -372,7 +373,7 @@ export default {
           slotFunc = $scopedSlots[slotFunc] || null
         }
         if (XEUtils.isFunction(slotFunc)) {
-          return slotFunc.call(this, params, h, vNodes)
+          return getSlotVNs(slotFunc.call(this, params, h, vNodes))
         }
       }
       return []

package/packages/header/src/header.js

@@ -272,7 +272,8 @@ export default {
       document.onmouseup = function (evnt) {
         document.onmousemove = domMousemove
         document.onmouseup = domMouseup
-        column.resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)
+        const resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)
+        column.resizeWidth = resizeWidth
         resizeBarElem.style.display = 'none'
         $xetable._isResize = false
         $xetable._lastResizeTime = Date.now()
@@ -280,7 +281,7 @@ export default {
         $xetable.recalculate(true).then(() => {
           $xetable.saveCustomResizable()
           $xetable.updateCellAreas()
-          $xetable.emitEvent('resizable-change', params, evnt)
+          $xetable.emitEvent('resizable-change', { ...params, resizeWidth }, evnt)
         })
         DomTools.removeClass($xetable.$el, 'drag--resize')
       }

package/packages/modal/src/modal.js

@@ -5,6 +5,7 @@ import UtilTools, { getFuncText } from '../../tools/utils'
 import DomTools from '../../tools/dom'
 import { GlobalEvent } from '../../tools/event'
 import { errLog } from '../../tools/log'
+import { getSlotVNs } from '../../tools/vn'
 import VxeLoading from '../../loading/index'
 
 export const allActivedModals = []
@@ -168,8 +169,8 @@ export default {
             'is--ellipsis': !isMsg && showTitleOverflow
           }],
           on: headerOns
-        }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : headerSlot.call(this, { $modal: this }, h)) : [
-          titleSlot ? titleSlot.call(this, { $modal: this }, h) : h('span', {
+        }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs(headerSlot.call(this, { $modal: this }, h))) : [
+          titleSlot ? getSlotVNs(titleSlot.call(this, { $modal: this }, h)) : h('span', {
             class: 'vxe-modal--title'
           }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
           showZoom ? h('i', {
@@ -203,7 +204,7 @@ export default {
           ]) : null,
           h('div', {
             class: 'vxe-modal--content'
-          }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : defaultSlot.call(this, { $modal: this }, h)) : getFuncText(content)),
+          }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs(defaultSlot.call(this, { $modal: this }, h))) : getFuncText(content)),
           /**
            * 加载中
            */
@@ -216,7 +217,7 @@ export default {
         ]),
         showFooter ? h('div', {
           class: 'vxe-modal--footer'
-        }, footerSlot ? (!inited || (destroyOnClose && !visible) ? [] : footerSlot.call(this, { $modal: this }, h)) : [
+        }, footerSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs(footerSlot.call(this, { $modal: this }, h))) : [
           type === 'confirm' ? h('vxe-button', {
             ref: 'cancelBtn',
             on: {

package/packages/select/src/select.js

@@ -5,6 +5,7 @@ import vSize from '../../mixins/size'
 import UtilTools, { getFuncText } from '../../tools/utils'
 import DomTools from '../../tools/dom'
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event'
+import { getSlotVNs } from '../../tools/vn'
 
 function isOptionVisible (option) {
   return option.visible !== false
@@ -474,7 +475,7 @@ export default {
           slotFunc = $scopedSlots[slotFunc] || null
         }
         if (XEUtils.isFunction(slotFunc)) {
-          return slotFunc.call(this, params, h)
+          return getSlotVNs(slotFunc.call(this, params, h))
         }
       }
       return []

package/packages/table/src/cell.js

@@ -4,6 +4,7 @@ import VXETable from '../../v-x-e-table'
 import DomTools from '../../tools/dom'
 import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/utils'
 import { getColumnConfig } from './util'
+import { getSlotVNs } from '../../tools/vn'
 
 function renderHelpIcon (h, params) {
   const { $table, column } = params
@@ -78,7 +79,7 @@ function getFooterContent (h, params) {
   if (renderOpts) {
     const compConf = VXETable.renderer.get(renderOpts.name)
     if (compConf && compConf.renderFooter) {
-      return compConf.renderFooter.call($table, h, renderOpts, params)
+      return getSlotVNs(compConf.renderFooter.call($table, h, renderOpts, params))
     }
   }
   return [UtilTools.formatText(items[_columnIndex], 1)]
@@ -152,7 +153,7 @@ export const Cell = {
     if (renderOpts) {
       const compConf = VXETable.renderer.get(renderOpts.name)
       if (compConf && compConf.renderHeader) {
-        return renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params))
+        return getSlotVNs(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)))
       }
     }
     return renderTitleContent(h, params, UtilTools.formatText(column.getTitle(), 1))
@@ -171,7 +172,7 @@ export const Cell = {
       const funName = editRender ? 'renderCell' : 'renderDefault'
       const compConf = VXETable.renderer.get(renderOpts.name)
       if (compConf && compConf[funName]) {
-        return compConf[funName].call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))
+        return getSlotVNs(compConf[funName].call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)))
       }
     }
     const cellValue = $table.getCellLabel(row, column)
@@ -216,9 +217,9 @@ export const Cell = {
       return $table.callSlot(slots.icon, params, h, cellVNodes)
     }
     if (!isHidden) {
-      isAceived = treeExpandeds.indexOf(row) > -1
+      isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1
       if (lazy) {
-        isLazyLoaded = treeLazyLoadeds.indexOf(row) > -1
+        isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1
         hasLazyChilds = row[hasChild]
       }
     }
@@ -410,7 +411,7 @@ export const Cell = {
   },
   renderCheckboxCell (h, params) {
     const { $table, row, column, isHidden } = params
-    const { treeConfig, treeIndeterminates } = $table
+    const { treeConfig, treeIndeterminates, selection } = $table
     const { labelField, checkMethod, visibleMethod } = $table.checkboxOpts
     const { slots } = column
     const defaultSlot = slots ? slots.default : null
@@ -421,7 +422,7 @@ export const Cell = {
     let isDisabled = !!checkMethod
     let on
     if (!isHidden) {
-      isChecked = $table.selection.indexOf(row) > -1
+      isChecked = $table.findRowIndexOf(selection, row) > -1
       on = {
         click (evnt) {
           if (!isDisabled && isVisible) {
@@ -433,7 +434,7 @@ export const Cell = {
         isDisabled = !checkMethod({ row })
       }
       if (treeConfig) {
-        indeterminate = treeIndeterminates.indexOf(row) > -1
+        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
       }
     }
     const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
@@ -500,7 +501,7 @@ export const Cell = {
         isDisabled = !checkMethod({ row })
       }
       if (treeConfig) {
-        indeterminate = treeIndeterminates.indexOf(row) > -1
+        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
       }
     }
     const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
@@ -558,9 +559,9 @@ export const Cell = {
       return $table.callSlot(slots.icon, params, h)
     }
     if (!isHidden) {
-      isAceived = rowExpandeds.indexOf(params.row) > -1
+      isAceived = $table.findRowIndexOf(rowExpandeds, params.row) > -1
       if (lazy) {
-        isLazyLoaded = expandLazyLoadeds.indexOf(row) > -1
+        isLazyLoaded = $table.findRowIndexOf(expandLazyLoadeds, row) > -1
       }
     }
     return [
@@ -592,7 +593,7 @@ export const Cell = {
     if (contentRender) {
       const compConf = VXETable.renderer.get(contentRender.name)
       if (compConf && compConf.renderExpand) {
-        return compConf.renderExpand.call($table, h, contentRender, params)
+        return getSlotVNs(compConf.renderExpand.call($table, h, contentRender, params))
       }
     }
     return []
@@ -756,7 +757,10 @@ export const Cell = {
       if (slots && slots.edit) {
         return $table.callSlot(slots.edit, params, h)
       }
-      return compConf && compConf.renderEdit ? compConf.renderEdit.call($table, h, editRender, Object.assign({ $type: 'edit' }, params)) : []
+      if (compConf && compConf.renderEdit) {
+        return getSlotVNs(compConf.renderEdit.call($table, h, editRender, Object.assign({ $type: 'edit' }, params)))
+      }
+      return []
     }
     if (slots && slots.default) {
       return $table.callSlot(slots.default, params, h)