vxe-table 4.19.21 → 4.19.22

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version = "4.19.21";
+const version = "4.19.22";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -743,7 +743,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.19.21"}`;
+const tableVersion = `table v${"4.19.22"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -3876,6 +3876,11 @@ const tableEmits = [
     'scroll',
     'scroll-boundary',
     'custom',
+    'custom-open',
+    'custom-close',
+    'custom-cancel',
+    'custom-reset',
+    'custom-confirm',
     'custom-visible-change',
     'custom-visible-all',
     'custom-fixed-change',
@@ -5755,23 +5760,30 @@ var TableCustomPanelComponent = defineVxeComponent({
             $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 }) => {
             $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 }) => {
             if (VxeUI.modal) {
@@ -9695,7 +9707,6 @@ hooks$5.add('tableEditModule', {
                 return handleInsertRowAt(records, targetRowOrRowid, true);
             },
             insertChild(records, parentRowOrParentId) {
-                window.aa = internalData;
                 return handleInsertChildRowAt(records, parentRowOrParentId, null);
             },
             insertChildAt(records, parentRowOrParentId, targetRow) {
@@ -13264,39 +13275,41 @@ VxeUI.hooks.add('tableCustomModule', {
             }
             return openCustom();
         };
-        const saveCustom = () => {
+        const saveCustom = (isDirectly) => {
             const { customColumnList, aggHandleFields, rowGroupList } = reactData;
             const customOpts = computeCustomOpts.value;
             const { allowVisible, allowSort, allowFixed, allowResizable, allowGroup, allowValues } = customOpts;
-            XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
-                if (parentColumn) {
-                    // 更新子列信息
-                    column.fixed = parentColumn.fixed;
-                }
-                else {
-                    if (allowSort) {
-                        const sortIndex = index + 1;
-                        column.renderSortNumber = sortIndex;
+            if (!isDirectly) {
+                XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
+                    if (parentColumn) {
+                        // 更新子列信息
+                        column.fixed = parentColumn.fixed;
                     }
-                    if (allowFixed) {
-                        column.fixed = column.renderFixed;
+                    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])) {
@@ -13478,11 +13491,13 @@ 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) {
@@ -13493,6 +13508,7 @@ VxeUI.hooks.add('tableCustomModule', {
                     customStore.btnEl = evnt.target;
                     $xeTable.openCustom();
                     $xeTable.emitCustomEvent('open', evnt);
+                    $xeTable.dispatchEvent('custom-open', {}, evnt);
                 }
             },
             customCloseEvent(evnt) {
@@ -13502,6 +13518,7 @@ VxeUI.hooks.add('tableCustomModule', {
                     customStore.activeBtn = false;
                     $xeTable.closeCustom();
                     $xeTable.emitCustomEvent('close', evnt);
+                    $xeTable.dispatchEvent('custom-close', {}, evnt);
                 }
             },
             handleUpdateCustomColumn,
@@ -24064,12 +24081,16 @@ var VxeTableComponent = defineVxeComponent({
                 // 如果为 null 使用默认逻辑
                 if (XEUtils.eqNull(customContent)) {
                     isShow = isOver;
+                    content = cellText;
                 }
                 else if (customContent !== '' && customContent !== false) {
                     // 如果为 '' | false 则不显示
                     isShow = true;
+                    content = customContent;
+                }
+                else {
+                    content = cellText;
                 }
-                content = cellText;
             }
             if (isShow && content) {
                 const tipContent = formatText(content);
@@ -32189,6 +32210,10 @@ var zhCN = {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        iconPicker: {
+            search: '搜索',
+            emptyText: '暂无数据'
+        },
         datePicker: {
             yearTitle: '{0} 年'
         },