vxe-table 3.21.21 → 3.21.22

package/es/table/module/custom/mixin.js

@@ -150,42 +150,44 @@ export default {
             }
             return $xeTable.openCustom();
         },
-        _saveCustom() {
+        _saveCustom(isDirectly) {
             const $xeTable = this;
             const reactData = $xeTable;
             const internalData = $xeTable;
             const { customColumnList, aggHandleFields, rowGroupList } = reactData;
             const customOpts = $xeTable.computeCustomOpts;
             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 && allowValues && !!$xeTable.handlePivotTableAggData) {
                 if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
@@ -365,11 +367,13 @@ export default {
             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) {
@@ -381,6 +385,7 @@ export default {
                 customStore.btnEl = evnt.target;
                 $xeTable.openCustom();
                 emitCustomEvent($xeTable, 'open', evnt);
+                $xeTable.dispatchEvent('custom-open', {}, evnt);
             }
         },
         customCloseEvent(evnt) {
@@ -391,6 +396,7 @@ export default {
                 customStore.activeBtn = false;
                 $xeTable.closeCustom();
                 emitCustomEvent($xeTable, 'close', evnt);
+                $xeTable.dispatchEvent('custom-close', {}, evnt);
             }
         },
         handleUpdateCustomColumn() {

package/es/table/module/custom/panel.js

@@ -159,13 +159,16 @@ export default {
             $xeTable.saveCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('confirm', $event);
+            $xeTable.dispatchEvent('custom-confirm', {}, $event);
             $xeTable.emitCustomEvent('close', $event);
+            $xeTable.dispatchEvent('custom-close', {}, $event);
         },
         cancelCloseEvent({ $event }) {
             const $xeTableCustomPanel = this;
             const $xeTable = $xeTableCustomPanel.$xeTable;
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('close', $event);
+            $xeTable.dispatchEvent('custom-close', {}, $event);
         },
         cancelCustomEvent({ $event }) {
             const $xeTableCustomPanel = this;
@@ -173,7 +176,9 @@ export default {
             $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;
@@ -181,7 +186,9 @@ export default {
             $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 (VxeUI.modal) {

package/es/table/module/edit/mixin.js

@@ -528,7 +528,8 @@ export default {
          * @param {*} records
          */
         _insert(records) {
-            return handleInsertRowAt(this, records, null);
+            const $xeTable = this;
+            return handleInsertRowAt($xeTable, records, null);
         },
         /**
          * 往表格指定行中插入临时数据
@@ -538,19 +539,24 @@ export default {
          * @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);
         },
         /**
          * 删除指定行数据

package/es/table/src/methods.js

@@ -2892,12 +2892,16 @@ function handleTooltip($xeTable, evnt, tipOpts, type, tdEl, overflowElem, tipEle
         // 如果为 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);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.21.21";
+export const version = "3.21.22";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.21.21"}`;
+const tableVersion = `table v${"3.21.22"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';