vxe-table 3.21.21 → 3.21.22

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.21";
+const version = "3.21.22";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4074,7 +4074,7 @@ function wheelScrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.21.21"}`;
+const tableVersion = `table v${"3.21.22"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -7885,8 +7885,8 @@ remainList.forEach(column=>{const width=Math.max(meanWidth,minCellWidth);column.
 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});$xeTable.$nextTick(()=>{const $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return $xeTable.$nextTick();}function handleScrollToRowColumn($xeTable,fieldOrColumn,row,options){const internalData=$xeTable;const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,options?options.colAlign!==false:true,column,row);}return $xeTable.$nextTick();}function handleRowExpandReserve($xeTable,row,expanded){const internalData=$xeTable;const{rowExpandedReserveRowMap}=internalData;const expandOpts=$xeTable.computeExpandOpts;if(expandOpts.reserve){const rowid=getRowid($xeTable,row);if(expanded){rowExpandedReserveRowMap[rowid]=row;}else if(rowExpandedReserveRowMap[rowid]){delete rowExpandedReserveRowMap[rowid];}}}function handleDefaultMergeCells($xeTable){const props=$xeTable;const{mergeCells}=props;if(mergeCells){$xeTable.setMergeCells(mergeCells);}}function handleDefaultMergeHeaderItems($xeTable){const props=$xeTable;const{mergeHeaderCells}=props;if(mergeHeaderCells){$xeTable.setMergeHeaderCells(mergeHeaderCells);}}function handleDefaultMergeFooterItems($xeTable){const props=$xeTable;const{mergeFooterCells,mergeFooterItems}=props;const mFooterCells=mergeFooterCells||mergeFooterItems;if(mFooterCells){$xeTable.setMergeFooterCells(mFooterCells);}}// 计算可视渲染相关数据
+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});$xeTable.$nextTick(()=>{const $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return $xeTable.$nextTick();}function handleScrollToRowColumn($xeTable,fieldOrColumn,row,options){const internalData=$xeTable;const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,options?options.colAlign!==false:true,column,row);}return $xeTable.$nextTick();}function handleRowExpandReserve($xeTable,row,expanded){const internalData=$xeTable;const{rowExpandedReserveRowMap}=internalData;const expandOpts=$xeTable.computeExpandOpts;if(expandOpts.reserve){const rowid=getRowid($xeTable,row);if(expanded){rowExpandedReserveRowMap[rowid]=row;}else if(rowExpandedReserveRowMap[rowid]){delete rowExpandedReserveRowMap[rowid];}}}function handleDefaultMergeCells($xeTable){const props=$xeTable;const{mergeCells}=props;if(mergeCells){$xeTable.setMergeCells(mergeCells);}}function handleDefaultMergeHeaderItems($xeTable){const props=$xeTable;const{mergeHeaderCells}=props;if(mergeHeaderCells){$xeTable.setMergeHeaderCells(mergeHeaderCells);}}function handleDefaultMergeFooterItems($xeTable){const props=$xeTable;const{mergeFooterCells,mergeFooterItems}=props;const mFooterCells=mergeFooterCells||mergeFooterItems;if(mFooterCells){$xeTable.setMergeFooterCells(mFooterCells);}}// 计算可视渲染相关数据
 function computeScrollLoad($xeTable){const reactData=$xeTable;const internalData=$xeTable;return $xeTable.$nextTick().then(()=>{const{scrollXLoad,scrollYLoad}=reactData;const{scrollXStore,scrollYStore}=internalData;const virtualYOpts=$xeTable.computeVirtualYOpts;const virtualXOpts=$xeTable.computeVirtualXOpts;// 计算 X 逻辑
 if(scrollXLoad){const{toVisibleIndex:toXVisibleIndex,visibleSize:visibleXSize}=handleVirtualXVisible($xeTable);const offsetXSize=Math.max(0,virtualXOpts.oSize?external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.oSize):0);scrollXStore.preloadSize=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.preSize);scrollXStore.offsetSize=offsetXSize;scrollXStore.visibleSize=visibleXSize;scrollXStore.endIndex=Math.max(scrollXStore.startIndex+scrollXStore.visibleSize+offsetXSize,scrollXStore.endIndex);scrollXStore.visibleStartIndex=Math.max(scrollXStore.startIndex,toXVisibleIndex);scrollXStore.visibleEndIndex=Math.min(scrollXStore.endIndex,toXVisibleIndex+visibleXSize);$xeTable.updateScrollXData().then(()=>{loadScrollXData($xeTable);});}else{$xeTable.updateScrollXSpace();}// 计算 Y 逻辑
 const rowHeight=computeRowHeight($xeTable);scrollYStore.rowHeight=rowHeight;// 已废弃
@@ -10915,7 +10915,9 @@ function panel_hideDropTip($xeTableCustomPanel) {
       $xeTable.saveCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', $event);
+      $xeTable.dispatchEvent('custom-confirm', {}, $event);
       $xeTable.emitCustomEvent('close', $event);
+      $xeTable.dispatchEvent('custom-close', {}, $event);
     },
     cancelCloseEvent({
       $event
@@ -10924,6 +10926,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
       const $xeTable = $xeTableCustomPanel.$xeTable;
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('close', $event);
+      $xeTable.dispatchEvent('custom-close', {}, $event);
     },
     cancelCustomEvent({
       $event
@@ -10933,7 +10936,9 @@ function panel_hideDropTip($xeTableCustomPanel) {
       $xeTable.cancelCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', $event);
+      $xeTable.dispatchEvent('custom-cancel', {}, $event);
       $xeTable.emitCustomEvent('close', $event);
+      $xeTable.dispatchEvent('custom-close', {}, $event);
     },
     handleResetCustomEvent(evnt) {
       const $xeTableCustomPanel = this;
@@ -10941,7 +10946,9 @@ function panel_hideDropTip($xeTableCustomPanel) {
       $xeTable.resetCustom(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
+      $xeTable.dispatchEvent('custom-reset', {}, evnt);
       $xeTable.emitCustomEvent('close', evnt);
+      $xeTable.dispatchEvent('custom-close', {}, evnt);
     },
     resetCustomEvent(evnt) {
       if (core_.VxeUI.modal) {
@@ -15443,7 +15450,8 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
      * @param {*} records
      */
     _insert(records) {
-      return handleInsertRowAt(this, records, null);
+      const $xeTable = this;
+      return handleInsertRowAt($xeTable, records, null);
     },
     /**
      * 往表格指定行中插入临时数据
@@ -15453,19 +15461,24 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
      * @returns
      */
     _insertAt(records, targetRowOrRowid) {
-      return handleInsertRowAt(this, records, targetRowOrRowid);
+      const $xeTable = this;
+      return handleInsertRowAt($xeTable, records, targetRowOrRowid);
     },
     _insertNextAt(records, targetRowOrRowid) {
-      return handleInsertRowAt(this, records, targetRowOrRowid, true);
+      const $xeTable = this;
+      return handleInsertRowAt($xeTable, records, targetRowOrRowid, true);
     },
     _insertChild(records, parentRowOrParentId) {
-      return handleInsertChildRowAt(this, records, parentRowOrParentId, null);
+      const $xeTable = this;
+      return handleInsertChildRowAt($xeTable, records, parentRowOrParentId, null);
     },
     _insertChildAt(records, parentRowOrParentId, targetRowOrRowid) {
-      return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid);
+      const $xeTable = this;
+      return handleInsertChildRowAt($xeTable, records, parentRowOrParentId, targetRowOrRowid);
     },
     _insertChildNextAt(records, parentRowOrParentId, targetRowOrRowid) {
-      return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid, true);
+      const $xeTable = this;
+      return handleInsertChildRowAt($xeTable, records, parentRowOrParentId, targetRowOrRowid, true);
     },
     /**
      * 删除指定行数据
@@ -19737,7 +19750,7 @@ function emitCustomEvent($xeTable, type, evnt) {
       }
       return $xeTable.openCustom();
     },
-    _saveCustom() {
+    _saveCustom(isDirectly) {
       const $xeTable = this;
       const reactData = $xeTable;
       const internalData = $xeTable;
@@ -19755,34 +19768,36 @@ function emitCustomEvent($xeTable, type, evnt) {
         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 && allowValues && !!$xeTable.handlePivotTableAggData) {
         if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
@@ -20021,10 +20036,12 @@ function emitCustomEvent($xeTable, type, evnt) {
       if (customStore.visible) {
         $xeTable.closeCustom();
         emitCustomEvent($xeTable, 'close', evnt);
+        $xeTable.dispatchEvent('custom-close', {}, evnt);
       } else {
         customStore.btnEl = evnt.target;
         $xeTable.openCustom();
         emitCustomEvent($xeTable, 'open', evnt);
+        $xeTable.dispatchEvent('custom-open', {}, evnt);
       }
     },
     customOpenEvent(evnt) {
@@ -20038,6 +20055,7 @@ function emitCustomEvent($xeTable, type, evnt) {
         customStore.btnEl = evnt.target;
         $xeTable.openCustom();
         emitCustomEvent($xeTable, 'open', evnt);
+        $xeTable.dispatchEvent('custom-open', {}, evnt);
       }
     },
     customCloseEvent(evnt) {
@@ -20050,6 +20068,7 @@ function emitCustomEvent($xeTable, type, evnt) {
         customStore.activeBtn = false;
         $xeTable.closeCustom();
         emitCustomEvent($xeTable, 'close', evnt);
+        $xeTable.dispatchEvent('custom-close', {}, evnt);
       }
     },
     handleUpdateCustomColumn() {
@@ -27993,6 +28012,10 @@ const Toolbar = VxeToolbar;
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    iconPicker: {
+      search: '搜索',
+      emptyText: '暂无数据'
+    },
     datePicker: {
       yearTitle: '{0} 年'
     },