vxe-table 4.2.8 → 4.3.0-beta.0

package/lib/index.umd.js

@@ -8456,14 +8456,14 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/conf.ts
-var iconPrefix = 'vxe-icon--';
+var iconPrefix = 'vxe-icon-';
 var GlobalConfig = {
   size: null,
   zIndex: 999,
   version: 0,
   // resizeInterval: 500,
   emptyCell: '　',
-  loadingText: null,
+  // loadingText: null, // 自定义loading提示内容，如果为null则不显示文本
   table: {
     fit: true,
     showHeader: true,
@@ -8582,65 +8582,65 @@ var GlobalConfig = {
   },
   icon: {
     // loading
-    // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
+    LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
     // table
-    TABLE_SORT_ASC: iconPrefix + 'caret-top',
-    TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
+    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-outline',
-    TABLE_HELP: iconPrefix + 'question',
-    TABLE_TREE_LOADED: iconPrefix + 'refresh roll',
+    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 + 'refresh roll',
+    TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
     // button
-    BUTTON_DROPDOWN: iconPrefix + 'arrow-bottom',
-    BUTTON_LOADING: iconPrefix + 'refresh roll',
+    BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
+    BUTTON_LOADING: iconPrefix + 'spinner roll',
     // select
-    SELECT_LOADED: iconPrefix + 'refresh roll',
-    SELECT_OPEN: iconPrefix + 'caret-bottom rotate180',
-    SELECT_CLOSE: iconPrefix + 'caret-bottom',
+    SELECT_LOADED: iconPrefix + 'spinner roll',
+    SELECT_OPEN: iconPrefix + 'caret-down rotate180',
+    SELECT_CLOSE: iconPrefix + 'caret-down',
     // pager
-    PAGER_JUMP_PREV: iconPrefix + 'd-arrow-left',
-    PAGER_JUMP_NEXT: iconPrefix + 'd-arrow-right',
+    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 + 'more',
+    PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
     // input
-    INPUT_CLEAR: iconPrefix + 'close',
-    INPUT_PWD: iconPrefix + 'eye-slash',
-    INPUT_SHOW_PWD: iconPrefix + 'eye',
-    INPUT_PREV_NUM: iconPrefix + 'caret-top',
-    INPUT_NEXT_NUM: iconPrefix + 'caret-bottom',
+    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
     MODAL_ZOOM_IN: iconPrefix + 'square',
-    MODAL_ZOOM_OUT: iconPrefix + 'zoomout',
+    MODAL_ZOOM_OUT: iconPrefix + 'maximize',
     MODAL_CLOSE: iconPrefix + 'close',
-    MODAL_INFO: iconPrefix + 'info',
-    MODAL_SUCCESS: iconPrefix + 'success',
-    MODAL_WARNING: iconPrefix + 'warning',
-    MODAL_ERROR: iconPrefix + 'error',
-    MODAL_QUESTION: iconPrefix + 'question',
-    MODAL_LOADING: iconPrefix + 'refresh roll',
+    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
-    TOOLBAR_TOOLS_REFRESH: iconPrefix + 'refresh',
-    TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'refresh 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_ZOOM_IN: iconPrefix + 'zoomin',
-    TOOLBAR_TOOLS_ZOOM_OUT: iconPrefix + 'zoomout',
-    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'menu',
+    TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
+    TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
+    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
     // form
-    FORM_PREFIX: iconPrefix + 'question',
-    FORM_SUFFIX: iconPrefix + 'question',
-    FORM_FOLDING: iconPrefix + 'arrow-top rotate180',
-    FORM_UNFOLDING: iconPrefix + 'arrow-top'
+    FORM_PREFIX: iconPrefix + 'question-circle-fill',
+    FORM_SUFFIX: iconPrefix + 'question-circle-fill',
+    FORM_FOLDING: iconPrefix + 'arrow-up rotate180',
+    FORM_UNFOLDING: iconPrefix + 'arrow-up'
   },
   grid: {
     // size: null,
@@ -8805,7 +8805,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.8", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.9-beta.1", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -9807,9 +9807,17 @@ function colToVisible($xetable, column) {
   return Promise.resolve();
 }
 // CONCATENATED MODULE: ./packages/tools/vn.ts
+
 function getOnName(type) {
   return 'on' + type.substring(0, 1).toLocaleUpperCase() + type.substring(1);
 }
+function getSlotVNs(vns) {
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(vns)) {
+    return vns;
+  }
+
+  return [vns];
+}
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/renderer.ts
 
 
@@ -10831,7 +10839,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.8",
+  version: "4.2.9-beta.1",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -12637,7 +12645,7 @@ var editHook = {
 
 
         if (actived.row && $xetable.findRowIndexOf(rows, actived.row) > -1) {
-          editMethods.clearActived();
+          editMethods.clearEdit();
         } // 从新增中移除已删除的数据
 
 
@@ -12944,7 +12952,6 @@ var editHook = {
        */
       setSelectCell: function setSelectCell(row, fieldOrColumn) {
         var tableData = reactData.tableData;
-        var visibleColumn = internalData.visibleColumn;
         var editOpts = computeEditOpts.value;
         var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(fieldOrColumn) ? $xetable.getColumnByField(fieldOrColumn) : fieldOrColumn;
 
@@ -12957,7 +12964,7 @@ var editHook = {
               row: row,
               rowIndex: rowIndex,
               column: column,
-              columnIndex: visibleColumn.indexOf(column),
+              columnIndex: $xetable.getColumnIndex(column),
               cell: cell
             };
             $xetable.handleSelected(params, {});
@@ -13006,7 +13013,7 @@ var editHook = {
               $xetable.closeTooltip();
 
               if (actived.column) {
-                editMethods.clearActived(evnt);
+                editMethods.clearEdit(evnt);
               }
 
               type = 'edit-actived';
@@ -13139,7 +13146,7 @@ var editHook = {
         var selectMethod = function selectMethod() {
           if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
             if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-              editMethods.clearActived(evnt);
+              editMethods.clearEdit(evnt);
               editMethods.clearSelected();
 
               if ($xetable.clearCellAreas) {
@@ -13801,6 +13808,7 @@ var Loading = Object.assign(src_loading, {
 
 
 
+
 
 
 var allActivedModals = [];
@@ -14758,9 +14766,9 @@ var msgQueue = [];
           title = props.title;
       var zoomLocat = reactData.zoomLocat;
       var titleSlot = slots.title || propSlots.title;
-      var titVNs = titleSlot ? titleSlot({
+      var titVNs = titleSlot ? getSlotVNs(titleSlot({
         $modal: $xemodal
-      }) : [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+      })) : [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
         class: 'vxe-modal--title'
       }, title ? getFuncText(title) : src_conf.i18n('vxe.alert.title'))];
 
@@ -14808,9 +14816,9 @@ var msgQueue = [];
             'is--draggable': draggable,
             'is--ellipsis': !isMsg && props.showTitleOverflow
           }]
-        }, headerOns), headerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : headerSlot({
+        }, headerOns), headerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : getSlotVNs(headerSlot({
           $modal: $xemodal
-        }) : renderTitles()));
+        })) : renderTitles()));
       }
 
       return headVNs;
@@ -14836,9 +14844,9 @@ var msgQueue = [];
 
       contVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-modal--content'
-      }, defaultSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : defaultSlot({
+      }, defaultSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : getSlotVNs(defaultSlot({
         $modal: $xemodal
-      }) : getFuncText(content)));
+      })) : getFuncText(content)));
 
       if (!isMsg) {
         /**
@@ -14886,9 +14894,9 @@ var msgQueue = [];
       if (props.showFooter) {
         footVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
           class: 'vxe-modal--footer'
-        }, footerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : footerSlot({
+        }, footerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : getSlotVNs(footerSlot({
           $modal: $xemodal
-        }) : renderBtns()));
+        })) : renderBtns()));
       }
 
       if (!isMsg && props.resize) {
@@ -17324,19 +17332,19 @@ var quarterSize = 8;
         }],
         onClick: datePrevEvent
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
-        class: 'vxe-icon--caret-left'
+        class: 'vxe-icon-caret-left'
       })]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
         class: 'vxe-input--date-picker-btn vxe-input--date-picker-current-btn',
         onClick: dateTodayMonthEvent
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
-        class: 'vxe-icon--dot'
+        class: 'vxe-icon-dot'
       })]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
         class: ['vxe-input--date-picker-btn vxe-input--date-picker-next-btn', {
           'is--disabled': isDisabledNextDateBtn
         }],
         onClick: dateNextEvent
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
-        class: 'vxe-icon--caret-right'
+        class: 'vxe-icon-caret-right'
       })]), multiple && computeSupportMultiples.value ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
         class: 'vxe-input--date-picker-btn vxe-input--date-picker-confirm-btn'
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('button', {
@@ -17873,6 +17881,7 @@ var es_promise_finally = __webpack_require__("a79d");
 
 
 
+
 
 
 function isOptionVisible(option) {
@@ -18019,7 +18028,7 @@ function getOptUniqueId() {
         }
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
-          return slotFunc(params);
+          return getSlotVNs(slotFunc(params));
         }
       }
 
@@ -23217,6 +23226,7 @@ dynamicApp.component(footer.name, footer);
 
 
 
+
 function renderHelpIcon(params) {
   var $table = params.$table,
       column = params.column;
@@ -23304,7 +23314,7 @@ function getFooterContent(params) {
     var compConf = VXETable.renderer.get(renderOpts.name);
 
     if (compConf && compConf.renderFooter) {
-      return compConf.renderFooter(renderOpts, params);
+      return getSlotVNs(compConf.renderFooter(renderOpts, params));
     }
   }
 
@@ -23411,11 +23421,11 @@ var Cell = {
       var compConf = VXETable.renderer.get(renderOpts.name);
 
       if (compConf && compConf.renderHeader) {
-        return renderTitleContent(params, compConf.renderHeader(renderOpts, params));
+        return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
       }
     }
 
-    return renderTitleContent(params, formatText(column.getTitle(), 1));
+    return renderTitleContent(params, [formatText(column.getTitle(), 1)]);
   },
   renderDefaultHeader: function renderDefaultHeader(params) {
     return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params));
@@ -23440,9 +23450,9 @@ var Cell = {
       var compFn = compConf ? compConf[funName] : null;
 
       if (compFn) {
-        return compFn(renderOpts, Object.assign({
+        return getSlotVNs(compFn(renderOpts, Object.assign({
           $type: editRender ? 'edit' : 'cell'
-        }, params));
+        }, params)));
       }
     }
 
@@ -23541,7 +23551,7 @@ var Cell = {
         column = params.column;
     var slots = column.slots;
     var headerSlot = slots ? slots.header : null;
-    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1));
+    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [formatText(column.getTitle(), 1)]);
   },
   renderSeqCell: function renderSeqCell(params) {
     var $table = params.$table,
@@ -23976,7 +23986,7 @@ var Cell = {
       var compConf = VXETable.renderer.get(contentRender.name);
 
       if (compConf && compConf.renderExpand) {
-        return compConf.renderExpand(contentRender, params);
+        return getSlotVNs(compConf.renderExpand(contentRender, params));
       }
     }
 
@@ -24160,9 +24170,13 @@ var Cell = {
         return $table.callSlot(editSlot, params);
       }
 
-      return compConf && compConf.renderEdit ? compConf.renderEdit(editRender, Object.assign({
-        $type: 'edit'
-      }, params)) : [];
+      if (compConf && compConf.renderEdit) {
+        return getSlotVNs(compConf.renderEdit(editRender, Object.assign({
+          $type: 'edit'
+        }, params)));
+      }
+
+      return [];
     }
 
     if (defaultSlot) {
@@ -24691,6 +24705,7 @@ var es_array_sort = __webpack_require__("4e82");
 
 
 
+
 
 
 var tableComponentPropKeys = Object.keys(src_props);
@@ -25956,7 +25971,7 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
           }
 
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
-            return slotFunc(params);
+            return getSlotVNs(slotFunc(params));
           }
         }
 
@@ -26133,6 +26148,7 @@ dynamicApp.component(grid.name, grid);
 
 
 
+
 /* harmony default export */ var toolbar = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeToolbar',
   props: {
@@ -26570,10 +26586,10 @@ dynamicApp.component(grid.name, grid);
       var buttonsSlot = slots.buttons;
 
       if (buttonsSlot) {
-        return buttonsSlot({
+        return getSlotVNs(buttonsSlot({
           $grid: $xegrid,
           $table: $xetable
-        });
+        }));
       }
 
       var btnVNs = [];
@@ -26632,10 +26648,10 @@ dynamicApp.component(grid.name, grid);
       var toolsSlot = slots.tools;
 
       if (toolsSlot) {
-        return toolsSlot({
+        return getSlotVNs(toolsSlot({
           $grid: $xegrid,
           $table: $xetable
-        });
+        }));
       }
 
       var btnVNs = [];
@@ -26866,7 +26882,7 @@ dynamicApp.component(grid.name, grid);
         onClick: refreshEvent
       }) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])(), zoom && $xegrid ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-button'), {
         circle: true,
-        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_ZOOM_OUT : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_ZOOM_IN,
+        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_MINIMIZE : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_FULLSCREEN,
         title: src_conf.i18n("vxe.toolbar.zoom".concat($xegrid.isMaximized() ? 'Out' : 'In')),
         onClick: zoomEvent
       }) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])(), custom ? renderCustoms() : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])()])]);
@@ -28238,6 +28254,8 @@ dynamicApp.component(modal.name, modal);
 
 
 
+
+
 /* harmony default export */ var tooltip = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeTooltip',
   props: {
@@ -28595,12 +28613,13 @@ dynamicApp.component(modal.name, modal);
     var renderContent = function renderContent() {
       var useHTML = props.useHTML;
       var tipContent = reactData.tipContent;
+      var contentSlot = slots.content;
 
-      if (slots.content) {
+      if (contentSlot) {
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
           key: 1,
           class: 'vxe-table--tooltip-content'
-        }, slots.content({}));
+        }, getSlotVNs(contentSlot({})));
       }
 
       if (useHTML) {
@@ -28626,6 +28645,7 @@ dynamicApp.component(modal.name, modal);
       var tipActive = reactData.tipActive,
           visible = reactData.visible,
           tipStore = reactData.tipStore;
+      var defaultSlot = slots.default;
       var vSize = computeSize.value;
       var ons;
 
@@ -28643,7 +28663,7 @@ dynamicApp.component(modal.name, modal);
       }, ons), [renderContent(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-table--tooltip-arrow',
         style: tipStore.arrowStyle
-      })].concat(slots.default ? slots.default({}) : []));
+      })].concat(_toConsumableArray(defaultSlot ? getSlotVNs(defaultSlot({})) : [])));
     };
 
     $xetooltip.renderVN = renderVN;
@@ -28899,6 +28919,7 @@ function renderTitle($xeform, item) {
 
 
 
+
 var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeFormConfigItem',
   props: {
@@ -29003,7 +29024,7 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
       if (defaultSlot) {
         contentVNs = $xeform.callSlot(defaultSlot, params);
       } else if (compConf && compConf.renderItemContent) {
-        contentVNs = compConf.renderItemContent(itemRender, params);
+        contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params));
       } else if (field) {
         contentVNs = [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field))];
       }
@@ -29102,6 +29123,7 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
 
 
 
+
 
 
 var form_Rule = /*#__PURE__*/function () {
@@ -29230,6 +29252,7 @@ function getResetValue(value, resetValue) {
       default: null
     },
     className: [String, Function],
+    readonly: Boolean,
     items: Array,
     rules: Object,
     preventSubmit: {
@@ -29303,7 +29326,7 @@ function getResetValue(value, resetValue) {
         }
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
-          return slotFunc(params);
+          return getSlotVNs(slotFunc(params));
         }
       }
 
@@ -29419,7 +29442,7 @@ function getResetValue(value, resetValue) {
                 $form: $xeform
               });
             } else if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : resetValue);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(resetValue, true));
             }
           }
         });
@@ -29890,6 +29913,7 @@ dynamicApp.component(src_form.name, src_form);
 
 
 
+
 var formItemProps = {
   title: String,
   field: String,
@@ -30015,7 +30039,7 @@ var formItemProps = {
       if (defaultSlot) {
         contentVNs = $xeform.callSlot(defaultSlot, params);
       } else if (compConf && compConf.renderItemContent) {
-        contentVNs = compConf.renderItemContent(itemRender, params);
+        contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params));
       } else if (field) {
         contentVNs = ["".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field))];
       }
@@ -32920,6 +32944,7 @@ dynamicApp.component(header.name, header);
 
 
 
+
 
 
 var isWebkit = browse['-webkit'] && !browse.edge;
@@ -38023,7 +38048,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                   if (isClear || // 如果点击了当前表格之外
                   !getEventTargetNode(evnt, el).flag) {
                     setTimeout(function () {
-                      return $xetable.clearActived(evnt);
+                      return $xetable.clearEdit(evnt);
                     });
                   }
                 });
@@ -38115,7 +38140,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
                 var params = actived.args;
-                $xetable.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+                $xetable.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
 
                 if (mouseOpts.selected) {
                   Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -38203,7 +38228,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
                 var _params = actived.args;
-                $xetable.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+                $xetable.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
 
                 if (mouseOpts.selected) {
                   Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -38242,7 +38267,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
                 params = actived.args;
-                $xetable.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+                $xetable.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
 
                 if (mouseOpts.selected) {
                   Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -38538,7 +38563,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           }
 
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
-            return slotFunc(params);
+            return getSlotVNs(slotFunc(params));
           }
         }
 
@@ -39001,7 +39026,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 })) {
                   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, checkField, value);
                   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeIndeterminates, function (half) {
-                    return half === item;
+                    return $xetable.eqRow(half, item);
                   });
                   handleCheckboxReserveRow(row, value);
                 }
@@ -39067,12 +39092,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                     selection.push(item);
                   } else {
                     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(selection, function (select) {
-                      return select === item;
+                      return $xetable.eqRow(select, item);
                     });
                   }
 
                   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeIndeterminates, function (half) {
-                    return half === item;
+                    return $xetable.eqRow(half, item);
                   });
                   handleCheckboxReserveRow(row, value);
                 }