ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/es/ele-pro-layout/index.js

@@ -1,13 +1,14 @@
-import { defineComponent, ref, shallowRef, computed, markRaw, watch, unref, shallowReactive, provide, nextTick, onMounted, createBlock, openBlock, normalizeClass, createSlots, withCtx, renderSlot, createCommentVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, shallowRef, computed, markRaw, watch, unref, shallowReactive, provide, nextTick, onMounted, createBlock, openBlock, normalizeClass, createSlots, withCtx, renderSlot, createCommentVNode, createVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { useRouter } from "vue-router";
 import { HomeOutlined } from "../icons/index";
-import { useTimer, useMediaQuery, useWindowListener } from "../utils/hook";
+import { useTimer, useMediaQuery, mobileMediaQuery, useWindowListener } from "../utils/hook";
 import { debounce, isExternalLink, mapTree } from "../utils/common";
-import ProIframe from "./components/pro-iframe";
+import EleModalRender from "../ele-modal-render/index";
+import { useModalRenderProvider } from "../ele-modal-render/util";
+import IframeGroup from "./components/iframe-group";
 import { getMenuItems, getRouteMatched, getActiveChilds, findTabByKey, getMatchedLevels, getRouteTab, findMenuByPath, findTabByPath } from "./util";
 import { proLayoutEmits, proLayoutProps, PRO_LAYOUT_KEY } from "./props";
 import EleAdminLayout from "../ele-admin-layout/index";
-const mobileQuery = "(max-width: 768px)";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "EleProLayout" },
   __name: "index",
@@ -17,6 +18,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const { currentRoute, push } = useRouter();
+    const {
+      modals,
+      openModal,
+      closeModal,
+      closeAllModal,
+      removeModal,
+      updateModalVisible,
+      updateModalProps
+    } = useModalRenderProvider();
     const [startTimer, stopTimer] = useTimer(() => props.menuHoverTimeout);
     const state = { navData: [], sideData: [], boxData: [] };
     const layoutRef = ref(null);
@@ -80,7 +90,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           name: d.key,
           label: d.title,
           closable: onlyOne && d.home ? false : d.closable,
-          meta: d.meta
+          meta: {
+            path: d.path,
+            fullPath: d.fullPath,
+            home: d.home,
+            components: d.components,
+            refresh: d.refresh,
+            ...d.meta || {}
+          }
         };
       });
     });
@@ -286,7 +303,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleHeadMenuClose = (index, indexPath) => {
       emit("headMenuClose", index, indexPath);
     };
-    const handleHeadMenuItemClick = (item, e) => {
+    const handleHeadMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props.navTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -297,14 +314,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (props.beforeClick && props.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         window.open(path);
         return;
       }
       const childMenus = getActiveChilds(navData.value, path, "tempChildren");
-      const isChild = !childMenus.some((d) => {
-        var _a;
-        return !((_a = d.meta) == null ? void 0 : _a.hide);
-      });
+      const isChild = !childMenus.some((d) => !d.meta?.hide);
       if (trigger !== "click" && !isChild) {
         e.stopPropagation();
         return;
@@ -312,6 +329,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.beforeClick && props.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isChild && path !== unref(currentRoute).fullPath) {
         push(path);
         return;
@@ -350,10 +370,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const temp = getActiveChilds(navData.value, path, "tempChildren");
       if (navActive.value !== path) {
         state.isHover = true;
-        navActive.value = temp.some((d) => {
-          var _a;
-          return !((_a = d.meta) == null ? void 0 : _a.hide);
-        }) ? path : void 0;
+        navActive.value = temp.some((d) => !d.meta?.hide) ? path : void 0;
         const isMixSide = sideNavigation.value === "mix" || sideNavigation.value === "box";
         if (!isMixSide) {
           sideData.value = temp;
@@ -374,7 +391,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleHeadMouseleave = () => {
       resetMenuState();
     };
-    const handleBoxMenuItemClick = (item, e) => {
+    const handleBoxMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props.boxTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -385,6 +402,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (props.beforeClick && props.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         window.open(path);
         return;
       }
@@ -392,16 +412,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (props.beforeClick && props.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         if (path !== unref(currentRoute).fullPath) {
           push(path);
         }
         return;
       }
       const childMenus = getActiveChilds(boxData.value, path, "tempChildren");
-      const isChild = !childMenus.some((d) => {
-        var _a;
-        return !((_a = d.meta) == null ? void 0 : _a.hide);
-      });
+      const isChild = !childMenus.some((d) => !d.meta?.hide);
       if (trigger !== "click" && !isChild) {
         e.stopPropagation();
         return;
@@ -409,6 +429,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.beforeClick && props.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isChild && path !== unref(currentRoute).fullPath) {
         push(path);
         return;
@@ -435,10 +458,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const temp = getActiveChilds(boxData.value, path, "tempChildren");
       if (boxActive.value !== path) {
         state.isHover = true;
-        boxActive.value = temp.some((d) => {
-          var _a;
-          return !((_a = d.meta) == null ? void 0 : _a.hide);
-        }) ? path : void 0;
+        boxActive.value = temp.some((d) => !d.meta?.hide) ? path : void 0;
         sideData.value = temp;
       }
     };
@@ -454,7 +474,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleSideMenuClose = (index, indexPath) => {
       emit("sideMenuClose", index, indexPath);
     };
-    const handleSideMenuItemClick = (item, e) => {
+    const handleSideMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props.itemTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -463,6 +483,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.beforeClick && props.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isExternalLink(path)) {
         e.stopPropagation();
         window.open(path);
@@ -559,7 +582,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const updateMenuActive = (active, matched) => {
-      const [active1, active2] = (matched == null ? void 0 : matched.length) ? [matched[0].path, (matched[1] ?? matched[0]).path] : [];
+      const [active1, active2] = matched?.length ? [matched[0].path, (matched[1] ?? matched[0]).path] : [];
       if (navigation.value === "top") {
         navActive.value = active;
         boxActive.value = void 0;
@@ -576,12 +599,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       state.sideActive = sideActive.value;
     };
     const splitMenuData = () => {
-      var _a;
       const isTopNav = navigation.value === "top";
       const isMixNav = navigation.value === "mix";
       const isMixSide = sideNavigation.value === "mix" || sideNavigation.value === "box";
       const isCollapse = sideNavigation.value === "box" || props.collapse && !mobile.value;
-      if (!((_a = menuData.value) == null ? void 0 : _a.length)) {
+      if (!menuData.value?.length) {
         navData.value = [];
         boxData.value = [];
         sideData.value = [];
@@ -633,15 +655,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const updateMenuData = () => {
       let home;
       menuData.value = mapTree(props.menus, (item) => {
-        var _a, _b;
-        if (!home && !((_a = item.children) == null ? void 0 : _a.length)) {
+        if (!home && !item.children?.length) {
           home = item;
         }
-        const title = routeI18n(item.path, item) || ((_b = item.meta) == null ? void 0 : _b.title);
+        const title = routeI18n(item.path, item) || item.meta?.title;
         return { ...item, meta: { ...item.meta, title } };
       });
       splitMenuData();
-      homeMenuPath.value = props.homePath || (home == null ? void 0 : home.path) || "/";
+      homeMenuPath.value = props.homePath || home?.path || "/";
     };
     const updateTabData = () => {
       if (!props.tabs) {
@@ -658,10 +679,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const updateLevelData = () => {
       levelData.value = levelData.value.map((item) => {
-        var _a;
         const t = findTabByPath(item.path, tabData.value);
         const m = findMenuByPath(item.path, menuData.value);
-        const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path, m, t, item);
+        const title = t?.title || m?.meta?.title || routeI18n(item.path, m, t, item);
         return { ...item, title: title || item.title };
       });
     };
@@ -747,7 +767,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch([() => props.tabBar, () => props.keepAlive], () => {
       layoutProvide.keepAlive = props.tabBar && props.keepAlive;
     });
-    const [media, startMedia, stopMedia] = useMediaQuery(mobileQuery, () => {
+    const [media, startMedia, stopMedia] = useMediaQuery(mobileMediaQuery, () => {
       const isMobile = props.responsive ? media.matches : false;
       if (mobile.value !== isMobile) {
         mobile.value = isMobile;
@@ -812,7 +832,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       handleResize();
     });
     __expose({
-      layoutRef
+      layoutRef,
+      // 弹窗操作
+      openModal,
+      closeModal,
+      closeAllModal,
+      updateModalProps
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleAdminLayout, {
@@ -898,14 +923,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         onTabSortChange: handleTabSortChange
       }, createSlots({
         body: withCtx(() => [
-          _ctx.tabBar && _ctx.keepAlive ? (openBlock(), createBlock(ProIframe, {
+          _ctx.tabBar && _ctx.keepAlive ? (openBlock(), createBlock(IframeGroup, {
             key: 0,
             keepAlive: _ctx.keepAlive,
             transitionName: _ctx.transitionName,
             transitionDelay: _ctx.transitionDelay,
             tabData: tabData.value,
             tabActive: tabActive.value
-          }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : createCommentVNode("", true)
+          }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : createCommentVNode("", true),
+          createVNode(unref(EleModalRender), {
+            modals: unref(modals),
+            onRemoveItem: unref(removeModal),
+            onUpdateItemVisible: unref(updateModalVisible),
+            onUpdateItemProps: unref(updateModalProps)
+          }, null, 8, ["modals", "onRemoveItem", "onUpdateItemVisible", "onUpdateItemProps"])
         ]),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "default"),

package/es/ele-pro-layout/props.d.ts

@@ -11,7 +11,7 @@ type ProLayoutKey = InjectionKey<ProLayoutProvide>;
 export declare const proLayoutProps: {
     /** 高度 */
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: null;
     };
     /** 菜单数据 */
@@ -104,7 +104,6 @@ export declare const proLayoutProps: {
     layout: PropType<import('./types').Layout>;
     compact: BooleanConstructor;
     maximized: PropType<import('../ele-admin-layout/types').Maximized>;
-    headerStyle: PropType<import('./types').HeaderStyle>;
     tabBar: {
         type: PropType<import('./types').TabBar>;
         default: boolean;
@@ -121,6 +120,7 @@ export declare const proLayoutProps: {
     sidebarMenuProps: PropType<EleMenusProps>;
     sideboxMenuProps: PropType<EleMenusProps>;
     sidebarLayout: PropType<import('./types').SidebarLayout>;
+    headerStyle: PropType<import('./types').HeaderStyle>;
     sidebarStyle: {
         type: PropType<import('./types').SidebarStyle>;
         default: string;

package/es/ele-pro-layout/style/index.js

@@ -1,2 +1,3 @@
 import "../../ele-admin-layout/style/index";
+import "../../ele-modal-render/style/index";
 import "./index.scss";

package/es/ele-pro-layout/style/index.scss

@@ -10,8 +10,14 @@
   }
 
   /* 面包屑导航 */
-  &.is-mobile > .ele-admin-main > .ele-admin-header > .ele-admin-breadcrumb {
-    display: none;
+  &.is-mobile > .ele-admin-main > .ele-admin-header {
+    & > .ele-admin-breadcrumb {
+      display: none;
+    }
+
+    & > .ele-admin-tools:first-child {
+      padding-right: 0;
+    }
   }
 }
 

package/es/ele-pro-layout/util.js

@@ -16,12 +16,11 @@ function findTabByKey(key, tabs) {
   }
 }
 function getMatchedMenus(path, menus, parents) {
-  var _a;
   for (const m of menus) {
     const p = parents ? [...parents, m] : [m];
     if (m.path === path) {
       return p;
-    } else if ((_a = m.children) == null ? void 0 : _a.length) {
+    } else if (m.children?.length) {
       const result = getMatchedMenus(path, m.children, p);
       if (result) {
         return result;
@@ -30,14 +29,13 @@ function getMatchedMenus(path, menus, parents) {
   }
 }
 function getRouteMatched(route, menus) {
-  var _a, _b, _c;
   const { path, fullPath, meta } = route;
-  if (meta == null ? void 0 : meta.active) {
+  if (meta?.active) {
     const m2 = findMenuByPath(fullPath, menus) ?? findMenuByPath(path, menus);
     return {
       active: meta.active,
       activeOther: true,
-      title: ((_a = m2 == null ? void 0 : m2.meta) == null ? void 0 : _a.title) ?? meta.title,
+      title: m2?.meta?.title ?? meta.title,
       matched: getMatchedMenus(meta.active, menus)
     };
   }
@@ -45,25 +43,23 @@ function getRouteMatched(route, menus) {
   if (fm) {
     return {
       active: fullPath,
-      title: ((_b = fm.meta) == null ? void 0 : _b.title) ?? meta.title,
+      title: fm.meta?.title ?? meta.title,
       matched: getMatchedMenus(fullPath, menus)
     };
   }
   const m = findMenuByPath(path, menus);
   return {
     active: path,
-    title: ((_c = m == null ? void 0 : m.meta) == null ? void 0 : _c.title) ?? meta.title,
+    title: m?.meta?.title ?? meta.title,
     matched: getMatchedMenus(path, menus)
   };
 }
 function getMatchedLevels(matched, activeOther, route, menus, tabs) {
-  var _a;
   const levels = [];
   if (matched) {
     matched.forEach((m) => {
-      var _a2;
       if (m.meta && m.meta.title && m.meta.breadcrumb !== false) {
-        const title = ((_a2 = findTabByPath(m.path, tabs)) == null ? void 0 : _a2.title) || m.meta.title;
+        const title = findTabByPath(m.path, tabs)?.title || m.meta.title;
         levels.push({ path: m.path, title });
       }
     });
@@ -74,7 +70,7 @@ function getMatchedLevels(matched, activeOther, route, menus, tabs) {
     if (notIn && meta.title) {
       const m = findMenuByPath(fullPath, menus) ?? findMenuByPath(path, menus);
       const t = findTabByPath(fullPath, tabs) ?? findTabByPath(path, tabs);
-      const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || meta.title;
+      const title = t?.title || m?.meta?.title || meta.title;
       levels.push({ path: fullPath, title });
     }
   }
@@ -83,8 +79,7 @@ function getMatchedLevels(matched, activeOther, route, menus, tabs) {
 function getMatchedComponents(matched) {
   const components = [];
   matched.forEach((m) => {
-    var _a, _b;
-    if ((_b = (_a = m.components) == null ? void 0 : _a.default) == null ? void 0 : _b.name) {
+    if (m.components?.default?.name) {
       components.push(m.components.default.name);
     }
   });
@@ -94,9 +89,9 @@ function getRouteTab(route, tabs, homePath, routeTitle) {
   const { path, fullPath, meta, matched } = route;
   const key = meta.tabUnique === false ? fullPath : path;
   const t = findTabByPath(key, tabs);
-  const title = (t == null ? void 0 : t.title) || routeTitle;
+  const title = t?.title || routeTitle;
   const home = path === homePath || fullPath === homePath;
-  const closable = (t == null ? void 0 : t.closable) ?? meta.closable !== false;
+  const closable = t?.closable ?? meta.closable !== false;
   const components = getMatchedComponents(matched);
   return { key, path, fullPath, title, closable, home, components, meta };
 }

package/es/ele-pro-table/components/table-tools.js

@@ -101,8 +101,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["placement", "title"])) : tool === "export" ? (openBlock(), createBlock(EleTool, {
+            _: 1
+          }, 8, ["placement", "title"])) : tool === "export" ? (openBlock(), createBlock(EleTool, {
             key: index + "-export",
             title: __props.lang.export,
             placement: placement.value,
@@ -110,15 +110,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onClick: openExportModal
           }, {
             default: withCtx(() => [
-              createVNode(unref(ElIcon), { style: { "transform": "scale(1.1)", "transform-origin": "bottom" } }, {
+              createVNode(unref(ElIcon), { style: { transform: "scale(1.1)", transformOrigin: "bottom" } }, {
                 default: withCtx(() => [
                   createVNode(unref(DownloadOutlined))
                 ]),
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["title", "placement"])) : tool === "print" ? (openBlock(), createBlock(EleTool, {
+            _: 1
+          }, 8, ["title", "placement"])) : tool === "print" ? (openBlock(), createBlock(EleTool, {
             key: index + "-print",
             title: __props.lang.print,
             placement: placement.value,
@@ -133,8 +133,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["title", "placement"])) : tool === "size" ? (openBlock(), createBlock(EleTool, {
+            _: 1
+          }, 8, ["title", "placement"])) : tool === "size" ? (openBlock(), createBlock(EleTool, {
             key: index + "-size",
             placement: placement.value,
             title: __props.lang.sizes
@@ -163,8 +163,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
               }, 8, ["modelValue", "items"])
             ]),
-            _: 2
-          }, 1032, ["placement", "title"])) : tool === "columns" ? (openBlock(), createBlock(ToolColumn, {
+            _: 1
+          }, 8, ["placement", "title"])) : tool === "columns" ? (openBlock(), createBlock(ToolColumn, {
             key: index + "-columns",
             placement: placement.value,
             locale: __props.lang,
@@ -188,8 +188,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["placement", "title"])) : tool && !ownSlots.includes(tool) && _ctx.$slots[tool] ? renderSlot(_ctx.$slots, tool, { key: 6 }) : createCommentVNode("", true)
+            _: 1
+          }, 8, ["placement", "title"])) : tool && !ownSlots.includes(tool) && _ctx.$slots[tool] ? renderSlot(_ctx.$slots, tool, { key: 6 }) : createCommentVNode("", true)
         ], 64);
       }), 256);
     };

package/es/ele-pro-table/components/tool-column-list.js

@@ -1,7 +1,8 @@
-import { defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementVNode, createCommentVNode, createElementBlock, createVNode, normalizeClass } from "vue";
+import { defineComponent, inject, resolveComponent, createBlock, openBlock, unref, withCtx, createElementVNode, createCommentVNode, createElementBlock, createVNode, normalizeClass } from "vue";
 import VueDraggable from "vuedraggable";
 import { ElIcon, ElCheckbox, ElInput } from "element-plus";
 import { HolderOutlined, VerticalRightOutlined, VerticalLeftOutlined } from "../../icons/index";
+import { modalItemContextKey } from "../../utils/hook";
 const _hoisted_1 = { class: "ele-tool-column-item" };
 const _hoisted_2 = { class: "ele-tool-column-item-body" };
 const _hoisted_3 = {
@@ -48,17 +49,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const handleSortChange = (colItems) => {
-      handleChildSortChange(colItems, props.parent);
-    };
-    const handleCheckedChange = (colItem, checked) => {
-      emit("checkedChange", colItem, checked);
-    };
-    const handleFixedLeft = (colItem) => {
-      emit("fixedLeft", colItem);
+    const modalItem = inject(modalItemContextKey, null);
+    const handleChildFixedLeftTooltip = (el) => {
+      emit("fixedLeftTooltip", el);
     };
-    const handleFixedRight = (colItem) => {
-      emit("fixedRight", colItem);
+    const handleChildFixedRightTooltip = (el) => {
+      emit("fixedRightTooltip", el);
     };
     const handleFixedLeftTooltip = (e) => {
       handleChildFixedLeftTooltip(e.currentTarget);
@@ -66,18 +62,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleFixedRightTooltip = (e) => {
       handleChildFixedRightTooltip(e.currentTarget);
     };
-    const handleChildSortChange = (colItems, parent) => {
-      emit("sortChange", colItems, parent);
+    const handleFixedLeft = (colItem) => {
+      if (modalItem?.label) {
+        emit("fixedLeft", colItem);
+      }
     };
-    const handleChildFixedLeftTooltip = (el) => {
-      emit("fixedLeftTooltip", el);
+    const handleFixedRight = (colItem) => {
+      if (modalItem?.label) {
+        emit("fixedRight", colItem);
+      }
     };
-    const handleChildFixedRightTooltip = (el) => {
-      emit("fixedRightTooltip", el);
+    const handleChildSortChange = (colItems, parent) => {
+      if (modalItem?.label) {
+        emit("sortChange", colItems, parent);
+      }
+    };
+    const handleCheckedChange = (colItem, checked) => {
+      if (modalItem?.label) {
+        emit("checkedChange", colItem, checked);
+      }
     };
     const handleColWidthChange = (item, width) => {
       emit("colWidthChange", item, width);
     };
+    const handleSortChange = (colItems) => {
+      handleChildSortChange(colItems, props.parent);
+    };
     return (_ctx, _cache) => {
       const _component_ToolColumnList = resolveComponent("ToolColumnList", true);
       return openBlock(), createBlock(unref(VueDraggable), {
@@ -110,10 +120,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               __props.allowFixed ? (openBlock(), createElementBlock("div", _hoisted_5, [
                 createElementVNode("div", {
-                  class: normalizeClass([
-                    "ele-tool-column-fixed-item",
-                    { "is-active": d.fixed === true || d.fixed === "left" }
-                  ]),
+                  class: normalizeClass(["ele-tool-column-fixed-item", { "is-active": d.fixed === true || d.fixed === "left" }]),
                   onClick: ($event) => handleFixedLeft(d),
                   onMouseover: handleFixedLeftTooltip
                 }, [
@@ -125,10 +132,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   })
                 ], 42, _hoisted_6),
                 createElementVNode("div", {
-                  class: normalizeClass([
-                    "ele-tool-column-fixed-item",
-                    { "is-active": d.fixed === "right" }
-                  ]),
+                  class: normalizeClass(["ele-tool-column-fixed-item", { "is-active": d.fixed === "right" }]),
                   onClick: ($event) => handleFixedRight(d),
                   onMouseover: handleFixedRightTooltip
                 }, [

package/es/ele-pro-table/components/tool-column.js

@@ -193,11 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, {
             body: withCtx(() => [
               createElementVNode("div", {
-                class: normalizeClass([
-                  "ele-popover-body",
-                  "ele-tool-column",
-                  { "is-sortable": __props.sortable }
-                ])
+                class: normalizeClass(["ele-popover-body ele-tool-column", { "is-sortable": __props.sortable }])
               }, [
                 createElementVNode("div", _hoisted_1, [
                   createElementVNode("div", _hoisted_2, [

package/es/ele-pro-table/components/tool-export.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
 import { EleModalProps } from '../../ele-app/plus';
 import { Columns, DataItem, SpanMethod, SummaryMethod, TreeProps } from '../../ele-data-table/types';
-import { TableLocale, ExportDataType, BeforeExport, ExportPlugin, Datasource, FetchFunction, TableExportParams } from '../types';
+import { TableLocale, ExportDataType, BeforeExport, ExportPlugin, Datasource, FetchFunction, TableExportParams, GetDatasourceResultFunction } from '../types';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 表格国际化 */
@@ -58,6 +58,11 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     beforeExport: PropType<BeforeExport>;
     /** 导出插件 */
     exportPlugin: PropType<ExportPlugin>;
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+        type: PropType<GetDatasourceResultFunction>;
+        required: true;
+    };
 }>, {
     openModal: () => void;
     closeModal: () => void;
@@ -117,12 +122,17 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     beforeExport: PropType<BeforeExport>;
     /** 导出插件 */
     exportPlugin: PropType<ExportPlugin>;
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+        type: PropType<GetDatasourceResultFunction>;
+        required: true;
+    };
 }>> & Readonly<{}>, {
     showSummary: boolean;
     tableHeader: boolean;
-    defaultShowTreeIndex: boolean;
-    defaultFileName: string;
     defaultDataType: ExportDataType;
     defaultShowFooter: boolean;
+    defaultShowTreeIndex: boolean;
+    defaultFileName: string;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;