vxe-table 3.4.14-beta.2 → 3.5.0-beta.0

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _tools = require("../../tools");
-
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
+var _log = require("../../tools/log");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -44,7 +44,7 @@ var Store = /*#__PURE__*/function () {
       // 检测是否覆盖
       if (process.env.NODE_ENV === 'development') {
         if (!_xeUtils.default.eqNull(this.store[name]) && this.store[name] !== render) {
-          _tools.UtilTools.warn('vxe.error.coverProp', [this._name, name]);
+          (0, _log.warnLog)('vxe.error.coverProp', [this._name, name]);
         }
       }
 

package/lib/v-x-e-table/src/store.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _tools=require("../../tools"),_xeUtils=_interopRequireDefault(require("xe-utils"));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 Store=function(){function r(){_classCallCheck(this,r),this.store={}}return _createClass(r,[{key:"mixin",value:function(e){return Object.assign(this.store,e),r}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(e,t){return"development"===process.env.NODE_ENV&&(_xeUtils.default.eqNull(this.store[e])||this.store[e]===t||_tools.UtilTools.warn("vxe.error.coverProp",[this._name,e])),this.store[e]=t,r}},{key:"delete",value:function(e){return delete this.store[e],r}}]),r}(),_default=Store;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-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 n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var Store=function(){function r(){_classCallCheck(this,r),this.store={}}return _createClass(r,[{key:"mixin",value:function(e){return Object.assign(this.store,e),r}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(e,t){return"development"===process.env.NODE_ENV&&(_xeUtils.default.eqNull(this.store[e])||this.store[e]===t||(0,_log.warnLog)("vxe.error.coverProp",[this._name,e])),this.store[e]=t,r}},{key:"delete",value:function(e){return delete this.store[e],r}}]),r}(),_default=Store;exports.default=_default;

package/lib/validator/src/mixin.js

@@ -9,9 +9,9 @@ var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
 var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 
-var _tools = require("../../tools");
+var _utils = require("../../tools/utils");
 
-var _utils = require("../../tools/src/utils");
+var _dom = _interopRequireDefault(require("../../tools/dom"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -49,7 +49,7 @@ var Rule = /*#__PURE__*/function () {
   _createClass(Rule, [{
     key: "content",
     get: function get() {
-      return _tools.UtilTools.getFuncText(this.$options.content || this.$options.message);
+      return (0, _utils.getFuncText)(this.$options.content || this.$options.message);
     }
   }, {
     key: "message",
@@ -247,7 +247,7 @@ var _default = {
             var posAndFinish = function posAndFinish() {
               firstErrParams.cell = _this2.getCell(firstErrParams.row, firstErrParams.column);
 
-              _tools.DomTools.scrollToView(firstErrParams.cell);
+              _dom.default.scrollToView(firstErrParams.cell);
 
               _this2.handleValidError(firstErrParams).then(finish);
             };

package/lib/validator/src/mixin.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_tools=require("../../tools"),_utils=require("../../tools/src/utils");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 l=t[r];l.enumerable=l.enumerable||!1,l.configurable=!0,"value"in l&&(l.writable=!0),Object.defineProperty(e,l.key,l)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return _tools.UtilTools.getFuncText(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var r=e.type,l=e.min,i=e.max,n=e.pattern,e="number"===r,r=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(l)&&r<_xeUtils.default.toNumber(l)||(!_xeUtils.default.eqNull(i)&&r>_xeUtils.default.toNumber(i)||!(!n||(_xeUtils.default.isRegExp(n)?n:new RegExp(n)).test(t))))}var _default={methods:{_fullValidate:function(e,t){return this.beginValidate(e,t,!0)},_validate:function(e,t){return this.beginValidate(e,t)},handleValidError:function(t){var r=this;return new Promise(function(e){!1===r.validOpts.autoPos?(r.emitEvent("valid-error",t),e()):r.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(r.showValidTooltip(t))},10)})})},beginValidate:function(e,u,l){var a=this,s={},i=this.editRules,c=this.afterFullData,d=this.treeConfig,t=this.treeOpts;!0===e?r=c:e&&(_xeUtils.default.isFunction(e)?u=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||this.getInsertRecords().concat(this.getUpdateRecords()),n=[];if(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),i){var o=this.getColumns(),e=function(r){var e;!l&&a.validRuleErr||(e=[],o.forEach(function(t){!l&&a.validRuleErr||!_xeUtils.default.has(i,t.property)||e.push(a.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:a.getRowIndex(r),row:r,columnIndex:a.getColumnIndex(t),column:t,field:t.property,$table:a};if(s[t.property]||(s[t.property]=[]),s[t.property].push(e),!l)return a.validRuleErr=!0,Promise.reject(e)}))}),n.push(Promise.all(e)))};return d?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(n).then(function(){var e=Object.keys(s);return a.$nextTick().then(function(){return e.length?Promise.reject(s[e[0]][0]):void(u&&u())})}).catch(function(o){return new Promise(function(e,t){function r(){a.$nextTick(function(){u?(u(s),e()):("obsolete"===_conf.default.validToReject?t:e)(s)})}function l(){o.cell=a.getCell(o.row,o.column),_tools.DomTools.scrollToView(o.cell),a.handleValidError(o).then(r)}var i=o.row,n=c.indexOf(i),i=0<n?c[n-1]:i;!1===a.validOpts.autoPos?r():(d?a.scrollToTreeRow(i):a.scrollToRow(i)).then(l)})})}return this.$nextTick().then(function(){u&&u()})},hasCellRules:function(t,e,r){var l=this.editRules,r=r.property;if(r&&l){r=_xeUtils.default.get(l,r);return r&&_xeUtils.default.find(r,function(e){return"all"===t||!e.trigger||t===e.trigger})}return!1},validCellRules:function(n,o,u,e){var a,s,c=this,t=this.editRules,r=u.property,d=[],f=[];return r&&t&&((a=_xeUtils.default.get(t,r))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(o,r):e,a.forEach(function(t){var e,r=t.type,l=t.trigger,i=t.required;"all"!==n&&l&&n!==l||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:s,rule:t,rules:a,row:o,rowIndex:c.getRowIndex(o),column:u,columnIndex:c.getColumnIndex(u),field:u.property,$table:c}))&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(function(e){c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:l,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))}))):(r="array"===r?!_xeUtils.default.isArray(s)||!s.length:(0,_utils.eqEmptyValue)(s),(i?r||validErrorRuleValue(t,s):!r&&validErrorRuleValue(t,s))&&(c.validRuleErr=!0,d.push(new Rule(t)))))}))),Promise.all(f).then(function(){if(d.length){var e={rules:d,rule:d[0]};return Promise.reject(e)}})},_clearValidate:function(){var e=this.$refs.validTip;return Object.assign(this.validStore,{visible:!1,row:null,column:null,content:"",rule:null}),e&&e.visible&&e.close(),this.$nextTick()},triggerValidate:function(t){var r=this,e=this.editConfig,l=this.editStore,i=this.editRules,n=this.validStore,l=l.actived;if(l.row&&i){var l=l.args,o=l.row,u=l.column,a=l.cell;if(this.hasCellRules(t,o,u))return this.validCellRules(t,o,u).then(function(){"row"===e.mode&&n.visible&&n.row===o&&n.column===u&&r.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:o,column:u,cell:a};return r.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,l=this.height,i=this.tableData,n=this.validOpts,o=e.rule,u=e.row,a=e.column,s=e.cell,c=r.validTip,d=o.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:u,column:a,rule:o,content:d,visible:!0}),t.emitEvent("valid-error",e),c&&("tooltip"===n.message||"default"===n.message&&!l&&i.length<2))return c.open(s,d)})}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_utils=require("../../tools/utils"),_dom=_interopRequireDefault(require("../../tools/dom"));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 i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var r=e.type,i=e.min,l=e.max,n=e.pattern,e="number"===r,r=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(i)&&r<_xeUtils.default.toNumber(i)||(!_xeUtils.default.eqNull(l)&&r>_xeUtils.default.toNumber(l)||!(!n||(_xeUtils.default.isRegExp(n)?n:new RegExp(n)).test(t))))}var _default={methods:{_fullValidate:function(e,t){return this.beginValidate(e,t,!0)},_validate:function(e,t){return this.beginValidate(e,t)},handleValidError:function(t){var r=this;return new Promise(function(e){!1===r.validOpts.autoPos?(r.emitEvent("valid-error",t),e()):r.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(r.showValidTooltip(t))},10)})})},beginValidate:function(e,o,i){var a=this,s={},l=this.editRules,c=this.afterFullData,d=this.treeConfig,t=this.treeOpts;!0===e?r=c:e&&(_xeUtils.default.isFunction(e)?o=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||this.getInsertRecords().concat(this.getUpdateRecords()),n=[];if(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),l){var u=this.getColumns(),e=function(r){var e;!i&&a.validRuleErr||(e=[],u.forEach(function(t){!i&&a.validRuleErr||!_xeUtils.default.has(l,t.property)||e.push(a.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:a.getRowIndex(r),row:r,columnIndex:a.getColumnIndex(t),column:t,field:t.property,$table:a};if(s[t.property]||(s[t.property]=[]),s[t.property].push(e),!i)return a.validRuleErr=!0,Promise.reject(e)}))}),n.push(Promise.all(e)))};return d?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(n).then(function(){var e=Object.keys(s);return a.$nextTick().then(function(){return e.length?Promise.reject(s[e[0]][0]):void(o&&o())})}).catch(function(u){return new Promise(function(e,t){function r(){a.$nextTick(function(){o?(o(s),e()):("obsolete"===_conf.default.validToReject?t:e)(s)})}function i(){u.cell=a.getCell(u.row,u.column),_dom.default.scrollToView(u.cell),a.handleValidError(u).then(r)}var l=u.row,n=c.indexOf(l),l=0<n?c[n-1]:l;!1===a.validOpts.autoPos?r():(d?a.scrollToTreeRow(l):a.scrollToRow(l)).then(i)})})}return this.$nextTick().then(function(){o&&o()})},hasCellRules:function(t,e,r){var i=this.editRules,r=r.property;if(r&&i){r=_xeUtils.default.get(i,r);return r&&_xeUtils.default.find(r,function(e){return"all"===t||!e.trigger||t===e.trigger})}return!1},validCellRules:function(n,u,o,e){var a,s,c=this,t=this.editRules,r=o.property,d=[],f=[];return r&&t&&((a=_xeUtils.default.get(t,r))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(u,r):e,a.forEach(function(t){var e,r=t.type,i=t.trigger,l=t.required;"all"!==n&&i&&n!==i||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:s,rule:t,rules:a,row:u,rowIndex:c.getRowIndex(u),column:o,columnIndex:c.getColumnIndex(o),field:o.property,$table:c}))&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:i,content:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(function(e){c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:i,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))}))):(r="array"===r?!_xeUtils.default.isArray(s)||!s.length:(0,_utils.eqEmptyValue)(s),(l?r||validErrorRuleValue(t,s):!r&&validErrorRuleValue(t,s))&&(c.validRuleErr=!0,d.push(new Rule(t)))))}))),Promise.all(f).then(function(){if(d.length){var e={rules:d,rule:d[0]};return Promise.reject(e)}})},_clearValidate:function(){var e=this.$refs.validTip;return Object.assign(this.validStore,{visible:!1,row:null,column:null,content:"",rule:null}),e&&e.visible&&e.close(),this.$nextTick()},triggerValidate:function(t){var r=this,e=this.editConfig,i=this.editStore,l=this.editRules,n=this.validStore,i=i.actived;if(i.row&&l){var i=i.args,u=i.row,o=i.column,a=i.cell;if(this.hasCellRules(t,u,o))return this.validCellRules(t,u,o).then(function(){"row"===e.mode&&n.visible&&n.row===u&&n.column===o&&r.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:u,column:o,cell:a};return r.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,i=this.height,l=this.tableData,n=this.validOpts,u=e.rule,o=e.row,a=e.column,s=e.cell,c=r.validTip,d=u.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:o,column:a,rule:u,content:d,visible:!0}),t.emitEvent("valid-error",e),c&&("tooltip"===n.message||"default"===n.message&&!i&&l.length<2))return c.open(s,d)})}}};exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.4.14-beta.2",
+  "version": "3.5.0-beta.0",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -66,11 +66,11 @@
     "vuex": "^3.4.0",
     "xe-ajax": "^4.0.5",
     "xe-clipboard": "^1.10.1",
-    "xe-utils": "^3.5.2"
+    "xe-utils": "^3.5.4"
   },
   "peerDependencies": {
     "vue": "^2.6.0",
-    "xe-utils": "^3.5.2"
+    "xe-utils": "^3.5.0"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/button/src/button.js

@@ -1,7 +1,9 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
 
 export default {
   name: 'VxeButton',
@@ -155,7 +157,7 @@ export default {
         contents.push(
           h('span', {
             class: 'vxe-button--content'
-          }, [UtilTools.getFuncText(content)])
+          }, [getFuncText(content)])
         )
       }
       return contents

package/packages/checkbox/src/checkbox.js

@@ -1,4 +1,4 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
@@ -62,7 +62,7 @@ export default {
       }),
       h('span', {
         class: 'vxe-checkbox--label'
-      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [UtilTools.getFuncText(content)])
+      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])
     ])
   },
   methods: {

package/packages/edit/src/mixin.js

@@ -1,7 +1,8 @@
 import XEUtils from 'xe-utils'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, DomTools, isEnableConf } from '../../tools'
-import { browse } from '../../tools/src/dom'
+import UtilTools, { isEnableConf } from '../../tools/utils'
+import DomTools, { browse } from '../../tools/dom'
+import { warnLog, errLog } from '../../tools/log'
 
 const { getRowid } = UtilTools
 
@@ -28,7 +29,7 @@ function insertTreeRow (_vm, newRecords, isAppend) {
     } else {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (parentRowId) {
-          UtilTools.warn('vxe.error.unableInsert')
+          warnLog('vxe.error.unableInsert')
         }
       }
       afterFullData[funcName](item)
@@ -110,7 +111,7 @@ export default {
                 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                   if (item[treeOpts.parentField]) {
                     if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                      UtilTools.error('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
+                      errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
                     }
                   }
                 }
@@ -124,7 +125,7 @@ export default {
               })
             } else {
               if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-                UtilTools.warn('vxe.error.unableInsert')
+                warnLog('vxe.error.unableInsert')
               }
               insertTreeRow(this, newRecords, true)
             }
@@ -142,7 +143,7 @@ export default {
               afIndex = afterFullData.indexOf(row)
             }
             if (afIndex === -1) {
-              throw new Error(UtilTools.error('vxe.error.unableInsert'))
+              throw new Error(errLog('vxe.error.unableInsert'))
             }
             afterFullData.splice(afIndex, 0, ...newRecords)
             tableFullData.splice(tableFullData.indexOf(row), 0, ...newRecords)

package/packages/export/src/export-panel.js

@@ -5,7 +5,7 @@ import VxeInput from '../../input/src/input'
 import VxeCheckbox from '../../checkbox/src/checkbox'
 import VxeSelect from '../../select/src/select'
 import VxeOption from '../../select/src/option'
-import { UtilTools } from '../../tools'
+import UtilTools from '../../tools/utils'
 
 export default {
   name: 'VxeExportPanel',

package/packages/export/src/import-panel.js

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VxeModal from '../../modal/src/modal'
 import VxeRadio from '../../radio/src/radio'
-import { UtilTools } from '../../tools'
+import UtilTools from '../../tools/utils'
 
 export default {
   name: 'VxeImportPanel',

package/packages/export/src/mixin.js

@@ -1,9 +1,10 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
-import { UtilTools } from '../../tools'
-import { mergeBodyMethod } from '../../table/src/util'
-import { browse } from '../../tools/src/dom'
+import UtilTools from '../../tools/utils'
+import { mergeBodyMethod, isColumnInfo } from '../../table/src/util'
+import { browse } from '../../tools/dom'
+import { warnLog, errLog } from '../../tools/log'
 
 const { formatText } = UtilTools
 
@@ -589,7 +590,7 @@ function downloadFile ($xetable, opts, content) {
       // 检测弹窗模块
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (!VXETable.modal) {
-          UtilTools.error('vxe.error.reqModule', ['Modal'])
+          errLog('vxe.error.reqModule', ['Modal'])
         }
       }
       VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.expSuccess'), status: 'success' })
@@ -816,7 +817,7 @@ function handleImport ($xetable, content, opts) {
           // 检测弹窗模块
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!VXETable.modal) {
-              UtilTools.error('vxe.error.reqModule', ['Modal'])
+              errLog('vxe.error.reqModule', ['Modal'])
             }
           }
           VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.impSuccess', [rows.length]), status: 'success' })
@@ -831,7 +832,7 @@ function handleImport ($xetable, content, opts) {
     // 检测弹窗模块
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (!VXETable.modal) {
-        UtilTools.error('vxe.error.reqModule', ['Modal'])
+        errLog('vxe.error.reqModule', ['Modal'])
       }
     }
     VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.impFields'), status: 'error' })
@@ -851,7 +852,7 @@ function handleFileImport ($xetable, file, opts) {
       // 检测弹窗模块
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (!VXETable.modal) {
-          UtilTools.error('vxe.error.reqModule', ['Modal'])
+          errLog('vxe.error.reqModule', ['Modal'])
         }
       }
       VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [type]), status: 'error' })
@@ -889,7 +890,7 @@ function handleFileImport ($xetable, file, opts) {
         $xetable.preventEvent(null, 'event.import', { file, options, columns: $xetable.tableFullColumn }, () => {
           const reader = new FileReader()
           reader.onerror = () => {
-            UtilTools.error('vxe.error.notType', [type])
+            errLog('vxe.error.notType', [type])
             _importReject({ status: false })
           }
           reader.onload = (e) => {
@@ -901,7 +902,7 @@ function handleFileImport ($xetable, file, opts) {
     } else {
       // 不支持的浏览器
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        UtilTools.error('vxe.error.notExp')
+        errLog('vxe.error.notExp')
       }
       _importResolve({ status: true })
     }
@@ -959,7 +960,7 @@ export function readLocalFile (options = {}) {
           // 检测弹窗模块
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!VXETable.modal) {
-              UtilTools.error('vxe.error.reqModule', ['Modal'])
+              errLog('vxe.error.reqModule', ['Modal'])
             }
           }
           VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [errType]), status: 'error' })
@@ -1053,7 +1054,7 @@ function handleExportAndPrint ($xetable, options, isPrint) {
     const isColGroup = column.children && column.children.length
     if (isColGroup || defaultFilterExportColumn(column)) {
       column.checked = columns ? columns.some((item) => {
-        if (UtilTools.isColumn(item)) {
+        if (isColumnInfo(item)) {
           return column === item
         } else if (XEUtils.isString(item)) {
           return column.field === item
@@ -1209,7 +1210,7 @@ export default {
           XEUtils.mapTree(customCols, item => {
             let targetColumn
             if (item) {
-              if (UtilTools.isColumn(item)) {
+              if (isColumnInfo(item)) {
                 targetColumn = item
               } else if (XEUtils.isString(item)) {
                 targetColumn = this.getColumnByField(item)
@@ -1233,7 +1234,7 @@ export default {
             children: 'childNodes',
             mapChildren: '_children'
           }),
-          (column, index) => UtilTools.isColumn(column) && (!columnFilterMethod || columnFilterMethod({ column, $columnIndex: index })),
+          (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ column, $columnIndex: index })),
           {
             children: '_children',
             mapChildren: 'childNodes',
@@ -1264,7 +1265,7 @@ export default {
       // 检查类型，如果为自定义导出，则不需要校验类型
       if (!opts.exportMethod && !XEUtils.includes(VXETable.config.exportTypes, type)) {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-          UtilTools.error('vxe.error.notType', [type])
+          errLog('vxe.error.notType', [type])
         }
         const params = { status: false }
         return Promise.reject(params)
@@ -1288,7 +1289,7 @@ export default {
         } else if (mode === 'all') {
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!$xegrid) {
-              UtilTools.warn('vxe.error.errProp', ['all', 'mode=current,selected'])
+              warnLog('vxe.error.errProp', ['all', 'mode=current,selected'])
             }
           }
 
@@ -1298,7 +1299,7 @@ export default {
 
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
               if (!ajaxMethods) {
-                UtilTools.warn('vxe.error.notFunc', ['proxy-config.ajax.queryAll'])
+                warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll'])
               }
             }
 
@@ -1397,7 +1398,7 @@ export default {
         return
       }
       if (!this.importConfig) {
-        UtilTools.error('vxe.error.reqProp', ['import-config'])
+        errLog('vxe.error.reqProp', ['import-config'])
       }
       // 处理类型
       const typeList = types.map(value => {
@@ -1427,7 +1428,7 @@ export default {
       const { exportOpts } = this
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (!this.exportConfig) {
-          UtilTools.error('vxe.error.reqProp', ['export-config'])
+          errLog('vxe.error.reqProp', ['export-config'])
         }
       }
       return handleExportAndPrint(this, Object.assign({}, exportOpts, options))
@@ -1436,7 +1437,7 @@ export default {
       const { printOpts } = this
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (!this.printConfig) {
-          UtilTools.error('vxe.error.reqProp', ['print-config'])
+          errLog('vxe.error.reqProp', ['print-config'])
         }
       }
       return handleExportAndPrint(this, Object.assign({}, printOpts, options), true)

package/packages/filter/src/mixin.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools } from '../../tools'
-import { handleFieldOrColumn } from '../../table/src/util'
+import DomTools from '../../tools/dom'
+import { toFilters, handleFieldOrColumn } from '../../table/src/util'
 import VXETable from '../../v-x-e-table'
 
 export default {
@@ -32,7 +32,7 @@ export default {
     _setFilter (fieldOrColumn, options) {
       const column = handleFieldOrColumn(this, fieldOrColumn)
       if (column && column.filters && options) {
-        column.filters = UtilTools.getFilters(options)
+        column.filters = toFilters(options)
       }
       return this.$nextTick()
     },
@@ -159,7 +159,7 @@ export default {
      * @param {Event} evnt 事件
      */
     confirmFilterEvent (evnt) {
-      const { filterStore, filterOpts, scrollXLoad, scrollYLoad } = this
+      const { filterStore, filterOpts, scrollXLoad: oldScrollXLoad, scrollYLoad: oldScrollYLoad } = this
       const { column } = filterStore
       const { property } = column
       const values = []
@@ -175,22 +175,26 @@ export default {
       if (!filterOpts.remote) {
         this.handleTableData(true)
         this.checkSelectionStatus()
-        this.updateFooter()
-        if (scrollXLoad || scrollYLoad) {
-          if (scrollXLoad) {
+      }
+      this.emitEvent('filter-change', { column, property, values, datas, filters: filterList, filterList }, evnt)
+      this.closeFilter()
+      this.updateFooter().then(() => {
+        const { scrollXLoad, scrollYLoad } = this
+        if ((oldScrollXLoad || scrollXLoad) || (oldScrollYLoad || scrollYLoad)) {
+          if ((oldScrollXLoad || scrollXLoad)) {
             this.updateScrollXSpace()
           }
-          if (scrollYLoad) {
+          if ((oldScrollYLoad || scrollYLoad)) {
             this.updateScrollYSpace()
           }
-          this.refreshScroll()
+          return this.refreshScroll()
         }
-      }
-      this.emitEvent('filter-change', { column, property, values, datas, filters: filterList, filterList }, evnt)
-      this.closeFilter()
-      this.$nextTick(() => {
-        this.recalculate()
+      }).then(() => {
         this.updateCellAreas()
+        return this.recalculate(true)
+      }).then(() => {
+        // 存在滚动行为未结束情况
+        setTimeout(() => this.recalculate(), 50)
       })
     },
     handleClearFilter (column) {

package/packages/filter/src/panel.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
-import { UtilTools } from '../../tools'
+import UtilTools from '../../tools/utils'
 import XEUtils from 'xe-utils'
 
 export default {

package/packages/footer/src/footer.js

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools } from '../../tools'
+import UtilTools from '../../tools/utils'
+import DomTools from '../../tools/dom'
 
 const cellType = 'footer'
 
@@ -61,6 +62,7 @@ export default {
       align: allAlign,
       scrollXLoad,
       columnKey,
+      columnOpts,
       showFooterOverflow: allColumnFooterOverflow,
       currentColumn,
       overflowX,
@@ -227,7 +229,7 @@ export default {
               attrs,
               style: footerCellStyle ? (XEUtils.isFunction(footerCellStyle) ? footerCellStyle(params) : footerCellStyle) : null,
               on: tfOns,
-              key: columnKey ? column.id : $columnIndex
+              key: columnKey || columnOpts.useKey ? column.id : $columnIndex
             }, [
               h('div', {
                 class: ['vxe-cell', {

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

@@ -1,5 +1,5 @@
 import VxeFormItem from './form-item'
-import { UtilTools } from '../../tools'
+import { errLog } from '../../tools/log'
 
 export default {
   name: 'VxeFormGather',
@@ -13,7 +13,7 @@ export default {
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       this.$nextTick(() => {
         if (this.$xeform && this.$xeform.customLayout) {
-          UtilTools.error('vxe.error.errConflicts', ['custom-layout', '<form-gather ...>'])
+          errLog('vxe.error.errConflicts', ['custom-layout', '<form-gather ...>'])
         }
       })
     }

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

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, isEnableConf } from '../../tools'
+import { isEnableConf, getFuncText } from '../../tools/utils'
 import { createItem, destroyItem, assemItem } from './util'
 import { renderTitle } from './render'
 
@@ -93,7 +93,7 @@ const renderItem = (h, _vm, item, slots) => {
           width: isNaN(titleWidth) ? titleWidth : `${titleWidth}px`
         } : null,
         attrs: {
-          title: showTitle ? UtilTools.getFuncText(title) : null
+          title: showTitle ? getFuncText(title) : null
         },
         on: ons
       }, renderTitle(h, _vm, item)) : null,
@@ -137,6 +137,11 @@ export default {
       default: null
     }
   },
+  data () {
+    return {
+      itemConfig: null
+    }
+  },
   watch,
   mounted () {
     assemItem(this)