ele-admin-plus 1.2.1-beta.2 → 1.2.1-beta.4

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: {
@@ -13,17 +14,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    sortable: BooleanConstructor; /** 鼠标选择框样式 */
+    sortable: BooleanConstructor;
     sort: StringConstructor;
     order: StringConstructor;
     icons: {
         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,13 +59,17 @@ 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;
     sortChange: (_sorter: SortValue) => boolean;
-    'update:selections': (_selection?: FileItem[] | undefined) => boolean;
-    'update:current': (_current?: FileItem | null | undefined) => boolean;
+    '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[]>;
@@ -58,17 +82,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    sortable: BooleanConstructor; /** 鼠标选择框样式 */
+    sortable: BooleanConstructor;
     sort: StringConstructor;
     order: StringConstructor;
     icons: {
         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;

package/es/ele-file-list/index.js

@@ -1,24 +1,30 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createElementBlock, createBlock, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, normalizeStyle } from "vue";
+import { defineComponent, reactive, ref, shallowRef, computed, watch, onBeforeUnmount, nextTick, resolveComponent, openBlock, createElementBlock, createBlock, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, normalizeStyle, mergeProps, createCommentVNode } from "vue";
 import { throttle } from "../utils/core";
 import { useLocale } from "../ele-config-provider/receiver";
+import EleDropdown from "../ele-dropdown/index";
 import FileGrid from "./components/file-grid";
 import FileTable from "./components/file-table";
 import { fileListProps, fileListEmits } from "./props";
 const GRID_ITEM_SEL = ".ele-file-list-body>.ele-file-list-item";
 const _sfc_main = defineComponent({
   name: "EleFileList",
-  components: { FileGrid, FileTable },
+  components: { EleDropdown, FileGrid, FileTable },
   props: fileListProps,
   emits: fileListEmits,
   setup(props, { emit }) {
     const { lang } = useLocale("fileList", props);
-    const selectorStyle = ref({
+    const selectorStyle = reactive({
       top: "0px",
       left: "0px",
       width: "0px",
       height: "0px",
       display: "none"
     });
+    const ctxMenuDropdownRef = ref(null);
+    const ctxMenuDropdownItems = shallowRef([]);
+    const ctxMenuDropdownVirtualRef = ref();
+    const ctxMenuDropdownVisible = ref(false);
+    const contextMenuFileItem = ref(null);
     const isCheckAll = computed(() => {
       return !!(props.data && props.data.length && props.selections && props.selections.length && !props.data.some(
         (d) => {
@@ -97,6 +103,62 @@ const _sfc_main = defineComponent({
     const handleItemContextMenu = (option) => {
       emit("itemContextMenu", option);
     };
+    const handleItemCtxMenuClick = (key) => {
+      if (contextMenuFileItem.value != null) {
+        emit("itemContextMenu", { key, item: contextMenuFileItem.value });
+      }
+    };
+    const handleItemCtxMenuVisible = (visible) => {
+      ctxMenuDropdownVisible.value = visible;
+      if (visible && ctxMenuDropdownRef.value != null && contextMenuFileItem.value != null) {
+        emit(
+          "itemContextOpen",
+          ctxMenuDropdownRef.value,
+          contextMenuFileItem.value
+        );
+      }
+    };
+    const getContextMenus = (item) => {
+      if (typeof props.contextMenus === "function") {
+        return props.contextMenus(item);
+      }
+      return props.contextMenus;
+    };
+    const hideAllDropdown = () => {
+      if (ctxMenuDropdownRef.value) {
+        ctxMenuDropdownRef.value.handleClose();
+      }
+    };
+    const showItemContextMenu = (item, triggerEl) => {
+      if (contextMenuFileItem.value != null && contextMenuFileItem.value === item) {
+        return;
+      }
+      hideAllDropdown();
+      nextTick(() => {
+        contextMenuFileItem.value = item;
+        ctxMenuDropdownItems.value = getContextMenus(item) || [];
+        ctxMenuDropdownVirtualRef.value = triggerEl;
+        if (ctxMenuDropdownItems.value.length) {
+          nextTick(() => {
+            ctxMenuDropdownRef.value && ctxMenuDropdownRef.value.handleOpen();
+          });
+        }
+      });
+    };
+    const handleItemContextOpen = (option) => {
+      if (props.contextMenus == null) {
+        return;
+      }
+      option.e.preventDefault();
+      option.e.stopPropagation();
+      if (ctxMenuDropdownVirtualRef.value !== option.triggerEl) {
+        showItemContextMenu(option.item, option.triggerEl);
+        return;
+      }
+      if (ctxMenuDropdownItems.value.length && ctxMenuDropdownRef.value) {
+        ctxMenuDropdownRef.value.handleOpen();
+      }
+    };
     const handleMousedown = (event) => {
       if (!props.boxChoose || props.selectionType !== "checkbox") {
         return;
@@ -119,13 +181,11 @@ const _sfc_main = defineComponent({
           Math.abs(moveY - downY),
           target.clientHeight - top
         );
-        selectorStyle.value = {
-          left: left + "px",
-          top: top + "px",
-          width: width + "px",
-          height: height + "px",
-          display: "block"
-        };
+        selectorStyle.left = left + "px";
+        selectorStyle.top = top + "px";
+        selectorStyle.width = width + "px";
+        selectorStyle.height = height + "px";
+        selectorStyle.display = "block";
         if (width < 6 || height < 6) {
           items.forEach((item) => {
             item.classList.remove("is-active");
@@ -147,7 +207,7 @@ const _sfc_main = defineComponent({
         });
       }, 60);
       const mouseupFn = (e) => {
-        selectorStyle.value = { ...selectorStyle.value, display: "none" };
+        selectorStyle.display = "none";
         const moveX = Math.max(e.clientX, position.left);
         const moveY = Math.max(e.clientY, position.top);
         const left = Math.min(moveX, downX) - position.left;
@@ -180,9 +240,26 @@ const _sfc_main = defineComponent({
       document.addEventListener("mousemove", mousemoveFn);
       document.addEventListener("mouseup", mouseupFn);
     };
+    watch(
+      [() => props.grid, () => props.data],
+      () => {
+        hideAllDropdown();
+        ctxMenuDropdownVirtualRef.value = null;
+        contextMenuFileItem.value = null;
+      },
+      { deep: true }
+    );
+    onBeforeUnmount(() => {
+      contextMenuFileItem.value = null;
+    });
     return {
       lang,
       selectorStyle,
+      ctxMenuDropdownRef,
+      ctxMenuDropdownItems,
+      ctxMenuDropdownVirtualRef,
+      ctxMenuDropdownVisible,
+      contextMenuFileItem,
       isCheckAll,
       isIndeterminate,
       handleCheckAllChange,
@@ -190,6 +267,9 @@ const _sfc_main = defineComponent({
       handleItemClick,
       handleSortChange,
       handleItemContextMenu,
+      handleItemCtxMenuClick,
+      handleItemCtxMenuVisible,
+      handleItemContextOpen,
       handleMousedown
     };
   }
@@ -204,6 +284,7 @@ const _export_sfc = (sfc, props) => {
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FileGrid = resolveComponent("FileGrid");
   const _component_FileTable = resolveComponent("FileTable");
+  const _component_EleDropdown = resolveComponent("EleDropdown");
   return openBlock(), createElementBlock("div", {
     class: "ele-file-list-group",
     onMousedown: _cache[0] || (_cache[0] = (...args) => _ctx.handleMousedown && _ctx.handleMousedown(...args))
@@ -219,12 +300,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       isIndeterminate: _ctx.isIndeterminate,
       checkAllText: _ctx.lang.selectAll,
       selectedText: _ctx.lang.selectTips,
-      contextMenus: _ctx.contextMenus,
-      contextMenuProps: _ctx.contextMenuProps,
+      ctxMenuDropdownVisible: _ctx.ctxMenuDropdownVisible,
+      contextMenuFileItem: _ctx.contextMenuFileItem,
       onCheckAllChange: _ctx.handleCheckAllChange,
       onItemClick: _ctx.handleItemClick,
       onItemCheckChange: _ctx.handleItemCheckChange,
-      onItemContextMenu: _ctx.handleItemContextMenu
+      onItemContextOpen: _ctx.handleItemContextOpen
     }, createSlots({ _: 2 }, [
       renderList(Object.keys(_ctx.$slots), (name) => {
         return {
@@ -234,7 +315,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         };
       })
-    ]), 1032, ["data", "icons", "selectionType", "selections", "current", "isCheckAll", "isIndeterminate", "checkAllText", "selectedText", "contextMenus", "contextMenuProps", "onCheckAllChange", "onItemClick", "onItemCheckChange", "onItemContextMenu"])) : (openBlock(), createBlock(_component_FileTable, {
+    ]), 1032, ["data", "icons", "selectionType", "selections", "current", "isCheckAll", "isIndeterminate", "checkAllText", "selectedText", "ctxMenuDropdownVisible", "contextMenuFileItem", "onCheckAllChange", "onItemClick", "onItemCheckChange", "onItemContextOpen"])) : (openBlock(), createBlock(_component_FileTable, {
       key: 1,
       data: _ctx.data,
       icons: _ctx.icons,
@@ -250,12 +331,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       sort: _ctx.sort,
       order: _ctx.order,
       columns: _ctx.columns,
-      contextMenus: _ctx.contextMenus,
-      contextMenuProps: _ctx.contextMenuProps,
+      ctxMenuDropdownVisible: _ctx.ctxMenuDropdownVisible,
+      contextMenuFileItem: _ctx.contextMenuFileItem,
       onCheckAllChange: _ctx.handleCheckAllChange,
       onItemClick: _ctx.handleItemClick,
       onItemCheckChange: _ctx.handleItemCheckChange,
-      onItemContextMenu: _ctx.handleItemContextMenu,
+      onItemContextOpen: _ctx.handleItemContextOpen,
       onSortChange: _ctx.handleSortChange
     }, createSlots({ _: 2 }, [
       renderList(Object.keys(_ctx.$slots), (name) => {
@@ -266,11 +347,28 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         };
       })
-    ]), 1032, ["data", "icons", "selectionType", "selections", "current", "isCheckAll", "isIndeterminate", "nameText", "sizeText", "timeText", "sortable", "sort", "order", "columns", "contextMenus", "contextMenuProps", "onCheckAllChange", "onItemClick", "onItemCheckChange", "onItemContextMenu", "onSortChange"])),
+    ]), 1032, ["data", "icons", "selectionType", "selections", "current", "isCheckAll", "isIndeterminate", "nameText", "sizeText", "timeText", "sortable", "sort", "order", "columns", "ctxMenuDropdownVisible", "contextMenuFileItem", "onCheckAllChange", "onItemClick", "onItemCheckChange", "onItemContextOpen", "onSortChange"])),
     createElementVNode("div", {
       class: "ele-file-list-selector",
       style: normalizeStyle(_ctx.selectorStyle)
-    }, null, 4)
+    }, null, 4),
+    _ctx.contextMenus ? (openBlock(), createBlock(_component_EleDropdown, mergeProps({
+      key: 2,
+      persistent: false,
+      placement: "bottom-start",
+      popperClass: "ele-file-list-item-context"
+    }, _ctx.contextMenuProps || {}, {
+      ref: "ctxMenuDropdownRef",
+      componentType: "pro",
+      preventContextmenu: true,
+      trigger: "click",
+      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)
   ], 32);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

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

@@ -1,5 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { EleDropdownProps } from '../ele-app/plus';
+import { EleDropdownProps, EleDropdownInstance } from '../ele-app/plus';
 import { default as FileGridItem } from './components/file-grid-item';
 import { default as FileTableItem } from './components/file-table-item';
 import { IconItem, FileItem, SortValue, ItemContextMenuOption, ColumnItem, SelectionType, ContextMenus, FileListLocale } from './types';
@@ -36,10 +36,7 @@ export declare const fileListProps: {
         default: () => IconItem[];
     };
     /** 表格模式后缀对应图标 */
-    smallIcons: {
-        type: PropType<IconItem[]>;
-        default: () => IconItem[];
-    };
+    smallIcons: PropType<IconItem[]>;
     /** 表格模式自定义列配置 */
     columns: PropType<ColumnItem[]>;
     /** 多选时是否支持鼠标框选 */
@@ -66,6 +63,8 @@ export declare const fileListEmits: {
     'update:current': (_current?: FileItem | null) => boolean;
     /** item 右键菜单项点击事件 */
     itemContextMenu: (_option: ItemContextMenuOption) => boolean;
+    /** item 右键菜单打开事件 */
+    itemContextOpen: (_dropdownRef: EleDropdownInstance, _item: FileItem) => boolean;
 };
 /**
  * 网格 item 实例

package/es/ele-file-list/props.js

@@ -1,4 +1,4 @@
-import { icons, smallIcons } from "./icons";
+import { icons } from "./icons";
 const fileListProps = {
   /** 数据 */
   data: {
@@ -30,12 +30,7 @@ const fileListProps = {
     }
   },
   /** 表格模式后缀对应图标 */
-  smallIcons: {
-    type: Array,
-    default: () => {
-      return smallIcons;
-    }
-  },
+  smallIcons: Array,
   /** 表格模式自定义列配置 */
   columns: Array,
   /** 多选时是否支持鼠标框选 */
@@ -57,7 +52,9 @@ const fileListEmits = {
   /** 更新单选选中数据 */
   "update:current": (_current) => true,
   /** item 右键菜单项点击事件 */
-  itemContextMenu: (_option) => true
+  itemContextMenu: (_option) => true,
+  /** item 右键菜单打开事件 */
+  itemContextOpen: (_dropdownRef, _item) => true
 };
 export {
   fileListEmits,

package/es/ele-file-list/style/index.scss

@@ -131,10 +131,12 @@
   .ele-file-list-body {
     padding-top: eleVar('file', 'item-space');
     padding-left: eleVar('file', 'item-space');
+    box-sizing: border-box;
   }
 
   /*  item */
   .ele-file-list-item {
+    flex-shrink: 0;
     width: eleVar('file', 'item-width');
     margin-right: eleVar('file', 'item-space');
     margin-bottom: eleVar('file', 'item-space');
@@ -171,7 +173,7 @@
         width: eleVar('file', 'image-size');
         height: eleVar('file', 'image-size');
         border-radius: eleVar('file', 'image-radius');
-        object-fit: cover;
+        object-fit: contain;
       }
     }
 
@@ -332,7 +334,7 @@
 
       & > .ele-file-list-item-image {
         border-radius: eleVar('file', 'td-image-radius');
-        object-fit: cover;
+        object-fit: contain;
       }
     }
 
@@ -393,10 +395,13 @@
     .ele-file-list-item-name,
     .ele-file-list-item-cell {
       transition: color $transition-base;
-      cursor: pointer;
 
-      &:hover {
-        color: elVar('color-primary');
+      &.is-sortable {
+        cursor: pointer;
+
+        &:hover {
+          color: elVar('color-primary');
+        }
       }
     }
   }

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

@@ -23,7 +23,7 @@ export type IconItemType = 'file' | 'dir';
  */
 export interface FileItem extends Record<string | number | symbol, unknown> {
   /** 唯一标识 */
-  key: string;
+  key: string | number;
   /** 文件名称 */
   name: string;
   /** 文件访问地址 */
@@ -93,6 +93,18 @@ export type ContextMenusFunc = (item: FileItem) => DropdownItem[];
  */
 export type ContextMenus = DropdownItem[] | ContextMenusFunc;
 
+/**
+ * 右键菜单打开参数
+ */
+export interface ContextOpenOption {
+  /** 数据 */
+  item: FileItem;
+  /** 触发节点 */
+  triggerEl: HTMLElement;
+  /** 事件对象 */
+  e: MouseEvent;
+}
+
 /**
  * 国际化
  */

package/es/ele-icon-select/components/icon-grid.d.ts

@@ -1,5 +1,7 @@
 import { PropType } from 'vue';
+import { StyleValue } from '../../ele-app/types';
 import { ElEmptyProps } from '../../ele-app/el';
+import { EleTooltipProps } from '../../ele-app/plus';
 
 declare const _default: import('vue').DefineComponent<{
     /** 选中的图标 */
@@ -14,13 +16,13 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否显示提示 */
     tooltip: BooleanConstructor;
     /** 提示属性 */
-    tooltipProps: PropType<Partial<import('../../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<EleTooltipProps>;
     /** 气泡是否展开 */
     popperVisible: BooleanConstructor;
     /** 网格样式 */
-    gridStyle: PropType<Partial<import('vue').CSSProperties>>;
+    gridStyle: PropType<StyleValue>;
     /** 图标样式 */
-    itemStyle: PropType<Partial<import('vue').CSSProperties>>;
+    itemStyle: PropType<StyleValue>;
 }, {
     tooltipVisible: import('vue').Ref<boolean>;
     tooltipContent: import('vue').Ref<string>;
@@ -44,17 +46,17 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否显示提示 */
     tooltip: BooleanConstructor;
     /** 提示属性 */
-    tooltipProps: PropType<Partial<import('../../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<EleTooltipProps>;
     /** 气泡是否展开 */
     popperVisible: BooleanConstructor;
     /** 网格样式 */
-    gridStyle: PropType<Partial<import('vue').CSSProperties>>;
+    gridStyle: PropType<StyleValue>;
     /** 图标样式 */
-    itemStyle: PropType<Partial<import('vue').CSSProperties>>;
+    itemStyle: PropType<StyleValue>;
 }>> & {
     onSelect?: ((_icon: string) => any) | undefined;
 }, {
-    popperVisible: boolean;
     tooltip: boolean;
+    popperVisible: boolean;
 }, {}>;
 export default _default;