vxe-table 4.2.7-beta.2 → 4.2.7-beta.3

package/lib/tools/log.js

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

package/lib/tools/log.min.js

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

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

@@ -212,7 +212,7 @@ var v = 'v4';
 exports.v = v;
 var VXETable = {
   v: v,
-  version: "4.2.7-beta.2",
+  version: "4.2.7-beta.3",
   setup: _setup.setup,
   interceptor: _interceptor.interceptor,
   renderer: _renderer.renderer,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("./src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _hooks=require("./src/hooks");Object.keys(_hooks).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}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):""}var VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig;exports.config=config;var v="v4",VXETable={v:exports.v=v,version:"4.2.7-beta.2",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("./src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _hooks=require("./src/hooks");Object.keys(_hooks).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}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):""}var VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig;exports.config=config;var v="v4",VXETable={v:exports.v=v,version:"4.2.7-beta.3",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;

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

@@ -35,14 +35,19 @@ function () {
   };
 
   Store.prototype.add = function (name, render) {
-    // 检测是否覆盖
+    var conf = this.store[name]; // 检测是否覆盖
+
     if (process.env.NODE_ENV === 'development') {
-      if (!_xeUtils.default.eqNull(this.store[name]) && this.store[name] !== render) {
-        (0, _log.warnLog)('vxe.error.coverProp', [this._name, name]);
-      }
+      var confKeys_1 = _xeUtils.default.keys(conf);
+
+      _xeUtils.default.each(render, function (item, key) {
+        if (confKeys_1.includes(key)) {
+          (0, _log.warnLog)('vxe.error.coverProp', [name, key]);
+        }
+      });
     }
 
-    this.store[name] = render;
+    this.store[name] = conf ? _xeUtils.default.merge(conf, render) : render;
     return this;
   };
 

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Store=void 0;var _log=require("../../tools/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}var Store=function(){function t(){this.store={}}return t.prototype.mixin=function(t){return Object.assign(this.store,t),this},t.prototype.has=function(t){return!!this.get(t)},t.prototype.get=function(t){return this.store[t]},t.prototype.add=function(t,e){return"development"===process.env.NODE_ENV&&(_xeUtils.default.eqNull(this.store[t])||this.store[t]===e||(0,_log.warnLog)("vxe.error.coverProp",[this._name,t])),this.store[t]=e,this},t.prototype.delete=function(t){delete this.store[t]},t.prototype.forEach=function(t){_xeUtils.default.objectEach(this.store,t)},t}(),_default=exports.Store=Store;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Store=void 0;var _log=require("../../tools/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Store=function(){function e(){this.store={}}return e.prototype.mixin=function(e){return Object.assign(this.store,e),this},e.prototype.has=function(e){return!!this.get(e)},e.prototype.get=function(e){return this.store[e]},e.prototype.add=function(o,e){var r,t=this.store[o];return"development"===process.env.NODE_ENV&&(r=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){r.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[o,t])})),this.store[o]=t?_xeUtils.default.merge(t,e):e,this},e.prototype.delete=function(e){delete this.store[e]},e.prototype.forEach=function(e){_xeUtils.default.objectEach(this.store,e)},e}(),_default=exports.Store=Store;exports.default=_default;

package/package.json

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

package/packages/edit/src/hook.ts

@@ -669,18 +669,21 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         const { editRender } = column
         if (isEnableConf(editRender)) {
           const compRender = renderer.get(editRender.name)
-          const { autofocus, autoselect } = editRender
+          let { autofocus, autoselect } = editRender
           let inputElem
+          if (!autofocus && compRender) {
+            autofocus = compRender.autofocus
+          }
           // 如果指定了聚焦 class
-          if (autofocus) {
+          if (XEUtils.isFunction(autofocus)) {
+            inputElem = autofocus.call(this, params)
+          } else if (autofocus) {
             inputElem = cell.querySelector(autofocus)
-          }
-          // 渲染器的聚焦处理
-          if (!inputElem && compRender && compRender.autofocus) {
-            inputElem = cell.querySelector(compRender.autofocus)
+            if (inputElem) {
+              inputElem.focus()
+            }
           }
           if (inputElem) {
-            inputElem.focus()
             if (autoselect) {
               inputElem.select()
             } else {

package/packages/filter/src/panel.ts

@@ -220,7 +220,6 @@ export default defineComponent({
         class: [
           'vxe-table--filter-wrapper',
           'filter--prevent-default',
-          compConf && compConf.className ? compConf.className : '',
           getPropClass(filterClassName, params),
           {
             'is--animat': $xetable.props.animat,

package/packages/v-x-e-table/src/store.ts

@@ -21,13 +21,17 @@ export class Store {
   }
 
   add (name: string, render: any): Store {
+    const conf = this.store[name]
     // 检测是否覆盖
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      if (!XEUtils.eqNull(this.store[name]) && this.store[name] !== render) {
-        warnLog('vxe.error.coverProp', [(this as any)._name, name])
-      }
+      const confKeys = XEUtils.keys(conf)
+      XEUtils.each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          warnLog('vxe.error.coverProp', [name, key])
+        }
+      })
     }
-    this.store[name] = render
+    this.store[name] = conf ? XEUtils.merge(conf, render) : render
     return this
   }
 

package/types/v-x-e-table/renderer.d.ts

@@ -30,7 +30,7 @@ export interface DefineRendererOption<T> {
   footerExportMethod?(params: VxeGlobalRendererHandles.FooterExportMethodParams): string
 
   // 编辑渲染
-  autofocus?: string
+  autofocus?: string | ((params: VxeGlobalRendererHandles.RenderEditParams | VxeGlobalRendererHandles.RenderCellParams) => HTMLElement | null)
   renderEdit?(renderOpts: VxeGlobalRendererHandles.RenderEditOptions, params: VxeGlobalRendererHandles.RenderEditParams): T
   renderCell?(renderOpts: VxeGlobalRendererHandles.RenderCellOptions, params: VxeGlobalRendererHandles.RenderCellParams): T