vxe-table 4.2.0-beta.4 → 4.2.0

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

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { defineComponent, h, onUnmounted, inject, ref, onMounted, reactive } from 'vue';
+import { defineComponent, h, onUnmounted, inject, ref, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
@@ -42,7 +42,7 @@ export default defineComponent({
         var refElem = ref();
         var $xeform = inject('$xeform', {});
         var formGather = inject('xeformgather', null);
-        var formItem = reactive(createItem($xeform, props));
+        var formItem = createItem($xeform, props);
         formItem.slots = slots;
         watchItem(props, formItem);
         onMounted(function () {

package/es/form/src/form.js

@@ -636,6 +636,7 @@ export default defineComponent({
             var _a;
             var loading = props.loading, className = props.className, data = props.data, titleColon = props.titleColon, titleAsterisk = props.titleAsterisk, customLayout = props.customLayout;
             var formItems = reactData.formItems;
+            // const formItems: any[] = []
             var vSize = computeSize.value;
             var tooltipOpts = computeTooltipOpts.value;
             var defaultSlot = slots.default;

package/es/table/src/table.js

@@ -5400,12 +5400,18 @@ export default defineComponent({
                 nextTick(updateStyle);
             },
             updateScrollXData: function () {
-                handleTableColumn();
-                tablePrivateMethods.updateScrollXSpace();
+                reactData.tableColumn = [];
+                nextTick(function () {
+                    handleTableColumn();
+                    tablePrivateMethods.updateScrollXSpace();
+                });
             },
             updateScrollYData: function () {
-                tablePrivateMethods.handleTableData();
-                tablePrivateMethods.updateScrollYSpace();
+                reactData.tableData = [];
+                nextTick(function () {
+                    tablePrivateMethods.handleTableData();
+                    tablePrivateMethods.updateScrollYSpace();
+                });
             },
             /**
              * 处理固定列的显示状态
@@ -5723,13 +5729,13 @@ export default defineComponent({
                 var rowOpts = computeRowOpts.value;
                 if (process.env.NODE_ENV === 'development') {
                     // if (props.rowId) {
-                    //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+                    //   warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
                     // }
                     // if (props.rowKey) {
-                    //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+                    //   warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
                     // }
                     // if (props.columnKey) {
-                    //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+                    //   warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
                     // }
                     if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
                         warnLog('vxe.error.reqProp', ['row-config.keyField']);
@@ -5746,6 +5752,18 @@ export default defineComponent({
                     if (props.showFooter && !props.footerMethod) {
                         warnLog('vxe.error.reqProp', ['footer-method']);
                     }
+                    // if (props.highlightCurrentRow) {
+                    //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
+                    // }
+                    // if (props.highlightHoverRow) {
+                    //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
+                    // }
+                    // if (props.highlightCurrentColumn) {
+                    //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
+                    // }
+                    // if (props.highlightHoverColumn) {
+                    //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
+                    // }
                     // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
                     var exportConfig = props.exportConfig, importConfig = props.importConfig;
                     var exportOpts = computeExportOpts.value;

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + "4.2.0-beta.4" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.0" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

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

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.0-beta.4",
+    version: "4.2.0",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

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

@@ -67,7 +67,7 @@ var GlobalConfig = {
             parentField: 'parentId',
             children: 'children',
             hasChild: 'hasChild',
-            mapChildren: '_X_CHILD',
+            mapChildren: '_X_ROW_CHILD',
             indent: 20,
             showIcon: true
         },

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

@@ -73,7 +73,7 @@ var _default = (0, _vue.defineComponent)({
     var refElem = (0, _vue.ref)();
     var $xeform = (0, _vue.inject)('$xeform', {});
     var formGather = (0, _vue.inject)('xeformgather', null);
-    var formItem = (0, _vue.reactive)((0, _util.createItem)($xeform, props));
+    var formItem = (0, _util.createItem)($xeform, props);
     formItem.slots = slots;
     (0, _util.watchItem)(props, formItem);
     (0, _vue.onMounted)(function () {

package/lib/form/src/form-item.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var t=t.slots,F=(0,_vue.ref)(),i=(0,_vue.inject)("$xeform",{}),l=(0,_vue.inject)("xeformgather",null),r=(0,_vue.reactive)((0,_util.createItem)(i,e));r.slots=t,(0,_util.watchItem)(e,r),(0,_vue.onMounted)(function(){(0,_util.assemItem)(i,F.value,r,l)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(i,r)});return function(){var e=i?i.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.visibleMethod,c=e.field,_=e.collapseNode,p=e.itemRender,g=e.showError,x=e.errRule,h=e.className,b=e.titleOverflow,O=(0,_utils.isEnableConf)(p)?_vXETable.VXETable.renderer.get(p.name):null,I=a?a.default:null,M=a?a.title:null,q=e.span||i.span,N=e.align||i.align,y=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?o:b,i="title"===a,o=!0===a||"tooltip"===a,b=i||o||"ellipsis"===a,a=m,S={data:r,property:c,item:e,$form:t},m=!1;!n||(w=n[c])&&(m=w.some(function(e){return e.required})),!a&&O&&O.itemVisibleMethod&&(a=O.itemVisibleMethod);var w=[];I?w=t.callSlot(I,S):O&&O.renderItemContent?w=O.renderItemContent(p,S):c&&(w=[""+_xeUtils.default.get(r,c)]),_&&w.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),x&&s.showMessage&&w.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:x.maxWidth+"px"}:null},x.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,S)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:F,class:["vxe-form--item",e.id,q?"vxe-col--"+q+" is--span":"",h?_xeUtils.default.isFunction(h)?h(S):h:"",{"is--title":f,"is--required":m,"is--hidden":!1===d||v&&u,"is--active":!a||a(S),"is--error":g}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||M?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",y?"align--"+y:null,{"is--ellipsis":b}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",N?"align--"+N:null]},w)])])}(i,r):(0,_vue.h)("div",{ref:F})}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var t=t.slots,F=(0,_vue.ref)(),i=(0,_vue.inject)("$xeform",{}),l=(0,_vue.inject)("xeformgather",null),r=(0,_util.createItem)(i,e);r.slots=t,(0,_util.watchItem)(e,r),(0,_vue.onMounted)(function(){(0,_util.assemItem)(i,F.value,r,l)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(i,r)});return function(){var e=i?i.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.visibleMethod,c=e.field,_=e.collapseNode,p=e.itemRender,g=e.showError,x=e.errRule,h=e.className,b=e.titleOverflow,O=(0,_utils.isEnableConf)(p)?_vXETable.VXETable.renderer.get(p.name):null,I=a?a.default:null,M=a?a.title:null,q=e.span||i.span,N=e.align||i.align,y=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?o:b,i="title"===a,o=!0===a||"tooltip"===a,b=i||o||"ellipsis"===a,a=m,S={data:r,property:c,item:e,$form:t},m=!1;!n||(w=n[c])&&(m=w.some(function(e){return e.required})),!a&&O&&O.itemVisibleMethod&&(a=O.itemVisibleMethod);var w=[];I?w=t.callSlot(I,S):O&&O.renderItemContent?w=O.renderItemContent(p,S):c&&(w=[""+_xeUtils.default.get(r,c)]),_&&w.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),x&&s.showMessage&&w.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:x.maxWidth+"px"}:null},x.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,S)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:F,class:["vxe-form--item",e.id,q?"vxe-col--"+q+" is--span":"",h?_xeUtils.default.isFunction(h)?h(S):h:"",{"is--title":f,"is--required":m,"is--hidden":!1===d||v&&u,"is--active":!a||a(S),"is--error":g}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||M?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",y?"align--"+y:null,{"is--ellipsis":b}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",N?"align--"+N:null]},w)])])}(i,r):(0,_vue.h)("div",{ref:F})}}});exports.default=_default;

package/lib/form/src/form.js

@@ -889,7 +889,8 @@ var _default2 = (0, _vue.defineComponent)({
           titleColon = props.titleColon,
           titleAsterisk = props.titleAsterisk,
           customLayout = props.customLayout;
-      var formItems = reactData.formItems;
+      var formItems = reactData.formItems; // const formItems: any[] = []
+
       var vSize = computeSize.value;
       var tooltipOpts = computeTooltipOpts.value;
       var defaultSlot = slots.default;

package/lib/index.umd.js

@@ -8477,7 +8477,7 @@ var GlobalConfig = {
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
-      mapChildren: '_X_CHILD',
+      mapChildren: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -8754,7 +8754,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.0-beta.4", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.0", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10759,7 +10759,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.0-beta.4",
+  version: "4.2.0",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -29560,7 +29560,8 @@ function getResetValue(value, resetValue) {
           titleColon = props.titleColon,
           titleAsterisk = props.titleAsterisk,
           customLayout = props.customLayout;
-      var formItems = reactData.formItems;
+      var formItems = reactData.formItems; // const formItems: any[] = []
+
       var vSize = computeSize.value;
       var tooltipOpts = computeTooltipOpts.value;
       var defaultSlot = slots.default;
@@ -29658,7 +29659,7 @@ var formItemProps = {
     var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var $xeform = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xeform', {});
     var formGather = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('xeformgather', null);
-    var formItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])(createItem($xeform, props));
+    var formItem = createItem($xeform, props);
     formItem.slots = slots;
     watchItem(props, formItem);
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["onMounted"])(function () {
@@ -38896,12 +38897,18 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(updateStyle);
       },
       updateScrollXData: function updateScrollXData() {
-        handleTableColumn();
-        tablePrivateMethods.updateScrollXSpace();
+        reactData.tableColumn = [];
+        Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+          handleTableColumn();
+          tablePrivateMethods.updateScrollXSpace();
+        });
       },
       updateScrollYData: function updateScrollYData() {
-        tablePrivateMethods.handleTableData();
-        tablePrivateMethods.updateScrollYSpace();
+        reactData.tableData = [];
+        Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+          tablePrivateMethods.handleTableData();
+          tablePrivateMethods.updateScrollYSpace();
+        });
       },
 
       /**
@@ -39318,13 +39325,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
         if (true) {
           // if (props.rowId) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
           // }
           // if (props.rowKey) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
           // }
           // if (props.columnKey) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
           // }
           if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
             warnLog('vxe.error.reqProp', ['row-config.keyField']);
@@ -39344,7 +39351,19 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
           if (props.showFooter && !props.footerMethod) {
             warnLog('vxe.error.reqProp', ['footer-method']);
-          } // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
+          } // if (props.highlightCurrentRow) {
+          //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
+          // }
+          // if (props.highlightHoverRow) {
+          //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
+          // }
+          // if (props.highlightCurrentColumn) {
+          //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
+          // }
+          // if (props.highlightHoverColumn) {
+          //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
+          // }
+          // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
 
 
           var exportConfig = props.exportConfig,