vxe-table 4.19.21 → 4.19.22

package/lib/index.umd.js

@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "4.19.21";
+const version = "4.19.22";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4101,7 +4101,7 @@ function wheelScrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"4.19.21"}`;
+const tableVersion = `table v${"4.19.22"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -7760,7 +7760,7 @@ const tableEmits = ['ready', 'init-rendered', 'data-rendered', 'update:data', 'k
 // 废弃
 'column-resizable-change', 'row-resizable-change', 'toggle-row-group-expand', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'row-dragstart', 'row-dragover', 'row-dragend', 'row-remove-dragend', 'row-insert-dragend', 'column-dragstart', 'column-dragover', 'column-dragend', 'enter-append-row', 'tab-append-row', 'edit-actived',
 // 废弃
-'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'scroll-boundary', 'custom', 'custom-visible-change', 'custom-visible-all', 'custom-fixed-change', 'custom-sort-change', 'change-fnr',
+'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'scroll-boundary', 'custom', 'custom-open', 'custom-close', 'custom-cancel', 'custom-reset', 'custom-confirm', 'custom-visible-change', 'custom-visible-all', 'custom-fixed-change', 'custom-sort-change', 'change-fnr',
 // 废弃
 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-selection', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-extension-fill', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'cell-area-fill-copy', 'active-cell-change-start', 'active-cell-change-end'];
 ;// ./packages/grid/src/emits.ts
@@ -9981,13 +9981,16 @@ function panel_createInternalData() {
       $xeTable.saveCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', $event);
+      $xeTable.dispatchEvent('custom-confirm', {}, $event);
       $xeTable.emitCustomEvent('close', $event);
+      $xeTable.dispatchEvent('custom-close', {}, $event);
     };
     const cancelCloseEvent = ({
       $event
     }) => {
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('close', $event);
+      $xeTable.dispatchEvent('custom-close', {}, $event);
     };
     const cancelCustomEvent = ({
       $event
@@ -9995,13 +9998,17 @@ function panel_createInternalData() {
       $xeTable.cancelCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', $event);
+      $xeTable.dispatchEvent('custom-cancel', {}, $event);
       $xeTable.emitCustomEvent('close', $event);
+      $xeTable.dispatchEvent('custom-close', {}, $event);
     };
     const handleResetCustomEvent = evnt => {
       $xeTable.resetCustom(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
+      $xeTable.dispatchEvent('custom-reset', {}, evnt);
       $xeTable.emitCustomEvent('close', evnt);
+      $xeTable.dispatchEvent('custom-close', {}, evnt);
     };
     const resetCustomEvent = ({
       $event
@@ -14227,7 +14234,6 @@ edit_hook_hooks.add('tableEditModule', {
         return handleInsertRowAt(records, targetRowOrRowid, true);
       },
       insertChild(records, parentRowOrParentId) {
-        window.aa = internalData;
         return handleInsertChildRowAt(records, parentRowOrParentId, null);
       },
       insertChildAt(records, parentRowOrParentId, targetRow) {
@@ -18441,7 +18447,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       }
       return openCustom();
     };
-    const saveCustom = () => {
+    const saveCustom = isDirectly => {
       const {
         customColumnList,
         aggHandleFields,
@@ -18456,34 +18462,36 @@ core_.VxeUI.hooks.add('tableCustomModule', {
         allowGroup,
         allowValues
       } = customOpts;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parentColumn) => {
-        if (parentColumn) {
-          // 更新子列信息
-          column.fixed = parentColumn.fixed;
-        } else {
-          if (allowSort) {
-            const sortIndex = index + 1;
-            column.renderSortNumber = sortIndex;
-          }
-          if (allowFixed) {
-            column.fixed = column.renderFixed;
+      if (!isDirectly) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parentColumn) => {
+          if (parentColumn) {
+            // 更新子列信息
+            column.fixed = parentColumn.fixed;
+          } else {
+            if (allowSort) {
+              const sortIndex = index + 1;
+              column.renderSortNumber = sortIndex;
+            }
+            if (allowFixed) {
+              column.fixed = column.renderFixed;
+            }
           }
-        }
-        if (allowResizable) {
-          if (column.renderVisible && (!column.children || !column.children.length)) {
-            if (column.renderResizeWidth !== column.renderWidth) {
-              column.resizeWidth = column.renderResizeWidth;
-              column.renderWidth = column.renderResizeWidth;
+          if (allowResizable) {
+            if (column.renderVisible && (!column.children || !column.children.length)) {
+              if (column.renderResizeWidth !== column.renderWidth) {
+                column.resizeWidth = column.renderResizeWidth;
+                column.renderWidth = column.renderResizeWidth;
+              }
             }
           }
-        }
-        if (allowVisible) {
-          column.visible = column.renderVisible;
-        }
-        if (allowGroup && allowValues) {
-          column.aggFunc = column.renderAggFn;
-        }
-      });
+          if (allowVisible) {
+            column.visible = column.renderVisible;
+          }
+          if (allowGroup && allowValues) {
+            column.aggFunc = column.renderAggFn;
+          }
+        });
+      }
       reactData.isCustomStatus = true;
       if (allowGroup && !!$xeTable.handlePivotTableAggData) {
         if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
@@ -18726,10 +18734,12 @@ core_.VxeUI.hooks.add('tableCustomModule', {
         if (customStore.visible) {
           closeCustom();
           emitCustomEvent('close', evnt);
+          $xeTable.dispatchEvent('custom-close', {}, evnt);
         } else {
           customStore.btnEl = evnt.target;
           openCustom();
           emitCustomEvent('open', evnt);
+          $xeTable.dispatchEvent('custom-open', {}, evnt);
         }
       },
       customOpenEvent(evnt) {
@@ -18742,6 +18752,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
           customStore.btnEl = evnt.target;
           $xeTable.openCustom();
           $xeTable.emitCustomEvent('open', evnt);
+          $xeTable.dispatchEvent('custom-open', {}, evnt);
         }
       },
       customCloseEvent(evnt) {
@@ -18753,6 +18764,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
           customStore.activeBtn = false;
           $xeTable.closeCustom();
           $xeTable.emitCustomEvent('close', evnt);
+          $xeTable.dispatchEvent('custom-close', {}, evnt);
         }
       },
       handleUpdateCustomColumn,
@@ -21414,8 +21426,8 @@ if(editMode!=='insert'){isClearValue=true;}$xeTable.handleEdit(params,evnt,{isCl
 if(showAll){// 如果为 null 默认显示
 if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent)){isShow=true;content=cellText;}else if(customContent!==''&&customContent!==false){// 如果为 '' | false 则不显示
 isShow=true;content=''+customContent;}}else{// 如果为 null 使用默认逻辑
-if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent)){isShow=isOver;}else if(customContent!==''&&customContent!==false){// 如果为 '' | false 则不显示
-isShow=true;}content=cellText;}if(isShow&&content){const tipContent=formatText(content);Object.assign(tooltipStore,{row,column,visible:true,content:tipContent,type,currOpts:tipOpts});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{const $tooltip=refTooltip.value;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();};const truncateStackHistory=()=>{const{stackHistoryStore}=internalData;const{undoStacks}=stackHistoryStore;const undoRedoHistoryOpts=computeUndoRedoHistoryOpts.value;const{stackSize}=undoRedoHistoryOpts;if(undoStacks.length>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(stackSize)){undoStacks.shift();}};/**
+if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent)){isShow=isOver;content=cellText;}else if(customContent!==''&&customContent!==false){// 如果为 '' | false 则不显示
+isShow=true;content=customContent;}else{content=cellText;}}if(isShow&&content){const tipContent=formatText(content);Object.assign(tooltipStore,{row,column,visible:true,content:tipContent,type,currOpts:tipOpts});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{const $tooltip=refTooltip.value;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();};const truncateStackHistory=()=>{const{stackHistoryStore}=internalData;const{undoStacks}=stackHistoryStore;const undoRedoHistoryOpts=computeUndoRedoHistoryOpts.value;const{stackSize}=undoRedoHistoryOpts;if(undoStacks.length>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(stackSize)){undoStacks.shift();}};/**
          * 生成快照数据
          */const getSnapshotStackData=()=>{const{editStore}=reactData;const{afterFullData,elemStore,insertRowMaps,removeRowMaps}=internalData;const{selected,actived}=editStore;const{row:selectRow,column:selectColumn}=selected;const{row:editRow,column:editColumn}=actived;const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);const stackObj={selectActiveInfo:selectRow&&selectColumn?{rowid:getRowid($xeTable,selectRow),colid:selectColumn.id}:undefined,editActiveInfo:editRow&&editColumn?{rowid:getRowid($xeTable,editRow),colid:editColumn.id}:undefined,scrollInfo:{top:bodyScrollElem?bodyScrollElem.scrollTop:0,left:bodyScrollElem?bodyScrollElem.scrollLeft:0},insertData:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().values(insertRowMaps),true),removeData:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().values(removeRowMaps),true),visibleData:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(afterFullData,true),visibleTreeData:[],visibleColumn:[]};return $xeTable.getCellAreaPushStackObj?$xeTable.getCellAreaPushStackObj(stackObj):stackObj;};/**
          * 刷新栈视图
@@ -24834,6 +24846,10 @@ const Toolbar = VxeToolbar;
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    iconPicker: {
+      search: '搜索',
+      emptyText: '暂无数据'
+    },
     datePicker: {
       yearTitle: '{0} 年'
     },