vxe-table 3.7.7-beta.2 → 3.7.7-beta.4

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(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]}})}),require("./src/renderer")),_commands=(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]}})}),require("./src/commands")),_menus=(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]}})}),require("./src/menus")),_formats=(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]}})}),require("./src/formats")),_validators=(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]}})}),require("./src/validators")),_config=require("./src/config"),_utils=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),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),Object.defineProperty(e,"prototype",{writable:!1}),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}(),globalConfs=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.globalConfs=globalConfs;var v="v3",setup=(exports.v=v,_config.config),globalStore=(exports.setup=setup,{}),VXETable=(exports.globalStore=globalStore,{v:v,version:"3.7.7-beta.2",reg:reg,use:use,setup:setup,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,validators:_validators.validators,t:t,_t:_t,config:_config.config,globalConfs:globalConfs}),_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(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]}})}),require("./src/renderer")),_commands=(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]}})}),require("./src/commands")),_menus=(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]}})}),require("./src/menus")),_formats=(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]}})}),require("./src/formats")),_validators=(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]}})}),require("./src/validators")),_config=require("./src/config"),_utils=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),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),Object.defineProperty(e,"prototype",{writable:!1}),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}(),globalConfs=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.globalConfs=globalConfs;var v="v3",setup=(exports.v=v,_config.config),globalStore=(exports.setup=setup,{}),VXETable=(exports.globalStore=globalStore,{v:v,version:"3.7.7-beta.4",reg:reg,use:use,setup:setup,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,validators:_validators.validators,t:t,_t:_t,config:_config.config,globalConfs:globalConfs}),_default=exports.VXETable=VXETable;exports.default=_default;

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

@@ -20,7 +20,7 @@ var _default = {
     showHeader: true,
     animat: true,
     delayHover: 250,
-    autoResize: false,
+    autoResize: true,
     minHeight: 144,
     // keepSource: false,
     // showOverflow: null,

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:!1,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",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_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:{gt:60},scrollY:{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",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_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:{gt:60},scrollY:{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/validator/src/mixin.js

@@ -7,10 +7,12 @@ 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 _util = require("../../table/src/util");
 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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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; }
@@ -104,8 +106,9 @@ var _default = {
      */
     handleValidError: function handleValidError(params) {
       var _this = this;
+      var validOpts = this.validOpts;
       return new Promise(function (resolve) {
-        if (_this.validOpts.autoPos === false) {
+        if (validOpts.autoPos === false) {
           _this.emitEvent('valid-error', params);
           resolve();
         } else {
@@ -120,6 +123,19 @@ var _default = {
         }
       });
     },
+    handleErrMsgMode: function handleErrMsgMode(validErrMaps) {
+      var validOpts = this.validOpts;
+      if (validOpts.msgMode === 'single') {
+        var keys = Object.keys(validErrMaps);
+        var resMaps = validErrMaps;
+        if (keys.length) {
+          var firstKey = keys[0];
+          resMaps[firstKey] = validErrMaps[firstKey];
+        }
+        return resMaps;
+      }
+      return validErrMaps;
+    },
     /**
      * 对表格数据进行校验
      * 如果不指定数据，则默认只校验临时变动的数据，例如新增或修改
@@ -134,6 +150,7 @@ var _default = {
       var validRest = {};
       var editRules = this.editRules,
         afterFullData = this.afterFullData,
+        visibleColumn = this.visibleColumn,
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
       var childrenField = treeOpts.children || treeOpts.childrenField;
@@ -154,6 +171,7 @@ var _default = {
       this.lastCallTime = Date.now();
       this.validRuleErr = false; // 如果为快速校验，当存在某列校验不通过时将终止执行
       this.clearValidate();
+      var validErrMaps = {};
       if (editRules) {
         var columns = this.getColumns();
         var handleVaild = function handleVaild(row) {
@@ -177,6 +195,12 @@ var _default = {
                   if (!validRest[column.property]) {
                     validRest[column.property] = [];
                   }
+                  validErrMaps["".concat((0, _util.getRowid)(_this2, row), ":").concat(column.id)] = {
+                    column: column,
+                    row: row,
+                    rule: rule,
+                    content: rule.content
+                  };
                   validRest[column.property].push(rest);
                   if (!isFull) {
                     _this2.validRuleErr = true;
@@ -197,6 +221,7 @@ var _default = {
         }
         return Promise.all(rowValids).then(function () {
           var ruleProps = Object.keys(validRest);
+          _this2.validErrorMaps = _this2.handleErrMsgMode(validErrMaps);
           return _this2.$nextTick().then(function () {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0]);
@@ -232,20 +257,21 @@ var _default = {
              * 将表格滚动到可视区
              * 由于提示信息至少需要占一行，定位向上偏移一行
              */
-            var row = firstErrParams.row;
-            var rowIndex = afterFullData.indexOf(row);
-            var locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
             if (_this2.validOpts.autoPos === false) {
               finish();
             } else {
-              if (treeConfig) {
-                _this2.scrollToTreeRow(locatRow).then(posAndFinish);
-              } else {
-                _this2.scrollToRow(locatRow).then(posAndFinish);
-              }
+              var row = firstErrParams.row;
+              var column = firstErrParams.column;
+              var rowIndex = afterFullData.indexOf(row);
+              var columnIndex = visibleColumn.indexOf(column);
+              var locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
+              var locatColumn = columnIndex > 0 ? visibleColumn[rowIndex - 1] : column;
+              _this2.scrollToRow(locatRow, locatColumn).then(posAndFinish);
             }
           });
         });
+      } else {
+        this.validErrorMaps = {};
       }
       return this.$nextTick().then(function () {
         if (cb) {
@@ -377,41 +403,82 @@ var _default = {
         }
       });
     },
-    _clearValidate: function _clearValidate() {
+    _clearValidate: function _clearValidate(rows, fieldOrColumn) {
+      var _this4 = this;
+      var validOpts = this.validOpts,
+        validErrorMaps = this.validErrorMaps;
       var validTip = this.$refs.validTip;
-      Object.assign(this.validStore, {
-        visible: false,
-        row: null,
-        column: null,
-        content: '',
-        rule: null
+      var rowList = _xeUtils.default.isArray(rows) ? rows : rows ? [rows] : [];
+      var colList = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : []).map(function (column) {
+        return (0, _util.handleFieldOrColumn)(_this4, column);
       });
-      if (validTip && validTip.visible) {
+      var validErrMaps = {};
+      if (validTip && validTip.reactData.visible) {
         validTip.close();
       }
+      // 如果是单个提示模式
+      if (validOpts.msgMode === 'single') {
+        this.validErrorMaps = {};
+        return this.$nextTick();
+      }
+      if (rowList.length && colList.length) {
+        validErrMaps = Object.assign({}, validErrorMaps);
+        rowList.forEach(function (row) {
+          colList.forEach(function (column) {
+            var vaildKey = "".concat((0, _util.getRowid)(_this4, row), ":").concat(column.id);
+            if (validErrMaps[vaildKey]) {
+              delete validErrMaps[vaildKey];
+            }
+          });
+        });
+      } else if (rowList.length) {
+        var rowidList = rowList.map(function (row) {
+          return "".concat((0, _util.getRowid)(_this4, row));
+        });
+        _xeUtils.default.each(validErrorMaps, function (item, key) {
+          if (rowidList.indexOf(key.split(':')[0]) > -1) {
+            validErrMaps[key] = item;
+          }
+        });
+      } else if (colList.length) {
+        var colidList = colList.map(function (column) {
+          return "".concat(column.id);
+        });
+        _xeUtils.default.each(validErrorMaps, function (item, key) {
+          if (colidList.indexOf(key.split(':')[1]) > -1) {
+            validErrMaps[key] = item;
+          }
+        });
+      }
+      this.validErrorMaps = validErrMaps;
       return this.$nextTick();
     },
     /**
      * 触发校验
      */
     triggerValidate: function triggerValidate(type) {
-      var _this4 = this;
+      var _this5 = this;
       var editConfig = this.editConfig,
         editStore = this.editStore,
         editRules = this.editRules,
-        validStore = this.validStore;
+        editOpts = this.editOpts,
+        validOpts = this.validOpts;
       var actived = editStore.actived;
-      if (actived.row && editRules) {
+      // 检查清除校验消息
+      if (editRules && validOpts.msgMode === 'single') {
+        this.validErrorMaps = {};
+      }
+
+      // 校验单元格
+      if (editConfig && editRules && actived.row) {
         var _actived$args = actived.args,
           row = _actived$args.row,
           column = _actived$args.column,
           cell = _actived$args.cell;
         if (this.hasCellRules(type, row, column)) {
           return this.validCellRules(type, row, column).then(function () {
-            if (editConfig.mode === 'row') {
-              if (validStore.visible && validStore.row === row && validStore.column === column) {
-                _this4.clearValidate();
-              }
+            if (editOpts.mode === 'row') {
+              _this5.clearValidate(row, column);
             }
           }).catch(function (_ref2) {
             var rule = _ref2.rule;
@@ -423,7 +490,7 @@ var _default = {
                 column: column,
                 cell: cell
               };
-              _this4.showValidTooltip(rest);
+              _this5.showValidTooltip(rest);
               return Promise.reject(rest);
             }
             return Promise.resolve();
@@ -436,9 +503,10 @@ var _default = {
      * 弹出校验错误提示
      */
     showValidTooltip: function showValidTooltip(params) {
-      var _this5 = this;
       var $refs = this.$refs,
         height = this.height,
+        validStore = this.validStore,
+        validErrorMaps = this.validErrorMaps,
         tableData = this.tableData,
         validOpts = this.validOpts;
       var rule = params.rule,
@@ -447,19 +515,29 @@ var _default = {
         cell = params.cell;
       var validTip = $refs.validTip;
       var content = rule.content;
-      return this.$nextTick(function () {
-        Object.assign(_this5.validStore, {
-          row: row,
+      validStore.visible = true;
+      if (validOpts.msgMode === 'single') {
+        this.validErrorMaps = _defineProperty({}, "".concat((0, _util.getRowid)(this, row), ":").concat(column.id), {
           column: column,
+          row: row,
           rule: rule,
-          content: content,
-          visible: true
+          content: content
         });
-        _this5.emitEvent('valid-error', params);
+      } else {
+        this.validErrorMaps = Object.assign({}, validErrorMaps, _defineProperty({}, "".concat((0, _util.getRowid)(this, row), ":").concat(column.id), {
+          column: column,
+          row: row,
+          rule: rule,
+          content: content
+        }));
+      }
+      this.emitEvent('valid-error', params, null);
+      if (validTip) {
         if (validTip && (validOpts.message === 'tooltip' || validOpts.message === 'default' && !height && tableData.length < 2)) {
           return validTip.open(cell, content);
         }
-      });
+      }
+      return this.$nextTick();
     }
   }
 };

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")),_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"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),this.beginValidate(e,t,!0)},_validate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),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,r=r.children||r.childrenField,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,{children: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,v=[],p=[];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,v.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)}))):e.catch&&p.push(e.catch(function(e){h.validRuleErr=!0,v.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,v.push(new Rule(t)))))})),Promise.all(p).then(function(){if(v.length)return Promise.reject({rules:v,rule:v[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;
+"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")),_util=require("../../table/src/util"),_utils=require("../../tools/utils"),_log=require("../../tools/log"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,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"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),this.beginValidate(e,t,!0)},_validate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),this.beginValidate(e,t)},handleValidError:function(t){var r=this,i=this.validOpts;return new Promise(function(e){!1===i.autoPos?(r.emitEvent("valid-error",t),e()):r.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(r.showValidTooltip(t))},10)})})},handleErrMsgMode:function(e){var t,r;return"single"===this.validOpts.msgMode?(t=e,(r=Object.keys(e)).length&&(t[r=r[0]]=e[r]),t):e},beginValidate:function(e,s,l){var t,r,u=this,c={},n=this.editRules,d=this.afterFullData,f=this.visibleColumn,i=this.treeConfig,o=this.treeOpts,o=o.children||o.childrenField,a=(!0===e?t=d:e&&(_xeUtils.default.isFunction(e)?s=e:t=_xeUtils.default.isArray(e)?e:[e]),t=t||this.getInsertRecords().concat(this.getUpdateRecords()),[]),h=(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),{});return n?(r=this.getColumns(),e=function(i){var e;!l&&u.validRuleErr||(e=[],r.forEach(function(r){!l&&u.validRuleErr||!_xeUtils.default.has(n,r.property)||e.push(u.validCellRules("all",i,r).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,rowIndex:u.getRowIndex(i),row:i,columnIndex:u.getColumnIndex(r),column:r,field:r.property,$table:u};if(c[r.property]||(c[r.property]=[]),h["".concat((0,_util.getRowid)(u,i),":").concat(r.id)]={column:r,row:i,rule:t,content:t.content},c[r.property].push(e),!l)return u.validRuleErr=!0,Promise.reject(e)}))}),a.push(Promise.all(e)))},i?_xeUtils.default.eachTree(t,e,{children:o}):t.forEach(e),Promise.all(a).then(function(){var e=Object.keys(c);return u.validErrorMaps=u.handleErrMsgMode(h),u.$nextTick().then(function(){if(e.length)return Promise.reject(c[e[0]][0]);s&&s()})}).catch(function(a){return new Promise(function(e,t){function r(){u.$nextTick(function(){s?(s(c),e()):("obsolete"===_conf.default.validToReject?t:e)(c)})}var i,l,n,o;!1===u.validOpts.autoPos?r():(n=a.row,i=a.column,l=d.indexOf(n),o=f.indexOf(i),n=0<l?d[l-1]:n,o=0<o?f[l-1]:i,u.scrollToRow(n,o).then(function(){a.cell=u.getCell(a.row,a.column),_dom.default.scrollToView(a.cell),u.handleValidError(a).then(r)}))})})):(this.validErrorMaps={},this.$nextTick().then(function(){s&&s()}))},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(s,u,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(u,r):e,d.forEach(function(t){var e,r,i,l=t.type,n=t.trigger,o=t.required,a=t.validator;"all"!==s&&n&&s!==n||(a?(i={cellValue:f,rule:t,rules:d,row:u,rowIndex:h.getRowIndex(u),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(i):"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(i),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"===l,a=_xeUtils.default.isArray(f),i=!0,i=r||a?!a||!f.length:_xeUtils.default.isString(f)?(0,_utils.eqEmptyValue)(f.trim()):(0,_utils.eqEmptyValue)(f),(o?i||validErrorRuleValue(t,f):!i&&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(e,t){var r,i,l=this,n=this.validOpts,o=this.validErrorMaps,a=this.$refs.validTip,e=_xeUtils.default.isArray(e)?e:e?[e]:[],s=_xeUtils.default.isArray(t)?t:(t?[t]:[]).map(function(e){return(0,_util.handleFieldOrColumn)(l,e)}),u={};return a&&a.reactData.visible&&a.close(),"single"===n.msgMode?this.validErrorMaps={}:(e.length&&s.length?(u=Object.assign({},o),e.forEach(function(t){s.forEach(function(e){e="".concat((0,_util.getRowid)(l,t),":").concat(e.id);u[e]&&delete u[e]})})):e.length?(r=e.map(function(e){return"".concat((0,_util.getRowid)(l,e))}),_xeUtils.default.each(o,function(e,t){-1<r.indexOf(t.split(":")[0])&&(u[t]=e)})):s.length&&(i=s.map(function(e){return"".concat(e.id)}),_xeUtils.default.each(o,function(e,t){-1<i.indexOf(t.split(":")[1])&&(u[t]=e)})),this.validErrorMaps=u),this.$nextTick()},triggerValidate:function(t){var r=this,e=this.editConfig,i=this.editStore,l=this.editRules,n=this.editOpts,o=this.validOpts,i=i.actived;if(l&&"single"===o.msgMode&&(this.validErrorMaps={}),e&&l&&i.row){var o=i.args,a=o.row,s=o.column,u=o.cell;if(this.hasCellRules(t,a,s))return this.validCellRules(t,a,s).then(function(){"row"===n.mode&&r.clearValidate(a,s)}).catch(function(e){var e=e.rule;return e.trigger&&t!==e.trigger?Promise.resolve():(r.showValidTooltip(e={rule:e,row:a,column:s,cell:u}),Promise.reject(e))})}return Promise.resolve()},showValidTooltip:function(e){var t=this.$refs,r=this.height,i=this.validStore,l=this.validErrorMaps,n=this.tableData,o=this.validOpts,a=e.rule,s=e.row,u=e.column,c=e.cell,t=t.validTip,d=a.content;return i.visible=!0,"single"===o.msgMode?this.validErrorMaps=_defineProperty({},"".concat((0,_util.getRowid)(this,s),":").concat(u.id),{column:u,row:s,rule:a,content:d}):this.validErrorMaps=Object.assign({},l,_defineProperty({},"".concat((0,_util.getRowid)(this,s),":").concat(u.id),{column:u,row:s,rule:a,content:d})),this.emitEvent("valid-error",e,null),t&&("tooltip"===o.message||"default"===o.message&&!r&&n.length<2)?t.open(c,d):this.$nextTick()}}};exports.default=_default;

package/package.json

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

package/packages/edit/src/mixin.js

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils'
 import VXETable from '../../v-x-e-table'
+import GlobalConfig from '../../v-x-e-table/src/conf'
 import UtilTools, { isEnableConf } from '../../tools/utils'
 import { getRowid } from '../../table/src/util'
 import DomTools, { browse } from '../../tools/dom'
@@ -370,7 +371,8 @@ export default {
       return {
         insertRecords: this.getInsertRecords(),
         removeRecords: this.getRemoveRecords(),
-        updateRecords: this.getUpdateRecords()
+        updateRecords: this.getUpdateRecords(),
+        pendingRecords: this.getUpdateRecords()
       }
     },
     /**
@@ -425,7 +427,7 @@ export default {
       const { editRender } = column
       const cell = params.cell = (params.cell || this.getCell(row, column))
       const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-      if (isEnableConf(editConfig) && isEnableConf(editRender) && cell) {
+      if (isEnableConf(editConfig) && isEnableConf(editRender) && !this.hasPendingByRow(row) && cell) {
         if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
           // 判断是否禁用编辑
           let type = 'edit-disabled'
@@ -439,7 +441,7 @@ export default {
             if (actived.column) {
               this.clearActived(evnt)
             }
-            type = 'edit-actived'
+            type = 'edit-activated'
             column.renderHeight = cell.offsetHeight
             actived.args = params
             actived.row = row
@@ -461,6 +463,18 @@ export default {
             columnIndex: this.getColumnIndex(column),
             $columnIndex: this.getVMColumnIndex(column)
           }, evnt)
+
+          // v4已废弃
+          if (type === 'edit-activated') {
+            this.emitEvent('edit-actived', {
+              row,
+              rowIndex: this.getRowIndex(row),
+              $rowIndex: this.getVMRowIndex(row),
+              column,
+              columnIndex: this.getColumnIndex(column),
+              $columnIndex: this.getVMColumnIndex(column)
+            }, evnt)
+          }
         } else {
           const { column: oldColumn } = actived
           if (mouseConfig) {
@@ -542,7 +556,12 @@ export default {
           $columnIndex: this.getVMColumnIndex(column)
         }, evnt)
       }
-      return VXETable._valid ? this.clearValidate() : this.$nextTick()
+      if (GlobalConfig.cellVaildMode === 'obsolete') {
+        if (this.clearValidate) {
+          return this.clearValidate()
+        }
+      }
+      return this.$nextTick()
     },
     _getActiveRecord () {
       // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -555,7 +574,7 @@ export default {
       const { $el, editStore, afterFullData } = this
       const { actived } = editStore
       const { args, row } = actived
-      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
+      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--active').length) {
         return Object.assign({}, args)
       }
       return null

package/packages/grid/src/grid.js

@@ -167,7 +167,6 @@ export default {
       tableLoading: false,
       isZMax: false,
       tableData: [],
-      pendingRecords: [],
       filterData: [],
       formData: {},
       sortData: [],
@@ -221,13 +220,12 @@ export default {
       if (proxyConfig) {
         tableProps.loading = loading || tableLoading
         tableProps.data = tableData
-        tableProps.rowClassName = this.handleRowClassName
         if (proxyOpts.seq && isEnableConf(pagerConfig)) {
           tableProps.seqConfig = Object.assign({}, seqConfig, { startIndex: (tablePage.currentPage - 1) * tablePage.pageSize })
         }
       }
       if (editConfig) {
-        tableProps.editConfig = Object.assign({}, editConfig, { beforeEditMethod: this.handleBeforeEditMethod })
+        tableProps.editConfig = Object.assign({}, editConfig)
       }
       return tableProps
     }
@@ -391,23 +389,6 @@ export default {
       const parentPaddingSize = isZMax || height !== 'auto' ? 0 : getPaddingTopBottomSize($el.parentNode)
       return parentPaddingSize + getPaddingTopBottomSize($el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper)
     },
-    handleRowClassName (params) {
-      const rowClassName = this.rowClassName
-      const clss = []
-      if (this.pendingRecords.some(item => item === params.row)) {
-        clss.push('row--pending')
-      }
-      clss.push(rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : '')
-      return clss
-    },
-    handleBeforeEditMethod (params) {
-      const { editConfig } = this
-      const beforeEditMethod = editConfig ? (editConfig.beforeEditMethod || editConfig.activeMethod) : null
-      if (this.pendingRecords.indexOf(params.row) === -1) {
-        return !beforeEditMethod || beforeEditMethod({ ...params, $grid: this })
-      }
-      return false
-    },
     initToolbar () {
       this.$nextTick(() => {
         const { xTable, xToolbar } = this.$refs
@@ -486,8 +467,14 @@ export default {
       switch (code) {
         case 'insert':
           return this.insert()
+        case 'insert_edit':
+          return this.insert().then(({ row }) => this.setEditRow(row))
+
+          // 已废弃
         case 'insert_actived':
-          return this.insert().then(({ row }) => this.setActiveRow(row))
+          return this.insert().then(({ row }) => this.setEditRow(row))
+          // 已废弃
+
         case 'mark_cancel':
           this.triggerPendingEvent(code)
           break
@@ -545,7 +532,6 @@ export default {
               filterList = $xetable.getCheckedFilters()
             } else {
               if (isReload) {
-                this.pendingRecords = []
                 $xetable.clearAll()
               } else {
                 sortList = $xetable.getSortColumns()
@@ -619,7 +605,7 @@ export default {
                 return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs))
                   .then(rest => {
                     this.tableLoading = false
-                    this.pendingRecords = this.pendingRecords.filter(row => removeRecords.indexOf(row) === -1)
+                    $xetable.setPendingRow(removeRecords, false)
                     if (isMsg) {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -671,7 +657,7 @@ export default {
         case 'save': {
           const ajaxMethods = ajax.save
           if (ajaxMethods) {
-            const body = Object.assign({ pendingRecords: this.pendingRecords }, this.getRecordset())
+            const body = this.getRecordset()
             const { insertRecords, removeRecords, updateRecords, pendingRecords } = body
             const applyArgs = [{ $grid: this, code, button, body, form: formData, options: ajaxMethods }].concat(args)
             // 排除掉新增且标记为删除的数据
@@ -697,7 +683,7 @@ export default {
                 return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs))
                   .then(rest => {
                     this.tableLoading = false
-                    this.pendingRecords = []
+                    $xetable.clearPendingRow()
                     if (isMsg) {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -802,9 +788,6 @@ export default {
       }, { children: 'children' })
       return XEUtils.isUndefined(itemIndex) ? itemList : itemList[itemIndex]
     },
-    getPendingRecords () {
-      return this.pendingRecords
-    },
     triggerToolbarCommitEvent (params, evnt) {
       const { code } = params
       return this.commitProxy(params, evnt).then((rest) => {
@@ -822,23 +805,10 @@ export default {
       this.$emit('toolbar-tool-click', { code: tool.code, tool, $grid: this, $event: evnt })
     },
     triggerPendingEvent (code) {
-      const { pendingRecords, isMsg } = this
+      const { isMsg } = this
       const selectRecords = this.getCheckboxRecords()
       if (selectRecords.length) {
-        const plus = []
-        const minus = []
-        selectRecords.forEach(data => {
-          if (pendingRecords.some(item => data === item)) {
-            minus.push(data)
-          } else {
-            plus.push(data)
-          }
-        })
-        if (minus.length) {
-          this.pendingRecords = pendingRecords.filter(item => minus.indexOf(item) === -1).concat(plus)
-        } else if (plus.length) {
-          this.pendingRecords = pendingRecords.concat(plus)
-        }
+        this.togglePendingRow(selectRecords)
         this.clearCheckboxRow()
       } else {
         if (isMsg) {
@@ -946,7 +916,8 @@ export default {
       return this.$nextTick().then(() => this.recalculate(true)).then(() => this.isZMax)
     },
     getProxyInfo () {
-      const { sortData, proxyConfig } = this
+      const { $refs, sortData, proxyConfig } = this
+      const $xetable = $refs.xTable
       if (proxyConfig) {
         return {
           data: this.tableData,
@@ -955,7 +926,7 @@ export default {
           sort: sortData.length ? sortData[0] : {},
           sorts: sortData,
           pager: this.tablePage,
-          pendingRecords: this.pendingRecords
+          pendingRecords: $xetable ? $xetable.getPendingRecords() : []
         }
       }
       return null

package/packages/pulldown/src/pulldown.js

@@ -56,9 +56,11 @@ export default {
     GlobalEvent.off(this, 'blur')
   },
   render (h) {
-    const { $scopedSlots, inited, className, popupClassName, vSize, destroyOnClose, transfer, isActivated, disabled, animatVisible, visiblePanel, panelStyle, panelPlacement } = this
+    const { _e, $scopedSlots, inited, className, popupClassName, vSize, destroyOnClose, transfer, isActivated, disabled, animatVisible, visiblePanel, panelStyle, panelPlacement } = this
     const defaultSlot = $scopedSlots.default
-    const downSlot = $scopedSlots.dropdown
+    const headerSlot = $scopedSlots.header
+    const footerSlot = $scopedSlots.footer
+    const dropdownSlot = $scopedSlots.dropdown
     return h('div', {
       class: ['vxe-pulldown', className ? (XEUtils.isFunction(className) ? className({ $pulldown: this }) : className) : '', {
         [`size--${vSize}`]: vSize,
@@ -83,11 +85,21 @@ export default {
           placement: panelPlacement
         },
         style: panelStyle
-      }, downSlot ? [
+      }, [
         h('div', {
-          class: 'vxe-pulldown--wrapper'
-        }, !inited || (destroyOnClose && !visiblePanel && !animatVisible) ? [] : downSlot.call(this, { $pulldown: this }, h))
-      ] : [])
+          class: 'vxe-pulldown--panel-wrapper'
+        }, !inited || (destroyOnClose && !visiblePanel && !animatVisible) ? [] : [
+          headerSlot ? h('div', {
+            class: 'vxe-pulldown--panel-header'
+          }, headerSlot.call(this, { $pulldown: this })) : _e(),
+          h('div', {
+            class: 'vxe-pulldown--panel-body'
+          }, dropdownSlot ? dropdownSlot.call(this, { $pulldown: this }, h) : []),
+          footerSlot ? h('div', {
+            class: 'vxe-pulldown--panel-footer'
+          }, footerSlot.call(this, { $pulldown: this })) : _e()
+        ])
+      ])
     ])
   },
   methods: {