ele-admin-plus 1.2.1-beta.3 → 1.2.1-beta.5

package/es/ele-tabs/index.js

@@ -1,19 +1,30 @@
-import { defineComponent, inject, ref, computed, onMounted, nextTick, onBeforeUnmount, watch, resolveComponent, openBlock, createBlock, mergeProps, createSlots, withCtx, createElementBlock, Fragment, renderList, createVNode, renderSlot, createCommentVNode } from "vue";
+import { defineComponent, inject, ref, computed, shallowRef, onMounted, onBeforeUnmount, watch, nextTick, resolveComponent, openBlock, createBlock, mergeProps, createSlots, withCtx, createElementBlock, Fragment, renderList, createElementVNode, renderSlot, createTextVNode, toDisplayString, createVNode, createCommentVNode } from "vue";
 import SortableJs from "sortablejs";
-import { ElTabs, ElTabPane } from "element-plus";
+import { ElTabs, ElTabPane, ElIcon } from "element-plus";
+import { CornerLeftFilled, CornerRightFilled } from "../icons";
 import { pick, omit } from "../utils/core";
 import { useTimer, useMousewheel, useTouchEvent } from "../utils/hook";
-import TabTitle from "./components/tab-title";
+import EleDropdown from "../ele-dropdown/index";
 import { tabsProps, tabsEmits, TAB_WRAP_KEY, tabPropKeys } from "./props";
 const _sfc_main = defineComponent({
   name: "EleTabs",
-  components: { ElTabs, ElTabPane, TabTitle },
+  components: {
+    ElTabs,
+    ElTabPane,
+    ElIcon,
+    EleDropdown,
+    CornerLeftFilled,
+    CornerRightFilled
+  },
   props: tabsProps,
   emits: tabsEmits,
   setup(props, { emit }) {
-    const [startScrollTimer, _stopScrollTimer, scrollWaiting] = useTimer(320);
     let sortableIns = null;
+    let currentSortItemId = null;
+    let contextMenuTabItem = null;
+    let contextMenuTabName = null;
     const wrapProps = inject(TAB_WRAP_KEY, null);
+    const [startScrollTimer, _stopScrollTimer, scrollWaiting] = useTimer(320);
     const { bindMousewheel, unbindMousewheel } = useMousewheel((param) => {
       const { e, direction } = param;
       scrollTabs(direction === "up" ? "prev" : "next", () => {
@@ -30,9 +41,9 @@ const _sfc_main = defineComponent({
         }
       }
     });
+    const [startGhostTimer] = useTimer(100);
     const tabRef = ref(null);
-    const itemRefs = ref([]);
-    const isWrap = computed(() => wrapProps == null);
+    const isOnlyTab = computed(() => wrapProps == null);
     const tabSize = computed(
       () => wrapProps == null ? props.size : wrapProps.size
     );
@@ -42,15 +53,21 @@ const _sfc_main = defineComponent({
     const tabProps = computed(() => {
       return pick(props, tabPropKeys);
     });
-    const getContextMenus = (item) => {
-      if (typeof props.contextMenus === "function") {
-        return props.contextMenus(item);
-      }
-      return props.contextMenus;
-    };
+    const ctxMenuDropdownRef = ref(null);
+    const ctxMenuDropdownItems = shallowRef([]);
+    const ctxMenuDropdownVirtualRef = ref();
     const updateModelValue = (name) => {
       emit("update:modelValue", name);
     };
+    const handleContextmenu = (e) => {
+      if (!props.contextMenu) {
+        return;
+      }
+      const el = e.target;
+      if (el && (el.classList.contains("is-icon-close") || el.classList.contains("el-tabs__nav") || el.classList.contains("el-tabs__item"))) {
+        e.preventDefault();
+      }
+    };
     const handleTabClick = (pane, e) => {
       emit("tabClick", pane, e);
     };
@@ -66,41 +83,75 @@ const _sfc_main = defineComponent({
     const handleEdit = (name, action) => {
       emit("edit", name, action);
     };
-    const handleItemClick = (option) => {
-      emit("tabItemClick", option);
+    const handleItemClick = (item, tabName, e) => {
+      if (props.handleClick) {
+        e.stopPropagation();
+      }
+      emit("tabItemClick", {
+        item,
+        name: item ? item.name : tabName,
+        active: props.modelValue
+      });
     };
-    const handleItemContextMenu = (option) => {
-      emit("tabContextMenu", option);
+    const handleItemCtxMenuVisible = (visible) => {
+      if (visible) {
+        emit(
+          "tabContextOpen",
+          ctxMenuDropdownRef.value,
+          contextMenuTabItem,
+          contextMenuTabName
+        );
+      }
     };
-    const handleItemContextOpen = (ref2) => {
-      if (itemRefs.value) {
-        itemRefs.value.forEach((r) => {
-          if (r && r.dropdownRef && r.dropdownRef !== ref2) {
-            r.dropdownRef.handleClose();
-          }
+    const handleItemCtxMenuClick = (command) => {
+      if (contextMenuTabItem != null || contextMenuTabName != null) {
+        emit("tabContextMenu", {
+          command,
+          item: contextMenuTabItem,
+          name: contextMenuTabItem ? contextMenuTabItem.name : contextMenuTabName,
+          active: props.modelValue
         });
       }
-      emit("tabContextOpen", ref2);
     };
-    const handleContextmenu = (e) => {
-      const el = e.target;
-      if (el && el.classList.contains("is-icon-close")) {
-        e.preventDefault();
+    const getContextMenus = (item, tabName) => {
+      if (typeof props.contextMenus === "function") {
+        return props.contextMenus(item, tabName);
       }
+      return props.contextMenus;
     };
     const hideAllDropdown = () => {
-      if (itemRefs.value) {
-        itemRefs.value.forEach((r) => {
-          if (r && r.dropdownRef) {
-            r.dropdownRef.handleClose();
-          }
-        });
+      if (ctxMenuDropdownRef.value) {
+        ctxMenuDropdownRef.value.handleClose();
+      }
+    };
+    const showItemContextMenu = (item, tabName, itemEl) => {
+      if (contextMenuTabItem != null && contextMenuTabItem === item || contextMenuTabName != null && contextMenuTabName === tabName) {
+        return;
+      }
+      hideAllDropdown();
+      nextTick(() => {
+        contextMenuTabItem = item;
+        contextMenuTabName = tabName;
+        ctxMenuDropdownItems.value = getContextMenus(item, tabName) || [];
+        ctxMenuDropdownVirtualRef.value = itemEl;
+        if (props.contextMenu && ctxMenuDropdownItems.value.length) {
+          nextTick(() => {
+            ctxMenuDropdownRef.value && ctxMenuDropdownRef.value.handleOpen();
+          });
+        }
+      });
+    };
+    const handleItemContextmenu = (item, tabName, e) => {
+      const itemEl = e.currentTarget;
+      if (!props.contextMenu || ctxMenuDropdownVirtualRef.value === itemEl) {
+        return;
       }
+      e.preventDefault();
+      showItemContextMenu(item, tabName, itemEl);
     };
     const getHeaderEl = () => {
       const tabEl = tabRef.value ? tabRef.value.$el : void 0;
-      const el = tabEl ? tabEl.querySelector(".el-tabs__header") : void 0;
-      return el;
+      return tabEl ? tabEl.querySelector(".el-tabs__header") : void 0;
     };
     const getNavEl = () => {
       const headerEl = getHeaderEl();
@@ -126,26 +177,34 @@ const _sfc_main = defineComponent({
         }
       }
     };
-    const checkScrollActive = () => {
-      const active = props.modelValue;
-      if (props.items && active != null) {
-        const index2 = props.items.findIndex((item) => item.name === active);
-        if (index2 === 0) {
-          scrollTabs("prev");
-        } else if (index2 === props.items.length - 1) {
-          scrollTabs("next");
+    const checkSortGhostTab = () => {
+      const navEl = getNavEl();
+      if (navEl == null) {
+        return;
+      }
+      if (currentSortItemId == null) {
+        const el2 = navEl.querySelector(".el-tabs__item.sortable-ghost");
+        if (el2 != null) {
+          el2.classList.remove("sortable-ghost");
         }
+        return;
+      }
+      const el = navEl.querySelector(
+        `.el-tabs__item[id="${currentSortItemId}"]`
+      );
+      if (el != null) {
+        el.classList.add("sortable-ghost");
       }
     };
     const bindDragSort = () => {
       unbindDragSort();
-      const el = getNavEl();
-      if (!props.sortable || !el) {
+      const navEl = getNavEl();
+      if (!props.sortable || !navEl) {
         return;
       }
-      sortableIns = new SortableJs(el, {
-        animation: 300,
+      sortableIns = new SortableJs(navEl, {
         draggable: ".el-tabs__item",
+        delay: 20,
         onUpdate: ({ oldDraggableIndex, newDraggableIndex }) => {
           if (typeof oldDraggableIndex === "number" && typeof newDraggableIndex === "number") {
             const data = [...props.items];
@@ -157,6 +216,29 @@ const _sfc_main = defineComponent({
             emit("tabSortChange", data);
           }
         },
+        onStart: (e) => {
+          currentSortItemId = e.item.getAttribute("id");
+          checkSortGhostTab();
+          startGhostTimer(() => {
+            checkSortGhostTab();
+          });
+        },
+        onEnd: () => {
+          currentSortItemId = null;
+          checkSortGhostTab();
+        },
+        onChange: () => {
+          checkSortGhostTab();
+          startGhostTimer(() => {
+            checkSortGhostTab();
+          });
+        },
+        onMove: () => {
+          checkSortGhostTab();
+          startGhostTimer(() => {
+            checkSortGhostTab();
+          });
+        },
         setData: () => {
         }
       });
@@ -164,6 +246,7 @@ const _sfc_main = defineComponent({
     const unbindDragSort = () => {
       sortableIns && sortableIns.destroy();
       sortableIns = null;
+      currentSortItemId = null;
     };
     const initMousewheelEvent = () => {
       const el = getHeaderEl();
@@ -183,15 +266,26 @@ const _sfc_main = defineComponent({
         }
       }
     };
-    onMounted(() => {
-      nextTick(() => {
-        checkScrollActive();
+    if (wrapProps && wrapProps.setTabMethods) {
+      wrapProps.setTabMethods({
+        triggerTabItemClick: handleItemClick,
+        triggerItemContextMenu: handleItemContextmenu
       });
+    }
+    onMounted(() => {
       initMousewheelEvent();
       initTouchEvent();
       bindDragSort();
     });
     onBeforeUnmount(() => {
+      if (wrapProps && wrapProps.setTabMethods) {
+        wrapProps.setTabMethods({
+          triggerTabItemClick: void 0,
+          triggerItemContextMenu: void 0
+        });
+      }
+      contextMenuTabItem = null;
+      contextMenuTabName = null;
       const el = getHeaderEl();
       if (el != null) {
         unbindMousewheel(el);
@@ -212,35 +306,30 @@ const _sfc_main = defineComponent({
         initMousewheelEvent();
       }
     );
-    watch(
-      () => props.modelValue,
-      () => {
-        nextTick(() => {
-          checkScrollActive();
-        });
-      }
-    );
     return {
       omit,
       tabRef,
-      itemRefs,
-      isWrap,
+      isOnlyTab,
       tabSize,
       tabType,
       tabProps,
-      getContextMenus,
+      ctxMenuDropdownRef,
+      ctxMenuDropdownItems,
+      ctxMenuDropdownVirtualRef,
       updateModelValue,
+      handleContextmenu,
       handleTabClick,
       handleTabChange,
       handleTabRemove,
       handleTabAdd,
       handleEdit,
       handleItemClick,
-      handleItemContextMenu,
-      handleItemContextOpen,
-      handleContextmenu,
+      handleItemCtxMenuVisible,
+      handleItemCtxMenuClick,
+      handleItemContextmenu,
       hideAllDropdown,
-      updateActiveBar
+      updateActiveBar,
+      scrollTabs
     };
   }
 });
@@ -251,16 +340,20 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
+const _hoisted_1 = ["onClick", "onContextmenu"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_TabTitle = resolveComponent("TabTitle");
+  const _component_CornerLeftFilled = resolveComponent("CornerLeftFilled");
+  const _component_ElIcon = resolveComponent("ElIcon");
+  const _component_CornerRightFilled = resolveComponent("CornerRightFilled");
   const _component_ElTabPane = resolveComponent("ElTabPane");
+  const _component_EleDropdown = resolveComponent("EleDropdown");
   const _component_ElTabs = resolveComponent("ElTabs");
   return openBlock(), createBlock(_component_ElTabs, mergeProps(_ctx.tabProps, {
     ref: "tabRef",
     type: _ctx.tabType === "card" || _ctx.tabType === "border-card" ? _ctx.tabType : void 0,
     class: [
       "ele-tabs",
-      { "ele-tabs-wrap": _ctx.isWrap },
+      { "ele-tabs-wrap": _ctx.isOnlyTab },
       { "is-small": _ctx.tabSize === "small" },
       { "is-large": _ctx.tabSize === "large" },
       { "is-default": !_ctx.tabType || _ctx.tabType === "default" },
@@ -270,6 +363,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       { "is-button": _ctx.tabType === "button" },
       { "is-tag": _ctx.tabType === "tag" },
       { "is-center": _ctx.center },
+      { "is-sortable": _ctx.sortable },
       { "is-flex-table": _ctx.flexTable }
     ],
     "onUpdate:modelValue": _ctx.updateModelValue,
@@ -282,54 +376,86 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }), createSlots({
     default: withCtx(() => [
       (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.items, (item, index2) => {
-        return openBlock(), createElementBlock(Fragment, null, [
-          (item.vIf == null ? true : item.vIf) ? (openBlock(), createBlock(_component_ElTabPane, mergeProps({
-            key: index2 + "-" + item.name + "-" + item.label,
-            ref_for: true
-          }, _ctx.omit(item, ["slot", "meta", "vIf"])), createSlots({
-            label: withCtx(() => [
-              createVNode(_component_TabTitle, {
-                ref_for: true,
-                ref: "itemRefs",
+        return openBlock(), createBlock(_component_ElTabPane, mergeProps({
+          key: [
+            index2,
+            item.name,
+            item.label,
+            !!item.closable,
+            !!item.disabled,
+            !!item.lazy
+          ].join("-"),
+          ref_for: true
+        }, _ctx.omit(item, ["slot", "meta"])), createSlots({
+          label: withCtx(() => [
+            createElementVNode("div", {
+              class: "ele-tab-title",
+              onClick: (e) => _ctx.handleItemClick(item, void 0, e),
+              onContextmenu: (e) => _ctx.handleItemContextmenu(item, void 0, e)
+            }, [
+              renderSlot(_ctx.$slots, "label", {
                 item,
                 label: item.label,
-                tabName: item.name,
-                active: _ctx.modelValue,
-                handleClick: _ctx.handleClick,
-                contextMenu: _ctx.contextMenu,
-                contextMenus: _ctx.getContextMenus(item),
-                onContextMenu: _ctx.handleItemContextMenu,
-                onContextOpen: _ctx.handleItemContextOpen,
-                onItemClick: _ctx.handleItemClick
-              }, createSlots({ _: 2 }, [
-                _ctx.$slots.label ? {
-                  name: "label",
-                  fn: withCtx((slotProps) => [
-                    renderSlot(_ctx.$slots, "label", mergeProps({ ref_for: true }, slotProps || {}))
-                  ]),
-                  key: "0"
-                } : void 0,
-                _ctx.$slots.contextMenu ? {
-                  name: "contextMenu",
-                  fn: withCtx((slotProps) => [
-                    renderSlot(_ctx.$slots, "contextMenu", mergeProps({ ref_for: true }, slotProps || {}))
-                  ]),
-                  key: "1"
-                } : void 0
-              ]), 1032, ["item", "label", "tabName", "active", "handleClick", "contextMenu", "contextMenus", "onContextMenu", "onContextOpen", "onItemClick"])
-            ]),
-            _: 2
-          }, [
-            item.name && _ctx.$slots[item.slot || item.name] ? {
-              name: "default",
-              fn: withCtx(() => [
-                renderSlot(_ctx.$slots, item.slot || item.name, { item })
+                active: _ctx.modelValue
+              }, () => [
+                createTextVNode(toDisplayString(item.label), 1)
+              ])
+            ], 40, _hoisted_1),
+            _ctx.tabType === "simple" || _ctx.tabType === "indicator" ? (openBlock(), createBlock(_component_ElIcon, {
+              key: 0,
+              class: "ele-tab-corner-left"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_CornerLeftFilled)
+              ]),
+              _: 1
+            })) : createCommentVNode("", true),
+            _ctx.tabType === "simple" || _ctx.tabType === "indicator" ? (openBlock(), createBlock(_component_ElIcon, {
+              key: 1,
+              class: "ele-tab-corner-right"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_CornerRightFilled)
               ]),
-              key: "0"
-            } : void 0
-          ]), 1040)) : createCommentVNode("", true)
-        ], 64);
-      }), 256))
+              _: 1
+            })) : createCommentVNode("", true)
+          ]),
+          _: 2
+        }, [
+          item.name && _ctx.$slots[item.slot || item.name] ? {
+            name: "default",
+            fn: withCtx(() => [
+              renderSlot(_ctx.$slots, item.slot || item.name, { item })
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040);
+      }), 128)),
+      _ctx.contextMenu ? (openBlock(), createBlock(_component_EleDropdown, mergeProps(
+        {
+          key: 0,
+          triggerKeys: [],
+          persistent: false,
+          placement: "bottom-start",
+          popperClass: "ele-tab-popup",
+          popperOptions: {
+            modifiers: [{ name: "offset", options: { offset: [0, 8] } }]
+          }
+        },
+        !_ctx.contextMenu || typeof _ctx.contextMenu == "boolean" ? {} : _ctx.contextMenu,
+        {
+          ref: "ctxMenuDropdownRef",
+          componentType: "pro",
+          preventContextmenu: true,
+          trigger: "contextmenu",
+          virtualTriggering: true,
+          virtualRef: _ctx.ctxMenuDropdownVirtualRef,
+          disabled: !_ctx.ctxMenuDropdownItems.length,
+          items: _ctx.ctxMenuDropdownItems,
+          onCommand: _ctx.handleItemCtxMenuClick,
+          onVisibleChange: _ctx.handleItemCtxMenuVisible
+        }
+      ), null, 16, ["virtualRef", "disabled", "items", "onCommand", "onVisibleChange"])) : createCommentVNode("", true)
     ]),
     _: 2
   }, [
@@ -339,8 +465,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         renderSlot(_ctx.$slots, "add-icon")
       ]),
       key: "0"
-    } : void 0,
-    _ctx.$slots.addIcon ? {
+    } : _ctx.$slots.addIcon ? {
       name: "addIcon",
       fn: withCtx(() => [
         renderSlot(_ctx.$slots, "addIcon")

package/es/ele-tabs/props.d.ts

@@ -1,7 +1,6 @@
 import { PropType, ExtractPropTypes, InjectionKey } from 'vue';
 import { tabsProps as elTabsProps } from 'element-plus';
 import { EleDropdownProps, EleDropdownInstance } from '../ele-app/plus';
-import { default as TabTitle } from './components/tab-title';
 import { TabPaneItem, TabSize, TabType, ContextMenus, TabEventOption, TabWrapProvide } from './types';
 
 /**
@@ -62,7 +61,7 @@ export declare const tabsEmits: {
     /** 页签右键菜单项点击事件 */
     tabContextMenu: (_opt: TabEventOption) => boolean;
     /** 页签右键菜单打开事件 */
-    tabContextOpen: (_ref: EleDropdownInstance) => boolean;
+    tabContextOpen: (_ref: EleDropdownInstance, _item?: TabPaneItem | null, _name?: string | number | null) => boolean;
     /** 拖动排序改变事件 */
     tabSortChange: (_data: TabPaneItem[]) => boolean;
     "update:modelValue": (name: import('element-plus').TabPaneName) => boolean;
@@ -77,10 +76,6 @@ export declare const tabsEmits: {
  */
 export type TabPropKeys = Array<keyof typeof elTabsProps>;
 export declare const tabPropKeys: TabPropKeys;
-/**
- * 页签标题实例
- */
-export type TabTitleInstance = InstanceType<typeof TabTitle> | null;
 /**
  * 标签页容器依赖注入key
  */

package/es/ele-tabs/props.js

@@ -32,7 +32,7 @@ const tabsEmits = {
   /** 页签右键菜单项点击事件 */
   tabContextMenu: (_opt) => true,
   /** 页签右键菜单打开事件 */
-  tabContextOpen: (_ref) => true,
+  tabContextOpen: (_ref, _item, _name) => true,
   /** 拖动排序改变事件 */
   tabSortChange: (_data) => true
 };