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

package/es/ele-file-list/components/file-table-item.d.ts

@@ -1,7 +1,5 @@
 import { PropType } from 'vue';
-import { EleDropdownProps, EleDropdownInstance } from '../../ele-app/plus';
-import { DropdownItem } from '../../ele-dropdown/types';
-import { IconItem, FileItem, ColumnItem, ItemContextMenuOption, SelectionType } from '../types';
+import { IconItem, FileItem, ColumnItem, SelectionType, ContextOpenOption } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 数据 */
@@ -19,26 +17,20 @@ declare const _default: import('vue').DefineComponent<{
     icons: PropType<IconItem[]>;
     /** 自定义列配置 */
     columns: PropType<ColumnItem[]>;
-    /** 右键菜单 */
-    contextMenus: PropType<DropdownItem[]>;
-    /** 右键菜单属性 */
-    contextMenuProps: PropType<EleDropdownProps>;
+    /** 右键下拉菜单是否显示 */
+    ctxMenuDropdownVisible: BooleanConstructor;
 }, {
-    dropdownRef: import('vue').Ref<EleDropdownInstance>;
-    dropdownVisible: import('vue').Ref<boolean>;
+    dropdownTriggerRef: import('vue').Ref<HTMLElement | null>;
     selectable: import('vue').ComputedRef<boolean>;
     selected: import('vue').ComputedRef<boolean>;
     icon: import('vue').ComputedRef<string | undefined>;
     handleClick: () => void;
     handleCheckChange: () => void;
     handleContextmenu: (e: MouseEvent) => void;
-    handleItemContextMenu: (command: string) => void;
-    handleContextVisibleChange: (visible: boolean) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     click: (_item: FileItem) => true;
     checkChange: (_item: FileItem) => true;
-    contextMenu: (_option: ItemContextMenuOption) => true;
-    contextOpen: (_ref: EleDropdownInstance) => true;
+    contextOpen: (_option: ContextOpenOption) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 数据 */
     item: {
@@ -55,14 +47,13 @@ declare const _default: import('vue').DefineComponent<{
     icons: PropType<IconItem[]>;
     /** 自定义列配置 */
     columns: PropType<ColumnItem[]>;
-    /** 右键菜单 */
-    contextMenus: PropType<DropdownItem[]>;
-    /** 右键菜单属性 */
-    contextMenuProps: PropType<EleDropdownProps>;
+    /** 右键下拉菜单是否显示 */
+    ctxMenuDropdownVisible: BooleanConstructor;
 }>> & {
     onClick?: ((_item: FileItem) => any) | undefined;
-    onContextMenu?: ((_option: ItemContextMenuOption) => any) | undefined;
-    onContextOpen?: ((_ref: EleDropdownInstance) => any) | undefined;
     onCheckChange?: ((_item: FileItem) => any) | undefined;
-}, {}, {}>;
+    onContextOpen?: ((_option: ContextOpenOption) => any) | undefined;
+}, {
+    ctxMenuDropdownVisible: boolean;
+}, {}>;
 export default _default;

package/es/ele-file-list/components/file-table-item.js

@@ -1,8 +1,6 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, withModifiers, createElementVNode, createCommentVNode, renderSlot, toDisplayString, Fragment, renderList, normalizeStyle, createTextVNode, createBlock, mergeProps, createSlots, withCtx } from "vue";
-import EleDropdown from "../../ele-dropdown/index";
+import { defineComponent, ref, computed, openBlock, createElementBlock, normalizeClass, withModifiers, createElementVNode, createCommentVNode, renderSlot, toDisplayString, Fragment, renderList, normalizeStyle, createTextVNode } from "vue";
 const _sfc_main = defineComponent({
   name: "FileTableItem",
-  components: { EleDropdown },
   props: {
     /** 数据 */
     item: {
@@ -19,20 +17,16 @@ const _sfc_main = defineComponent({
     icons: Array,
     /** 自定义列配置 */
     columns: Array,
-    /** 右键菜单 */
-    contextMenus: Array,
-    /** 右键菜单属性 */
-    contextMenuProps: Object
+    /** 右键下拉菜单是否显示 */
+    ctxMenuDropdownVisible: Boolean
   },
   emits: {
     click: (_item) => true,
     checkChange: (_item) => true,
-    contextMenu: (_option) => true,
-    contextOpen: (_ref) => true
+    contextOpen: (_option) => true
   },
   setup(props, { emit }) {
-    const dropdownRef = ref(null);
-    const dropdownVisible = ref(false);
+    const dropdownTriggerRef = ref(null);
     const selectable = computed(() => {
       return props.selectionType === "checkbox" || props.selectionType === "radio";
     });
@@ -76,32 +70,22 @@ const _sfc_main = defineComponent({
       emit("checkChange", props.item);
     };
     const handleContextmenu = (e) => {
-      e.preventDefault();
-      e.stopPropagation();
-      if (dropdownRef.value) {
-        dropdownRef.value.handleOpen();
-      }
-    };
-    const handleItemContextMenu = (command) => {
-      emit("contextMenu", { key: command, item: props.item });
-    };
-    const handleContextVisibleChange = (visible) => {
-      dropdownVisible.value = visible;
-      if (visible) {
-        emit("contextOpen", dropdownRef.value);
+      if (dropdownTriggerRef.value != null) {
+        emit("contextOpen", {
+          item: props.item,
+          triggerEl: dropdownTriggerRef.value,
+          e
+        });
       }
     };
     return {
-      dropdownRef,
-      dropdownVisible,
+      dropdownTriggerRef,
       selectable,
       selected,
       icon,
       handleClick,
       handleCheckChange,
-      handleContextmenu,
-      handleItemContextMenu,
-      handleContextVisibleChange
+      handleContextmenu
     };
   }
 });
@@ -125,12 +109,11 @@ const _hoisted_6 = {
   class: "ele-file-list-item-tools"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_EleDropdown = resolveComponent("EleDropdown");
   return openBlock(), createElementBlock("div", {
     class: normalizeClass([
       "ele-file-list-item",
       { "is-checked": _ctx.selected },
-      { "is-active": _ctx.dropdownVisible }
+      { "is-active": _ctx.ctxMenuDropdownVisible }
     ]),
     onClick: _cache[3] || (_cache[3] = withModifiers((...args) => _ctx.handleClick && _ctx.handleClick(...args), ["stop"]))
   }, [
@@ -186,34 +169,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 4);
       }), 128))
     ], 32),
-    _ctx.contextMenus || _ctx.$slots.contextMenu ? (openBlock(), createBlock(_component_EleDropdown, mergeProps({
-      key: 0,
-      placement: "bottom-start",
-      popperClass: "ele-file-list-item-context"
-    }, _ctx.contextMenuProps || {}, {
-      ref: "dropdownRef",
-      trigger: "click",
+    createElementVNode("div", {
+      ref: "dropdownTriggerRef",
       class: "ele-file-list-item-dropdown",
-      items: _ctx.contextMenus,
-      onCommand: _ctx.handleItemContextMenu,
-      onVisibleChange: _ctx.handleContextVisibleChange
-    }), createSlots({
-      default: withCtx(() => [
-        createElementVNode("div", {
-          onClick: _cache[2] || (_cache[2] = withModifiers(() => {
-          }, ["stop"]))
-        })
-      ]),
-      _: 2
-    }, [
-      _ctx.$slots.contextMenu ? {
-        name: "dropdownMenu",
-        fn: withCtx(() => [
-          renderSlot(_ctx.$slots, "contextMenu", { item: _ctx.item })
-        ]),
-        key: "0"
-      } : void 0
-    ]), 1040, ["items", "onCommand", "onVisibleChange"])) : createCommentVNode("", true)
+      onClick: _cache[2] || (_cache[2] = withModifiers(() => {
+      }, ["stop"]))
+    }, null, 512)
   ], 2);
 }
 const fileTableItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/es/ele-file-list/components/file-table.d.ts

@@ -1,7 +1,5 @@
-import { PropType, Ref } from 'vue';
-import { EleDropdownProps, EleDropdownInstance } from '../../ele-app/plus';
-import { TableItemInstance } from '../props';
-import { IconItem, FileItem, ColumnItem, ItemContextMenuOption, SelectionType, ContextMenus } from '../types';
+import { PropType } from 'vue';
+import { IconItem, FileItem, ColumnItem, SelectionType, ContextOpenOption } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 文件数据 */
@@ -32,25 +30,22 @@ declare const _default: import('vue').DefineComponent<{
     order: StringConstructor;
     /** 自定义列配置 */
     columns: PropType<ColumnItem[]>;
-    /** 右键菜单 */
-    contextMenus: PropType<ContextMenus>;
-    /** 右键菜单属性 */
-    contextMenuProps: PropType<EleDropdownProps>;
+    /** 文件右键菜单是否打开 */
+    ctxMenuDropdownVisible: BooleanConstructor;
+    /** 当前打开的右键菜单对应的文件数据 */
+    contextMenuFileItem: PropType<FileItem | null>;
 }, {
-    itemRefs: Ref<TableItemInstance[]>;
     tableCols: import('vue').ComputedRef<ColumnItem[]>;
-    getContextMenus: (item: FileItem) => import('../../ele-dropdown/types').DropdownItem[] | undefined;
     handleCheckAllChange: () => void;
     handleItemClick: (item: FileItem) => void;
     handleItemCheckChange: (item: FileItem) => void;
     handleSortChange: (sort: string, col?: ColumnItem) => void;
-    handleItemContextMenu: (option: ItemContextMenuOption) => void;
-    handleItemContextOpen: (ref: EleDropdownInstance) => void;
+    handleItemContextOpen: (option: ContextOpenOption) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     checkAllChange: () => true;
     itemClick: (_item: FileItem) => true;
     itemCheckChange: (_item: FileItem) => true;
-    itemContextMenu: (_option: ItemContextMenuOption) => true;
+    itemContextOpen: (_option: ContextOpenOption) => true;
     sortChange: (_sort: string) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 文件数据 */
@@ -81,19 +76,20 @@ declare const _default: import('vue').DefineComponent<{
     order: StringConstructor;
     /** 自定义列配置 */
     columns: PropType<ColumnItem[]>;
-    /** 右键菜单 */
-    contextMenus: PropType<ContextMenus>;
-    /** 右键菜单属性 */
-    contextMenuProps: PropType<EleDropdownProps>;
+    /** 文件右键菜单是否打开 */
+    ctxMenuDropdownVisible: BooleanConstructor;
+    /** 当前打开的右键菜单对应的文件数据 */
+    contextMenuFileItem: PropType<FileItem | null>;
 }>> & {
     onItemClick?: ((_item: FileItem) => any) | undefined;
     onSortChange?: ((_sort: string) => any) | undefined;
     onCheckAllChange?: (() => any) | undefined;
     onItemCheckChange?: ((_item: FileItem) => any) | undefined;
-    onItemContextMenu?: ((_option: ItemContextMenuOption) => any) | undefined;
+    onItemContextOpen?: ((_option: ContextOpenOption) => any) | undefined;
 }, {
     sortable: boolean;
-    isIndeterminate: boolean;
+    ctxMenuDropdownVisible: boolean;
     isCheckAll: boolean;
+    isIndeterminate: boolean;
 }, {}>;
 export default _default;

package/es/ele-file-list/components/file-table.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createElementBlock, normalizeClass, withModifiers, createCommentVNode, toDisplayString, Fragment, renderList, normalizeStyle, renderSlot, createTextVNode, createSlots, mergeProps } from "vue";
+import { defineComponent, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createElementBlock, normalizeClass, withModifiers, createCommentVNode, toDisplayString, Fragment, renderList, normalizeStyle, renderSlot, createTextVNode, createSlots, mergeProps } from "vue";
 import ReceiverView from "../../ele-config-provider/components/receiver-view";
 import FileTableItem from "./file-table-item";
 import FileSort from "./file-sort";
@@ -34,20 +34,19 @@ const _sfc_main = defineComponent({
     order: String,
     /** 自定义列配置 */
     columns: Array,
-    /** 右键菜单 */
-    contextMenus: [Array, Function],
-    /** 右键菜单属性 */
-    contextMenuProps: Object
+    /** 文件右键菜单是否打开 */
+    ctxMenuDropdownVisible: Boolean,
+    /** 当前打开的右键菜单对应的文件数据 */
+    contextMenuFileItem: Object
   },
   emits: {
     checkAllChange: () => true,
     itemClick: (_item) => true,
     itemCheckChange: (_item) => true,
-    itemContextMenu: (_option) => true,
+    itemContextOpen: (_option) => true,
     sortChange: (_sort) => true
   },
   setup(props, { emit }) {
-    const itemRefs = ref([]);
     const tableCols = computed(() => {
       if (props.columns) {
         return props.columns;
@@ -74,12 +73,6 @@ const _sfc_main = defineComponent({
       ];
       return cols;
     });
-    const getContextMenus = (item) => {
-      if (typeof props.contextMenus === "function") {
-        return props.contextMenus(item);
-      }
-      return props.contextMenus;
-    };
     const handleCheckAllChange = () => {
       emit("checkAllChange");
     };
@@ -98,27 +91,15 @@ const _sfc_main = defineComponent({
         emit("sortChange", sort);
       }
     };
-    const handleItemContextMenu = (option) => {
-      emit("itemContextMenu", option);
-    };
-    const handleItemContextOpen = (ref2) => {
-      if (itemRefs.value) {
-        itemRefs.value.forEach((r) => {
-          if ((r == null ? void 0 : r.dropdownRef) && r.dropdownRef !== ref2) {
-            r.dropdownRef.handleClose();
-          }
-        });
-      }
+    const handleItemContextOpen = (option) => {
+      emit("itemContextOpen", option);
     };
     return {
-      itemRefs,
       tableCols,
-      getContextMenus,
       handleCheckAllChange,
       handleItemClick,
       handleItemCheckChange,
       handleSortChange,
-      handleItemContextMenu,
       handleItemContextOpen
     };
   }
@@ -160,7 +141,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               }, null, 2)) : createCommentVNode("", true)
             ])) : createCommentVNode("", true),
             createElementVNode("div", {
-              class: "ele-file-list-item-name",
+              class: normalizeClass(["ele-file-list-item-name", { "is-sortable": _ctx.sortable }]),
               onClick: _cache[1] || (_cache[1] = ($event) => _ctx.handleSortChange("name"))
             }, [
               createElementVNode("span", null, toDisplayString(_ctx.nameText), 1),
@@ -170,12 +151,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 order: _ctx.order,
                 name: "name"
               }, null, 8, ["sort", "order"])) : createCommentVNode("", true)
-            ]),
+            ], 2),
             (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.tableCols, (col) => {
               return openBlock(), createElementBlock("div", {
                 key: col.prop,
                 style: normalizeStyle(col.headerStyle || col.style),
-                class: "ele-file-list-item-cell",
+                class: normalizeClass([
+                  "ele-file-list-item-cell",
+                  { "is-sortable": col.sortable }
+                ]),
                 onClick: ($event) => _ctx.handleSortChange(col.prop, col)
               }, [
                 createElementVNode("span", null, [
@@ -194,7 +178,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   order: _ctx.order,
                   name: col.prop
                 }, null, 8, ["sort", "order", "name"])) : createCommentVNode("", true)
-              ], 12, _hoisted_5);
+              ], 14, _hoisted_5);
             }), 128))
           ])
         ])
@@ -203,19 +187,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.data, (item) => {
           return openBlock(), createBlock(_component_FileTableItem, {
             key: item.key,
-            ref_for: true,
-            ref: "itemRefs",
             item,
             selectionType: _ctx.selectionType,
             selections: _ctx.selections,
             current: _ctx.current,
             icons: _ctx.icons,
             columns: _ctx.tableCols,
-            contextMenus: _ctx.getContextMenus(item),
-            contextMenuProps: _ctx.contextMenuProps,
+            ctxMenuDropdownVisible: _ctx.ctxMenuDropdownVisible && _ctx.contextMenuFileItem === item,
             onClick: _ctx.handleItemClick,
             onCheckChange: _ctx.handleItemCheckChange,
-            onContextMenu: _ctx.handleItemContextMenu,
             onContextOpen: _ctx.handleItemContextOpen
           }, createSlots({ _: 2 }, [
             renderList(Object.keys(_ctx.$slots), (name) => {
@@ -226,7 +206,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ])
               };
             })
-          ]), 1032, ["item", "selectionType", "selections", "current", "icons", "columns", "contextMenus", "contextMenuProps", "onClick", "onCheckChange", "onContextMenu", "onContextOpen"]);
+          ]), 1032, ["item", "selectionType", "selections", "current", "icons", "columns", "ctxMenuDropdownVisible", "onClick", "onCheckChange", "onContextOpen"]);
         }), 128))
       ])
     ]),

package/es/ele-file-list/index.d.ts

@@ -1,5 +1,6 @@
-import { Ref } from 'vue';
-import { FileItem, SortValue, ItemContextMenuOption, FileListLocale } from './types';
+import { EleDropdownInstance } from '../ele-app/plus';
+import { DropdownItem } from '../ele-dropdown/types';
+import { FileItem, SortValue, ItemContextMenuOption, ContextOpenOption, FileListLocale } from './types';
 
 declare const _default: import('vue').DefineComponent<{
     data: {
@@ -20,10 +21,7 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<import('./types').IconItem[]>;
         default: () => import('./types').IconItem[];
     };
-    smallIcons: {
-        type: import('vue').PropType<import('./types').IconItem[]>;
-        default: () => import('./types').IconItem[];
-    };
+    smallIcons: import('vue').PropType<import('./types').IconItem[]>;
     columns: import('vue').PropType<import('./types').ColumnItem[]>;
     boxChoose: BooleanConstructor;
     contextMenus: import('vue').PropType<import('./types').ContextMenus>;
@@ -31,7 +29,29 @@ declare const _default: import('vue').DefineComponent<{
     locale: import('vue').PropType<Partial<FileListLocale>>;
 }, {
     lang: import('vue').ComputedRef<FileListLocale>;
-    selectorStyle: Ref<Partial<import('vue').CSSProperties>>;
+    selectorStyle: {
+        top: string;
+        left: string;
+        width: string;
+        height: string;
+        display: string;
+    };
+    ctxMenuDropdownRef: import('vue').Ref<EleDropdownInstance>;
+    ctxMenuDropdownItems: import('vue').ShallowRef<DropdownItem[]>;
+    ctxMenuDropdownVirtualRef: import('vue').Ref<any>;
+    ctxMenuDropdownVisible: import('vue').Ref<any>;
+    contextMenuFileItem: import('vue').Ref<{
+        [x: string]: unknown;
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        key: string | number;
+        name: string;
+        url?: string | undefined;
+        thumbnail?: string | undefined;
+        isDirectory?: boolean | undefined;
+        length?: string | undefined;
+        updateTime?: string | undefined;
+    } | null | undefined>;
     isCheckAll: import('vue').ComputedRef<boolean>;
     isIndeterminate: import('vue').ComputedRef<boolean>;
     handleCheckAllChange: () => void;
@@ -39,6 +59,9 @@ declare const _default: import('vue').DefineComponent<{
     handleItemClick: (item: FileItem) => void;
     handleSortChange: (name: string) => void;
     handleItemContextMenu: (option: ItemContextMenuOption) => void;
+    handleItemCtxMenuClick: (key: string) => void;
+    handleItemCtxMenuVisible: (visible: boolean) => void;
+    handleItemContextOpen: (option: ContextOpenOption) => void;
     handleMousedown: (event: MouseEvent) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     itemClick: (_item: FileItem) => boolean;
@@ -46,6 +69,7 @@ declare const _default: import('vue').DefineComponent<{
     'update:selections': (_selection?: FileItem[]) => boolean;
     'update:current': (_current?: FileItem | null) => boolean;
     itemContextMenu: (_option: ItemContextMenuOption) => boolean;
+    itemContextOpen: (_dropdownRef: EleDropdownInstance, _item: FileItem) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     data: {
         type: import('vue').PropType<FileItem[]>;
@@ -65,10 +89,7 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<import('./types').IconItem[]>;
         default: () => import('./types').IconItem[];
     };
-    smallIcons: {
-        type: import('vue').PropType<import('./types').IconItem[]>;
-        default: () => import('./types').IconItem[];
-    };
+    smallIcons: import('vue').PropType<import('./types').IconItem[]>;
     columns: import('vue').PropType<import('./types').ColumnItem[]>;
     boxChoose: BooleanConstructor;
     contextMenus: import('vue').PropType<import('./types').ContextMenus>;
@@ -79,12 +100,12 @@ declare const _default: import('vue').DefineComponent<{
     onSortChange?: ((_sorter: SortValue) => any) | undefined;
     "onUpdate:selections"?: ((_selection?: FileItem[] | undefined) => any) | undefined;
     "onUpdate:current"?: ((_current?: FileItem | null | undefined) => any) | undefined;
+    onItemContextOpen?: ((_dropdownRef: EleDropdownInstance, _item: FileItem) => any) | undefined;
     onItemContextMenu?: ((_option: ItemContextMenuOption) => any) | undefined;
 }, {
     grid: boolean;
     sortable: boolean;
     icons: import('./types').IconItem[];
-    smallIcons: import('./types').IconItem[];
     boxChoose: boolean;
 }, {}>;
 export default _default;