vxe-table 3.7.0-beta.6 → 3.7.0-beta.7

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

@@ -4,9 +4,65 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.commands = void 0;
-var _store = _interopRequireDefault(require("./store"));
+var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _log = require("../../tools/log");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-var commands = new _store["default"]();
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+var VXECommandsStore = /*#__PURE__*/function () {
+  function VXECommandsStore() {
+    _classCallCheck(this, VXECommandsStore);
+    this.store = {};
+  }
+  _createClass(VXECommandsStore, [{
+    key: "mixin",
+    value: function mixin(options) {
+      var _this = this;
+      _xeUtils["default"].each(options, function (item, key) {
+        _this.add(key, item);
+      });
+      return VXECommandsStore;
+    }
+  }, {
+    key: "get",
+    value: function get(name) {
+      return this.store[name];
+    }
+  }, {
+    key: "add",
+    value: function add(name, render) {
+      var conf = this.store[name];
+      // 兼容
+      if (_xeUtils["default"].isFunction(render)) {
+        // warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+        render = {
+          commandMethod: render
+        };
+      }
+
+      // 检测是否覆盖
+      if (process.env.NODE_ENV === 'development') {
+        var confKeys = _xeUtils["default"].keys(conf);
+        _xeUtils["default"].each(render, function (item, key) {
+          if (confKeys.includes(key)) {
+            (0, _log.warnLog)('vxe.error.coverProp', [name, key]);
+          }
+        });
+      }
+      this.store[name] = conf ? _xeUtils["default"].merge(conf, render) : render;
+      return VXECommandsStore;
+    }
+  }, {
+    key: "delete",
+    value: function _delete(name) {
+      delete this.store[name];
+      return VXECommandsStore;
+    }
+  }]);
+  return VXECommandsStore;
+}();
+var commands = new VXECommandsStore();
 exports.commands = commands;
 if (process.env.NODE_ENV === 'development') {
   Object.assign(commands, {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.commands=void 0;var _store=_interopRequireDefault(require("./store"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var commands=new _store.default;exports.commands=commands,"development"===process.env.NODE_ENV&&Object.assign(commands,{_name:"Commands"});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.commands=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),Object.defineProperty(e,"prototype",{writable:!1}),e}var VXECommandsStore=function(){function o(){_classCallCheck(this,o),this.store={}}return _createClass(o,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),o}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var n,t=this.store[r];return _xeUtils.default.isFunction(e)&&(e={commandMethod:e}),"development"===process.env.NODE_ENV&&(n=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){n.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,o}},{key:"delete",value:function(e){return delete this.store[e],o}}]),o}(),commands=new VXECommandsStore;exports.commands=commands,"development"===process.env.NODE_ENV&&Object.assign(commands,{_name:"Commands"});

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

@@ -21,6 +21,7 @@ var _default = {
     animat: true,
     delayHover: 250,
     autoResize: true,
+    minHeight: 144,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -54,7 +55,9 @@ var _default = {
     },
     validConfig: {
       showMessage: true,
-      message: 'default'
+      autoClear: true,
+      message: 'inline',
+      msgMode: 'single'
     },
     columnConfig: {
       maxFixedSize: 4

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon-",_default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,message:"default"},columnConfig:{maxFixedSize:4},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",children:"children",hasChild:"hasChild",mapChildren:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_HELP:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{custom:{allowFixed:!0,showFooter:!0}},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon-",_default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",children:"children",hasChild:"hasChild",mapChildren:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_HELP:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{custom:{allowFixed:!0,showFooter:!0}},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};exports.default=_default;

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

@@ -4,9 +4,65 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formats = void 0;
-var _store = _interopRequireDefault(require("./store"));
+var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _log = require("../../tools/log");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-var formats = new _store["default"]();
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+var VXEFormatsStore = /*#__PURE__*/function () {
+  function VXEFormatsStore() {
+    _classCallCheck(this, VXEFormatsStore);
+    this.store = {};
+  }
+  _createClass(VXEFormatsStore, [{
+    key: "mixin",
+    value: function mixin(options) {
+      var _this = this;
+      _xeUtils["default"].each(options, function (item, key) {
+        _this.add(key, item);
+      });
+      return VXEFormatsStore;
+    }
+  }, {
+    key: "get",
+    value: function get(name) {
+      return this.store[name];
+    }
+  }, {
+    key: "add",
+    value: function add(name, render) {
+      var conf = this.store[name];
+      // 兼容
+      if (_xeUtils["default"].isFunction(render)) {
+        // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
+        render = {
+          formatMethod: render
+        };
+      }
+
+      // 检测是否覆盖
+      if (process.env.NODE_ENV === 'development') {
+        var confKeys = _xeUtils["default"].keys(conf);
+        _xeUtils["default"].each(render, function (item, key) {
+          if (confKeys.includes(key)) {
+            (0, _log.warnLog)('vxe.error.coverProp', [name, key]);
+          }
+        });
+      }
+      this.store[name] = conf ? _xeUtils["default"].merge(conf, render) : render;
+      return VXEFormatsStore;
+    }
+  }, {
+    key: "delete",
+    value: function _delete(name) {
+      delete this.store[name];
+      return VXEFormatsStore;
+    }
+  }]);
+  return VXEFormatsStore;
+}();
+var formats = new VXEFormatsStore();
 exports.formats = formats;
 if (process.env.NODE_ENV === 'development') {
   Object.assign(formats, {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formats=void 0;var _store=_interopRequireDefault(require("./store"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var formats=new _store.default;exports.formats=formats,"development"===process.env.NODE_ENV&&Object.assign(formats,{_name:"Formats"});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formats=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 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),Object.defineProperty(e,"prototype",{writable:!1}),e}var VXEFormatsStore=function(){function n(){_classCallCheck(this,n),this.store={}}return _createClass(n,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),n}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var o,t=this.store[r];return _xeUtils.default.isFunction(e)&&(e={formatMethod:e}),"development"===process.env.NODE_ENV&&(o=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){o.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,n}},{key:"delete",value:function(e){return delete this.store[e],n}}]),n}(),formats=new VXEFormatsStore;exports.formats=formats,"development"===process.env.NODE_ENV&&Object.assign(formats,{_name:"Formats"});

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

@@ -4,9 +4,65 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.menus = void 0;
-var _store = _interopRequireDefault(require("./store"));
+var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _log = require("../../tools/log");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-var menus = new _store["default"]();
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+var VXEMenusStore = /*#__PURE__*/function () {
+  function VXEMenusStore() {
+    _classCallCheck(this, VXEMenusStore);
+    this.store = {};
+  }
+  _createClass(VXEMenusStore, [{
+    key: "mixin",
+    value: function mixin(options) {
+      var _this = this;
+      _xeUtils["default"].each(options, function (item, key) {
+        _this.add(key, item);
+      });
+      return VXEMenusStore;
+    }
+  }, {
+    key: "get",
+    value: function get(name) {
+      return this.store[name];
+    }
+  }, {
+    key: "add",
+    value: function add(name, render) {
+      var conf = this.store[name];
+      // 兼容
+      if (_xeUtils["default"].isFunction(render)) {
+        // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+        render = {
+          menuMethod: render
+        };
+      }
+
+      // 检测是否覆盖
+      if (process.env.NODE_ENV === 'development') {
+        var confKeys = _xeUtils["default"].keys(conf);
+        _xeUtils["default"].each(render, function (item, key) {
+          if (confKeys.includes(key)) {
+            (0, _log.warnLog)('vxe.error.coverProp', [name, key]);
+          }
+        });
+      }
+      this.store[name] = conf ? _xeUtils["default"].merge(conf, render) : render;
+      return VXEMenusStore;
+    }
+  }, {
+    key: "delete",
+    value: function _delete(name) {
+      delete this.store[name];
+      return VXEMenusStore;
+    }
+  }]);
+  return VXEMenusStore;
+}();
+var menus = new VXEMenusStore();
 exports.menus = menus;
 if (process.env.NODE_ENV === 'development') {
   Object.assign(menus, {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.menus=void 0;var _store=_interopRequireDefault(require("./store"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var menus=new _store.default;exports.menus=menus,"development"===process.env.NODE_ENV&&Object.assign(menus,{_name:"Menus"});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.menus=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),Object.defineProperty(e,"prototype",{writable:!1}),e}var VXEMenusStore=function(){function o(){_classCallCheck(this,o),this.store={}}return _createClass(o,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),o}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var n,t=this.store[r];return _xeUtils.default.isFunction(e)&&(e={menuMethod:e}),"development"===process.env.NODE_ENV&&(n=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){n.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,o}},{key:"delete",value:function(e){return delete this.store[e],o}}]),o}(),menus=new VXEMenusStore;exports.menus=menus,"development"===process.env.NODE_ENV&&Object.assign(menus,{_name:"Menus"});

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

@@ -20,8 +20,11 @@ var Store = /*#__PURE__*/function () {
   }
   _createClass(Store, [{
     key: "mixin",
-    value: function mixin(map) {
-      Object.assign(this.store, map);
+    value: function mixin(options) {
+      var _this = this;
+      _xeUtils["default"].each(options, function (item, key) {
+        _this.add(key, item);
+      });
       return Store;
     }
   }, {

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 _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),Object.defineProperty(e,"prototype",{writable:!1}),e}var Store=function(){function o(){_classCallCheck(this,o),this.store={}}return _createClass(o,[{key:"mixin",value:function(e){return Object.assign(this.store,e),o}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var n,t=this.store[r];return"development"===process.env.NODE_ENV&&(n=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){n.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,o}},{key:"delete",value:function(e){return delete this.store[e],o}}]),o}(),_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),Object.defineProperty(e,"prototype",{writable:!1}),e}var Store=function(){function o(){_classCallCheck(this,o),this.store={}}return _createClass(o,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),o}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var n,t=this.store[r];return"development"===process.env.NODE_ENV&&(n=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){n.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,o}},{key:"delete",value:function(e){return delete this.store[e],o}}]),o}(),_default=Store;exports.default=_default;

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

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.validators = void 0;
+var _store = _interopRequireDefault(require("./store"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var validators = new _store["default"]();
+exports.validators = validators;
+if (process.env.NODE_ENV === 'development') {
+  Object.assign(validators, {
+    _name: 'Validators'
+  });
+}

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.validators=void 0;var _store=_interopRequireDefault(require("./store"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var validators=new _store.default;exports.validators=validators,"development"===process.env.NODE_ENV&&Object.assign(validators,{_name:"Validators"});

package/lib/validator/src/mixin.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 var _utils = require("../../tools/utils");
+var _log = require("../../tools/log");
 var _dom = _interopRequireDefault(require("../../tools/dom"));
 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"); } }
@@ -276,10 +278,11 @@ var _default = {
           rules.forEach(function (rule) {
             var type = rule.type,
               trigger = rule.trigger,
-              required = rule.required;
+              required = rule.required,
+              validator = rule.validator;
             if (validType === 'all' || !trigger || validType === trigger) {
-              if (_xeUtils["default"].isFunction(rule.validator)) {
-                var customValid = rule.validator({
+              if (validator) {
+                var validParams = {
                   cellValue: cellValue,
                   rule: rule,
                   rules: rules,
@@ -289,7 +292,26 @@ var _default = {
                   columnIndex: _this3.getColumnIndex(column),
                   field: column.property,
                   $table: _this3
-                });
+                };
+                var customValid;
+                if (_xeUtils["default"].isString(validator)) {
+                  var gvItem = _vXETable["default"].validators.get(validator);
+                  if (gvItem) {
+                    if (gvItem.cellValidatorMethod) {
+                      customValid = gvItem.cellValidatorMethod(validParams);
+                    } else {
+                      if (process.env.NODE_ENV === 'development') {
+                        (0, _log.warnLog)('vxe.error.notValidators', [validator]);
+                      }
+                    }
+                  } else {
+                    if (process.env.NODE_ENV === 'development') {
+                      (0, _log.errLog)('vxe.error.notValidators', [validator]);
+                    }
+                  }
+                } else {
+                  customValid = validator(validParams);
+                }
                 if (customValid) {
                   if (_xeUtils["default"].isError(customValid)) {
                     _this3.validRuleErr = true;

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")),_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),Object.defineProperty(e,"prototype",{writable:!1}),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,e=e.pattern,r="number"===r,n=r?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!r||!isNaN(t))||!_xeUtils.default.eqNull(i)&&n<_xeUtils.default.toNumber(i)||!_xeUtils.default.eqNull(l)&&n>_xeUtils.default.toNumber(l)||!(!e||(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).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 t,l,a=this,s={},n=this.editRules,c=this.afterFullData,d=this.treeConfig,r=this.treeOpts,u=(!0===e?t=c:e&&(_xeUtils.default.isFunction(e)?o=e:t=_xeUtils.default.isArray(e)?e:[e]),t=t||this.getInsertRecords().concat(this.getUpdateRecords()),[]);return this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),n?(l=this.getColumns(),e=function(r){var e;!i&&a.validRuleErr||(e=[],l.forEach(function(t){!i&&a.validRuleErr||!_xeUtils.default.has(n,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)}))}),u.push(Promise.all(e)))},d?_xeUtils.default.eachTree(t,e,r):t.forEach(e),Promise.all(u).then(function(){var e=Object.keys(s);return a.$nextTick().then(function(){if(e.length)return Promise.reject(s[e[0]][0]);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),n=0<n?c[n-1]:l;!1===a.validOpts.autoPos?r():(d?a.scrollToTreeRow(n):a.scrollToRow(n)).then(i)})})):this.$nextTick().then(function(){o&&o()})},hasCellRules:function(t,e,r){var i=this.editRules,r=r.property;return!(!r||!i)&&(i=_xeUtils.default.get(i,r))&&_xeUtils.default.find(i,function(e){return"all"===t||!e.trigger||t===e.trigger})},validCellRules:function(u,o,a,e){var s,c,d=this,t=this.editRules,r=a.property,f=[],h=[];return r&&t&&(s=_xeUtils.default.get(t,r))&&(c=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(o,r):e,s.forEach(function(t){var e,r,i=t.type,l=t.trigger,n=t.required;"all"!==u&&l&&u!==l||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:c,rule:t,rules:s,row:o,rowIndex:d.getRowIndex(o),column:a,columnIndex:d.getColumnIndex(a),field:a.property,$table:d}))&&(_xeUtils.default.isError(e)?(d.validRuleErr=!0,f.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&h.push(e.catch(function(e){d.validRuleErr=!0,f.push(new Rule({type:"custom",trigger:l,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))}))):(e="array"===i,i=_xeUtils.default.isArray(c),r=!0,r=e||i?!i||!c.length:_xeUtils.default.isString(c)?(0,_utils.eqEmptyValue)(c.trim()):(0,_utils.eqEmptyValue)(c),(n?r||validErrorRuleValue(t,c):!r&&validErrorRuleValue(t,c))&&(d.validRuleErr=!0,f.push(new Rule(t)))))})),Promise.all(h).then(function(){if(f.length)return Promise.reject({rules:f,rule:f[0]})})},_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 l=i.args,u=l.row,o=l.column,a=l.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){var e=e.rule;return e.trigger&&t!==e.trigger?Promise.resolve():(r.showValidTooltip(e={rule:e,row:u,column:o,cell:a}),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;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_utils=require("../../tools/utils"),_log=require("../../tools/log"),_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 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),Object.defineProperty(e,"prototype",{writable:!1}),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,l=e.min,i=e.max,e=e.pattern,r="number"===r,n=r?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!r||!isNaN(t))||!_xeUtils.default.eqNull(l)&&n<_xeUtils.default.toNumber(l)||!_xeUtils.default.eqNull(i)&&n>_xeUtils.default.toNumber(i)||!(!e||(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).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,a,l){var t,i,u=this,s={},n=this.editRules,c=this.afterFullData,d=this.treeConfig,r=this.treeOpts,o=(!0===e?t=c:e&&(_xeUtils.default.isFunction(e)?a=e:t=_xeUtils.default.isArray(e)?e:[e]),t=t||this.getInsertRecords().concat(this.getUpdateRecords()),[]);return this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),n?(i=this.getColumns(),e=function(r){var e;!l&&u.validRuleErr||(e=[],i.forEach(function(t){!l&&u.validRuleErr||!_xeUtils.default.has(n,t.property)||e.push(u.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:u.getRowIndex(r),row:r,columnIndex:u.getColumnIndex(t),column:t,field:t.property,$table:u};if(s[t.property]||(s[t.property]=[]),s[t.property].push(e),!l)return u.validRuleErr=!0,Promise.reject(e)}))}),o.push(Promise.all(e)))},d?_xeUtils.default.eachTree(t,e,r):t.forEach(e),Promise.all(o).then(function(){var e=Object.keys(s);return u.$nextTick().then(function(){if(e.length)return Promise.reject(s[e[0]][0]);a&&a()})}).catch(function(o){return new Promise(function(e,t){function r(){u.$nextTick(function(){a?(a(s),e()):("obsolete"===_conf.default.validToReject?t:e)(s)})}function l(){o.cell=u.getCell(o.row,o.column),_dom.default.scrollToView(o.cell),u.handleValidError(o).then(r)}var i=o.row,n=c.indexOf(i),n=0<n?c[n-1]:i;!1===u.validOpts.autoPos?r():(d?u.scrollToTreeRow(n):u.scrollToRow(n)).then(l)})})):this.$nextTick().then(function(){a&&a()})},hasCellRules:function(t,e,r){var l=this.editRules,r=r.property;return!(!r||!l)&&(l=_xeUtils.default.get(l,r))&&_xeUtils.default.find(l,function(e){return"all"===t||!e.trigger||t===e.trigger})},validCellRules:function(u,s,c,e){var d,f,h=this,t=this.editRules,r=c.property,p=[],g=[];return r&&t&&(d=_xeUtils.default.get(t,r))&&(f=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,r):e,d.forEach(function(t){var e,r,l,i=t.type,n=t.trigger,o=t.required,a=t.validator;"all"!==u&&n&&u!==n||(a?(l={cellValue:f,rule:t,rules:d,row:s,rowIndex:h.getRowIndex(s),column:c,columnIndex:h.getColumnIndex(c),field:c.property,$table:h},_xeUtils.default.isString(a)?(r=_vXETable.default.validators.get(a))?r.cellValidatorMethod?e=r.cellValidatorMethod(l):"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.notValidators",[a]):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notValidators",[a]):e=a(l),e&&(_xeUtils.default.isError(e)?(h.validRuleErr=!0,p.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)}))):e.catch&&g.push(e.catch(function(e){h.validRuleErr=!0,p.push(new Rule({type:"custom",trigger:n,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))):(r="array"===i,a=_xeUtils.default.isArray(f),l=!0,l=r||a?!a||!f.length:_xeUtils.default.isString(f)?(0,_utils.eqEmptyValue)(f.trim()):(0,_utils.eqEmptyValue)(f),(o?l||validErrorRuleValue(t,f):!l&&validErrorRuleValue(t,f))&&(h.validRuleErr=!0,p.push(new Rule(t)))))})),Promise.all(g).then(function(){if(p.length)return Promise.reject({rules:p,rule:p[0]})})},_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 i=l.args,o=i.row,a=i.column,u=i.cell;if(this.hasCellRules(t,o,a))return this.validCellRules(t,o,a).then(function(){"row"===e.mode&&n.visible&&n.row===o&&n.column===a&&r.clearValidate()}).catch(function(e){var e=e.rule;return e.trigger&&t!==e.trigger?Promise.resolve():(r.showValidTooltip(e={rule:e,row:o,column:a,cell:u}),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,a=e.row,u=e.column,s=e.cell,c=r.validTip,d=o.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:a,column:u,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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vxe-table",
-  "version": "3.7.0-beta.6",
-  "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
+  "version": "3.7.0-beta.7",
+  "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式为零代码而设计...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
     "serve": "vue-cli-service serve",

package/packages/filter/src/mixin.js

@@ -171,12 +171,16 @@ export default {
         }
       })
       const filterList = this.getCheckedFilters()
+      const params = { $table: this, $event: evnt, column, field, property: field, values, datas, filters: filterList, filterList }
       // 如果是服务端筛选，则跳过本地筛选处理
       if (!filterOpts.remote) {
         this.handleTableData(true)
         this.checkSelectionStatus()
       }
-      this.emitEvent('filter-change', { column, field, property: field, values, datas, filters: filterList, filterList }, evnt)
+      if (this.mouseConfig && this.mouseOpts.area && this.handleFilterEvent) {
+        this.handleFilterEvent(evnt, params)
+      }
+      this.emitEvent('filter-change', params, evnt)
       this.closeFilter()
       this.updateFooter().then(() => {
         const { scrollXLoad, scrollYLoad } = this

package/packages/form/src/form.js

@@ -5,7 +5,7 @@ import VXETable from '../../v-x-e-table'
 import { isEnableConf, eqEmptyValue, getFuncText } from '../../tools/utils'
 import DomTools, { browse } from '../../tools/dom'
 import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util'
-import { errLog } from '../../tools/log'
+import { warnLog, errLog } from '../../tools/log'
 import VxeFormConfigItem from './form-config-item'
 import VxeLoading from '../../loading/index'
 import { getSlotVNs } from '../../tools/vn'
@@ -461,10 +461,10 @@ export default {
             if (rules) {
               const itemValue = XEUtils.isUndefined(val) ? XEUtils.get(data, property) : val
               rules.forEach(rule => {
-                const { type, trigger, required } = rule
+                const { type, trigger, required, validator } = rule
                 if (validType === 'all' || !trigger || validType === rule.trigger) {
-                  if (XEUtils.isFunction(rule.validator)) {
-                    const customValid = rule.validator({
+                  if (validator) {
+                    const validParams = {
                       itemValue,
                       rule,
                       rules,
@@ -472,7 +472,26 @@ export default {
                       field: property,
                       property,
                       $form: this
-                    })
+                    }
+                    let customValid
+                    if (XEUtils.isString(validator)) {
+                      const gvItem = VXETable.validators.get(validator)
+                      if (gvItem) {
+                        if (gvItem.itemValidatorMethod) {
+                          customValid = gvItem.itemValidatorMethod(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)) {
                         errorRules.push(new Rule({ type: 'custom', trigger, content: customValid.message, rule: new Rule(rule) }))

package/packages/grid/src/grid.js

@@ -747,9 +747,13 @@ export default {
           break
         }
         default: {
-          const btnMethod = VXETable.commands.get(code)
-          if (btnMethod) {
-            btnMethod({ code, button, $grid: this, $table: $xetable }, ...args)
+          const gCommandOpts = VXETable.commands.get(code)
+          if (gCommandOpts.commandMethod) {
+            gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xetable }, ...args)
+          } else {
+            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+              errLog('vxe.error.notCommands', [code])
+            }
           }
         }
       }

package/packages/input/src/input.js

@@ -624,7 +624,10 @@ export default {
     clearable: { type: Boolean, default: () => GlobalConfig.input.clearable },
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => XEUtils.eqNull(GlobalConfig.input.placeholder) ? GlobalConfig.i18n('vxe.base.pleaseInput') : GlobalConfig.input.placeholder
+    },
     maxlength: [String, Number],
     autocomplete: { type: String, default: 'off' },
     align: String,

package/packages/locale/lang/en-US.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: 'Please input',
+      pleaseSelect: 'Select'
+    },
     loading: {
       text: 'Loading...'
     },
@@ -19,6 +23,9 @@ export default {
       errProp: 'Unsupported parameter "{0}", possibly "{1}".',
       colRepet: 'column.{0}="{0}" is duplicated, which may make some features unusable',
       notFunc: 'method "{0}" not exist.',
+      notValidators: 'Global validators "{0}" no existe.',
+      notFormats: 'Global formats "{0}" no existe.',
+      notCommands: 'Global commands "{0}" no existe.',
       notSlot: 'slot "{0}" does not exist',
       noTree: 'The tree structure does not support "{0}".',
       notProp: 'Unsupported parameters "{0}"',

package/packages/locale/lang/es-ES.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: 'Please input',
+      pleaseSelect: 'Select'
+    },
     loading: {
       text: 'Cargando...'
     },
@@ -19,6 +23,9 @@ export default {
       errProp: 'Parámetro no compatible "{0}", posiblemente "{1}".',
       colRepet: 'columna.{0}="{0}" está duplicado, lo que puede hacer que algunas funciones sean inutilizables',
       notFunc: 'El método "{0}" no existe.',
+      notValidators: 'Global validators "{0}" no existe.',
+      notFormats: 'Global formats "{0}" no existe.',
+      notCommands: 'Global commands "{0}" no existe.',
       notSlot: 'La ranura "{0}" no existe.',
       noTree: 'La estructura de árbol no soporta "{0}".',
       notProp: 'Parámetros no compatibles "{0}"',

package/packages/locale/lang/ja-JP.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: 'Please input',
+      pleaseSelect: 'Select'
+    },
     loading: {
       text: 'Loading...'
     },
@@ -19,6 +23,9 @@ export default {
       errProp: 'サポートされていないパラメーター "{0}"，"{1}" の可能性があります',
       colRepet: 'column.{0}="{0}" が重複しているため、機能が使えなくなることがあります。',
       notFunc: 'method "{0}" はありません',
+      notValidators: 'Global validators "{0}" no existe.',
+      notFormats: 'Global formats "{0}" no existe.',
+      notCommands: 'Global commands "{0}" no existe.',
       notSlot: 'slot "{0}" はありません',
       noTree: 'Tree structureは "{0}" をサポートしていません',
       notProp: 'サポートされていないパラメータ "{0}"',

package/packages/locale/lang/zh-CN.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: '请输入',
+      pleaseSelect: '请选择'
+    },
     loading: {
       text: '加载中...'
     },
@@ -19,6 +23,9 @@ export default {
       errProp: '不支持的参数 "{0}"，可能为 "{1}"',
       colRepet: 'column.{0}="{1}" 重复了，这可能会导致某些功能无法使用',
       notFunc: '方法 "{0}" 不存在',
+      notValidators: '全局校验 "{0}" 不存在',
+      notFormats: '全局格式化 "{0}" 不存在',
+      notCommands: '全局指令 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '树结构不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',

package/packages/locale/lang/zh-TC.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: '请输入',
+      pleaseSelect: '请选择'
+    },
     loading: {
       text: '加載中...'
     },
@@ -19,6 +23,9 @@ export default {
       errProp: '不支持的參數 "{0}"，可能為 "{1}"',
       colRepet: 'column.{0}="{1}" 重複了，這可能會導致某些功能無法使用',
       notFunc: '方法 "{0}" 不存在',
+      notValidators: '全局校验 "{0}" 不存在',
+      notFormats: '全局格式化 "{0}" 不存在',
+      notCommands: '全局指令 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '樹狀結構不支援 {0}',
       notProp: '不支持的參數 "{0}"',