vxe-table 3.5.9-beta.10 → 3.5.9-beta.13

package/lib/tools/log.js

@@ -12,7 +12,7 @@ var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.10", "] ", _conf.default.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.13", "] ", _conf.default.i18n(message, params));
 }
 
 function outLog(type) {

package/lib/tools/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.9-beta.10","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.9-beta.13","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;

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

@@ -221,7 +221,7 @@ var v = 'v3';
 exports.v = v;
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.10",
+  version: "3.5.9-beta.13",
   reg: reg,
   use: use,
   setup: _setup.setup,

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.9-beta.10",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.9-beta.13",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.5.9-beta.10",
+  "version": "3.5.9-beta.13",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/button/src/button.js

@@ -140,6 +140,12 @@ export default {
             class: ['vxe-button--loading-icon', GlobalConfig.icon.BUTTON_LOADING]
           })
         )
+      } else if ($scopedSlots.icon) {
+        contents.push(
+          h('span', {
+            class: 'vxe-button--custom-icon'
+          }, $scopedSlots.icon.call(this, {}))
+        )
       } else if (icon) {
         contents.push(
           h('i', {
@@ -151,7 +157,7 @@ export default {
         contents.push(
           h('span', {
             class: 'vxe-button--content'
-          }, $scopedSlots.default.call(this))
+          }, $scopedSlots.default.call(this, {}))
         )
       } else if (content) {
         contents.push(

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

@@ -3,6 +3,7 @@ import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import { isEnableConf, getFuncText } from '../../tools/utils'
 import { renderTitle } from './render'
+import { isActivetem } from './util'
 
 /**
  * 配置式项
@@ -20,15 +21,13 @@ const VxeFormConfigItem = {
   provide () {
     return {
       $xeformgather: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     }
   },
   render (h) {
     const { _e, $xeform, itemConfig: item } = this
     const { rules, data, collapseAll, validOpts, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow } = $xeform
-    const { slots, title, folding, visible, visibleMethod, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, children } = item
+    const { slots, title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, children } = item
     const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
     const itemClassName = compConf ? compConf.itemClassName : ''
     const span = item.span || $xeform.span
@@ -37,7 +36,6 @@ const VxeFormConfigItem = {
     const titleWidth = XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth
     const titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon
     const titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk
-    let itemVisibleMethod = visibleMethod
     const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
     const showEllipsis = itemOverflow === 'ellipsis'
     const showTitle = itemOverflow === 'title'
@@ -63,9 +61,6 @@ const VxeFormConfigItem = {
         class: ['vxe-form--gather vxe-row', item.id, span ? `vxe-col--${span} is--span` : '', className ? (XEUtils.isFunction(className) ? className(params) : className) : '']
       }, childVNs) : _e()
     }
-    if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-      itemVisibleMethod = compConf.itemVisibleMethod
-    }
     if (rules) {
       const itemRules = rules[field]
       if (itemRules) {
@@ -94,14 +89,14 @@ const VxeFormConfigItem = {
         item.id,
         span ? `vxe-col--${span} is--span` : null,
         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--colon': titleColon,
           'is--asterisk': titleAsterisk,
           'is--required': isRequired,
           'is--hidden': folding && collapseAll,
-          'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+          'is--active': isActivetem(this, item),
           'is--error': showError
         }
       ],

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

@@ -8,9 +8,7 @@ export default {
     return {
       $xeformgather: this,
       xeformitem: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     }
   },
   created () {

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

@@ -2,7 +2,7 @@ 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'
 
 const props = {
@@ -41,15 +41,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 +56,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]
@@ -92,8 +91,8 @@ const renderItem = (h, _vm, item, slots) => {
       {
         '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 +155,7 @@ export default {
   provide () {
     return {
       $xeformitem: this,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     }
   },
   data () {

package/packages/form/src/form.js

@@ -4,7 +4,7 @@ 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'
@@ -357,7 +357,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 +506,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/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')
       }