vxe-table 4.6.15 → 4.6.16

package/lib/tools/log.js

@@ -9,7 +9,7 @@ exports.warnLog = void 0;
 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.6.15"}] ${_conf.default.i18n(message, params)}`;
+  return `[vxe-table v${"4.6.16"}] ${_conf.default.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {

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,o){return"[vxe-table v4.6.15] "+_conf.default.i18n(e,o)}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}const warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");
+"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,o){return"[vxe-table v4.6.16] "+_conf.default.i18n(e,o)}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}const warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");

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

@@ -220,7 +220,7 @@ function setIcon(options) {
 const globalStore = exports.globalStore = {};
 const VXETable = exports.VXETable = {
   v,
-  version: "4.6.15",
+  version: "4.6.16",
   setConfig,
   setIcon,
   globalStore,

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,setConfig:!0,globalConfs:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,VXETable:!0,VxeUI:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.setConfig=exports.globalStore=exports.globalConfs=exports.default=exports.config=void 0,exports.setIcon=setIcon,exports.setup=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./src/conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_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")),_hooks=(Object.keys(_validators).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_validators[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _validators[e]}})}),require("./src/hooks")),_theme=(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]}})}),require("./src/theme")),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,o){const r=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==o||r.push(t)}),r}const 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):""}const setConfig=e=>(e&&(e.theme&&(0,_theme.setTheme)(e),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VXETable);exports.setConfig=setConfig;class VXETableConfig{get zIndex(){return(0,_utils.getLastZIndex)()}get nextZIndex(){return(0,_utils.nextZIndex)()}get exportTypes(){return getExportOrImpotType(_conf.default.export.types,1)}get importTypes(){return getExportOrImpotType(_conf.default.export.types,2)}}const globalConfs=exports.globalConfs=new VXETableConfig,v=exports.v="v4",setup=e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default),config=(exports.setup=setup,e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default));function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VXETable}exports.config=config;const globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"4.6.15",setConfig:setConfig,setIcon:setIcon,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,validators:_validators.validators,menus:_menus.menus,hooks:_hooks.hooks,use:use,t:t,_t:_t,config:config,setup:setup,globalConfs:globalConfs},VxeUI=exports.VxeUI=VXETable;(0,_theme.setTheme)(globalStore);var _default=exports.default=VXETable;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,setConfig:!0,globalConfs:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,VXETable:!0,VxeUI:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.setConfig=exports.globalStore=exports.globalConfs=exports.default=exports.config=void 0,exports.setIcon=setIcon,exports.setup=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./src/conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_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")),_hooks=(Object.keys(_validators).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_validators[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _validators[e]}})}),require("./src/hooks")),_theme=(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]}})}),require("./src/theme")),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,o){const r=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==o||r.push(t)}),r}const 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):""}const setConfig=e=>(e&&(e.theme&&(0,_theme.setTheme)(e),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VXETable);exports.setConfig=setConfig;class VXETableConfig{get zIndex(){return(0,_utils.getLastZIndex)()}get nextZIndex(){return(0,_utils.nextZIndex)()}get exportTypes(){return getExportOrImpotType(_conf.default.export.types,1)}get importTypes(){return getExportOrImpotType(_conf.default.export.types,2)}}const globalConfs=exports.globalConfs=new VXETableConfig,v=exports.v="v4",setup=e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default),config=(exports.setup=setup,e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default));function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VXETable}exports.config=config;const globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"4.6.16",setConfig:setConfig,setIcon:setIcon,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,validators:_validators.validators,menus:_menus.menus,hooks:_hooks.hooks,use:use,t:t,_t:_t,config:config,setup:setup,globalConfs:globalConfs},VxeUI=exports.VxeUI=VXETable;(0,_theme.setTheme)(globalStore);var _default=exports.default=VXETable;

package/package.json

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

package/packages/form/src/form.ts

@@ -1,4 +1,4 @@
-import { defineComponent, h, ref, Ref, createCommentVNode, provide, computed, inject, reactive, watch, nextTick, PropType, onMounted } from 'vue'
+import { defineComponent, h, ref, Ref, createCommentVNode, provide, computed, inject, reactive, watch, nextTick, PropType } from 'vue'
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
@@ -642,17 +642,6 @@ export default defineComponent({
       reactData.collapseAll = !!value
     })
 
-    onMounted(() => {
-      nextTick(() => {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-          if (props.customLayout && props.items) {
-            errLog('vxe.error.errConflicts', ['custom-layout', 'items'])
-          }
-        }
-        loadItem(props.items || [])
-      })
-    })
-
     const renderVN = () => {
       const { loading, className, data, customLayout } = props
       const { formItems } = reactData
@@ -700,6 +689,10 @@ export default defineComponent({
 
     $xeform.renderVN = renderVN
 
+    if (props.items) {
+      loadItem(props.items)
+    }
+
     provide('$xeform', $xeform)
     provide('$xeformgather', null)
     provide('$xeformitem', null)