ele-admin-plus 1.1.5 → 1.1.6-beta.2

package/lib/ele-config-provider/index.js

@@ -7,6 +7,12 @@ const index = vue.defineComponent({
   setup(props$1, { slots }) {
     const config = vue.reactive({ ...props$1 });
     vue.provide(props.PROVIDE_KEY, config);
+    vue.watch(
+      () => props$1.locale,
+      () => {
+        config.locale = props$1.locale;
+      }
+    );
     vue.watch(
       () => props$1.table,
       () => {
@@ -26,12 +32,6 @@ const index = vue.defineComponent({
         config.license = props$1.license;
       }
     );
-    vue.watch(
-      () => props$1.locale,
-      () => {
-        config.locale = props$1.locale;
-      }
-    );
     return () => {
       var _a;
       return (_a = slots.default) == null ? void 0 : _a.call(slots);

package/lib/ele-config-provider/props.d.ts

@@ -4,14 +4,14 @@ import type { EleLocale } from './types';
  * 属性
  */
 export declare const configProviderProps: {
+    /** 国际化 */
+    locale: PropType<EleLocale>;
     /** 表格全局配置 */
     table: PropType<Partial<Pick<import("../ele-pro-table/props").ProTableProps, "size" | "stripe" | "border" | "emptyProps" | "request" | "response" | "parseData" | "tools" | "maximizedIndex" | "pagination">>>;
     /** 高德地图密钥 */
     mapKey: StringConstructor;
     /** 授权码 */
     license: StringConstructor;
-    /** 国际化 */
-    locale: PropType<EleLocale>;
 };
 export type ConfigProviderProps = ExtractPropTypes<typeof configProviderProps>;
 /**

package/lib/ele-config-provider/props.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const configProviderProps = {
+  /** 国际化 */
+  locale: Object,
   /** 表格全局配置 */
   table: Object,
   /** 高德地图密钥 */
   mapKey: String,
   /** 授权码 */
-  license: String,
-  /** 国际化 */
-  locale: Object
+  license: String
 };
 const PROVIDE_KEY = "EleGlobalConfig";
 const LAYOUT_KEY = "EleLayoutState";

package/lib/ele-config-provider/receiver.d.ts

@@ -1,11 +1,11 @@
 import type { Ref } from 'vue';
 import { LAYOUT_KEY } from './props';
-import type { EleGlobalProvide, LocaleProps, UseLicenseResult, UseLocaleResult, LayoutProvide, ResponsiveProps } from './types';
+import type { GlobalProvide, UseLocaleResult, UseLicenseResult, LocaleProps, ResponsiveProps, LayoutProvide } from './types';
 export declare const UNAUTHORIZED_TIP = "EleAdminPlus \u4E3A\u5546\u4E1A\u4EA7\u54C1\u9700\u8981\u6388\u6743\u4F7F\u7528, \u8BF7\u524D\u5F80\u5B98\u7F51 www.eleadmin.com \u8D2D\u4E70\u6388\u6743";
 /**
  * 获取全局配置
  */
-export declare function useReceiver(): EleGlobalProvide;
+export declare function useReceiver(): GlobalProvide;
 /**
  * 获取全局属性
  */
@@ -15,7 +15,7 @@ export declare function useGlobalProps<T>(name: string): Ref<T>;
  */
 export declare function useLocale<T>(name?: string, props?: LocaleProps<T>): UseLocaleResult<T>;
 /**
- * 获取是否授权
+ * useLicense
  */
 export declare function useLicense(): UseLicenseResult;
 /**

package/lib/ele-config-provider/receiver.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("vue"),P=require("./props"),I=require("../lang/zh_CN"),Y="EleAdminPlus \u4E3A\u5546\u4E1A\u4EA7\u54C1\u9700\u8981\u6388\u6743\u4F7F\u7528, \u8BF7\u524D\u5F80\u5B98\u7F51 www.eleadmin.com \u8D2D\u4E70\u6388\u6743",_="BAFEDIHGLKJONMRQPUTSXWVaZYdcbgfejihmlkponsrqvutyxw10z432765+98/C",N=1698336417,R="1.1";function S(){return h.inject(P.PROVIDE_KEY,{})}function U(t){const o=S();return h.computed(()=>o[t]??{})}function K(t,o){const u=S();return{lang:h.computed(()=>{const r=u.locale??I;return t?Object.assign({},r[t]??{},o==null?void 0:o.locale):r}),globalConfig:u}}function x(){const t=S(),o=h.computed(()=>t.license),u=h.ref(!1),s=(r,p,n,l)=>{const e=[new Array(60).join("*")];if(e.push(Y),o.value?!r&&p==null&&!n&&e.push("\u8BF7\u4F7F\u7528\u6B63\u786E\u683C\u5F0F\u7684\u6388\u6743\u7801;"):e.push("\u8BF7\u5148\u914D\u7F6E\u81EA\u5DF1\u7684\u6388\u6743\u7801;"),r&&e.push(`\u6388\u6743\u7248\u672C\u53F7\u4E0D\u5339\u914D, \u8BF7\u4F7F\u7528: ${r}, \u5F53\u524D\u7248\u672C: ${R};`),typeof p=="number"){const a=new Date(p*1e3).toLocaleString();e.push(`\u6388\u6743\u5DF2\u5931\u6548, \u5230\u671F\u65F6\u95F4: ${a};`)}n&&e.push(`\u57DF\u540D\u4E0D\u5339\u914D, \u8BF7\u90E8\u7F72\u5728: ${n} \u4E0B, \u5F53\u524D\u57DF\u540D: ${l};`),e.push(new Array(60).join("*")),console.error(e.join(`
-`)),u.value=!1};return h.watch(o,r=>{var p;if(typeof r!="string"||!r)return s();try{const n=JSON.parse(y(r));if(n.product!=="EleAdminPlus")return s();const{version:l,expiration:e,domain:a}=n;if(l&&l!==R)return s(l);if(e&&e<N)return s(void 0,e);if(a){const d=(p=window==null?void 0:window.location)==null?void 0:p.hostname;if(!d)return s(void 0,void 0,a,"");if(d!=="localhost"&&d!=="127.0.0.1"){const E=a.split("."),m=d.split(".");for(let g=E.length-1;g>=0;g--)if(E[g]!==m[g])return s(void 0,void 0,a,d);if(m.length>E.length&&m[m.length-E.length-1]!=="www")return s(void 0,void 0,a,d)}}}catch(n){return console.error(n),s()}u.value=!0},{immediate:!0}),{authenticated:u,globalConfig:t}}function y(t){const o=(F,O,f)=>{const i=((c,v)=>{const T=c.length-v;if(T<=0)return c;const L=new Array(c.length);for(let D=0;D<c.length;D++)D<v?L[D]=c[T+D]:L[D]=c[D-v];return L})(F.split(""),f).join(""),A=[];let C=0;for(;C<i.length;){let c=C+O;c>i.length&&(c=i.length);const v=i.substring(C,c);A.push(v.split("").reverse().join("")),C=c}return A.join("")},u=t.indexOf("="),s=u===-1?t:t.substring(0,u),r=u===-1?"":t.substring(u),n=(o(s,12,3)+r).replace(/[^A-Za-z0-9\+\/\=]/g,""),l=o(_,3,1)+"=";let e="",a,d,E,m,g,w,j,b=0;for(;b<n.length;)m=l.indexOf(n.charAt(b++)),g=l.indexOf(n.charAt(b++)),w=l.indexOf(n.charAt(b++)),j=l.indexOf(n.charAt(b++)),a=m<<2|g>>4,d=(g&15)<<4|w>>2,E=(w&3)<<6|j,e=e+String.fromCharCode(a),w!=64&&(e=e+String.fromCharCode(d)),j!=64&&(e=e+String.fromCharCode(E));return e=(F=>{let O="",f=0,i=0,A=0,C=0;for(;f<F.length;)i=F.charCodeAt(f),i<128?(O+=String.fromCharCode(i),f++):i>191&&i<224?(A=F.charCodeAt(f+1),O+=String.fromCharCode((i&31)<<6|A&63),f+=2):(A=F.charCodeAt(f+1),C=F.charCodeAt(f+2),O+=String.fromCharCode((i&15)<<12|(A&63)<<6|C&63),f+=3);return O})(e),e}function B(t){return h.inject(P.LAYOUT_KEY,t??h.ref({}))}function M(t){const o=B();return h.computed(()=>{var u;return t.responsive??((u=h.unref(o))==null?void 0:u.responsive)??!0})}Object.defineProperty(exports,"LAYOUT_KEY",{enumerable:!0,get:()=>P.LAYOUT_KEY});exports.UNAUTHORIZED_TIP=Y;exports.useGlobalProps=U;exports.useLayoutState=B;exports.useLicense=x;exports.useLocale=K;exports.useReceiver=S;exports.useResponsive=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("vue"),L=require("./props"),N=require("../lang/zh_CN"),_="EleAdminPlus \u4E3A\u5546\u4E1A\u4EA7\u54C1\u9700\u8981\u6388\u6743\u4F7F\u7528, \u8BF7\u524D\u5F80\u5B98\u7F51 www.eleadmin.com \u8D2D\u4E70\u6388\u6743",K=1698336417,B="1.1";function w(){return h.inject(L.PROVIDE_KEY,{})}function U(u){const t=w();return h.computed(()=>t[u]??{})}function x(u,t){const e=w();return{lang:h.computed(()=>{const c=e.locale??N;return u?Object.assign({},c[u]??{},t==null?void 0:t.locale):c}),globalConfig:e}}function M(){const u=w(),t=h.computed(()=>{const r=u.license;return r?r.trim():void 0}),e=h.ref(!1);return h.watch(t,r=>{var c;if(typeof r!="string"||!r)return e.value=!1,d();try{const o=JSON.parse($(r));if(o.product!=="EleAdminPlus")return e.value=!1,d("");const{version:s,expiration:b,domain:a}=o;if(s&&s!==B)return e.value=!1,d(s);if(b&&b<K)return e.value=!1,d(void 0,b);if(a){const n=(c=window==null?void 0:window.location)==null?void 0:c.hostname;if(!n)return e.value=!1,d(void 0,void 0,a,"");if(n!=="localhost"&&n!=="127.0.0.1"){const g=a.split("."),E=n.split(".");for(let m=g.length-1;m>=0;m--)if(g[m]!==E[m])return e.value=!1,d(void 0,void 0,a,n);if(E.length>g.length&&E[E.length-g.length-1]!=="www")return e.value=!1,d(void 0,void 0,a,n)}}}catch(o){return e.value=!1,console.error(o),d("")}e.value=!0},{immediate:!0}),{authenticated:e,globalConfig:u}}function d(u,t,e,r){const c=new Array(60).join("*"),o=[c];if(o.push(_),u==null&&t==null&&e==null&&r==null&&o.push("\u8BF7\u5148\u914D\u7F6E\u81EA\u5DF1\u7684\u6388\u6743\u7801;"),!u&&t==null&&!e&&o.push("\u8BF7\u4F7F\u7528\u6B63\u786E\u683C\u5F0F\u7684\u6388\u6743\u7801;"),u&&o.push(`\u6388\u6743\u7248\u672C\u53F7\u4E0D\u5339\u914D, \u8BF7\u4F7F\u7528: ${u}, \u5F53\u524D\u7248\u672C: ${B};`),typeof t=="number"){const s=new Date(t*1e3).toLocaleString();o.push(`\u6388\u6743\u5DF2\u5931\u6548, \u5230\u671F\u65F6\u95F4: ${s};`)}e&&o.push(`\u57DF\u540D\u4E0D\u5339\u914D, \u8BF7\u90E8\u7F72\u5728: ${e} \u4E0B, \u5F53\u524D\u57DF\u540D: ${r};`),o.push(c),console.error(o.join(`
+`))}function $(u){const t=(p,A,f)=>{const i=((l,O)=>{const j=l.length-O;if(j<=0)return l;const Y=new Array(l.length);for(let v=0;v<l.length;v++)v<O?Y[v]=l[j+v]:Y[v]=l[v-O];return Y})(p.split(""),f).join(""),F=[];let C=0;for(;C<i.length;){let l=C+A;l>i.length&&(l=i.length);const O=i.substring(C,l);F.push(O.split("").reverse().join("")),C=l}return F.join("")},e=u.indexOf("="),r=e===-1?u:u.substring(0,e),c=e===-1?"":u.substring(e),s=(t(r,12,3)+c).replace(/[^A-Za-z0-9\+\/\=]/g,""),a=t("BAFEDIHGLKJONMRQPUTSXWVaZYdcbgfejihmlkponsrqvutyxw10z432765+98/C",3,1)+"=";let n="",g,E,m,R,P,S,T,D=0;for(;D<s.length;)R=a.indexOf(s.charAt(D++)),P=a.indexOf(s.charAt(D++)),S=a.indexOf(s.charAt(D++)),T=a.indexOf(s.charAt(D++)),g=R<<2|P>>4,E=(P&15)<<4|S>>2,m=(S&3)<<6|T,n=n+String.fromCharCode(g),S!=64&&(n=n+String.fromCharCode(E)),T!=64&&(n=n+String.fromCharCode(m));return n=(p=>{let A="",f=0,i=0,F=0,C=0;for(;f<p.length;)i=p.charCodeAt(f),i<128?(A+=String.fromCharCode(i),f++):i>191&&i<224?(F=p.charCodeAt(f+1),A+=String.fromCharCode((i&31)<<6|F&63),f+=2):(F=p.charCodeAt(f+1),C=p.charCodeAt(f+2),A+=String.fromCharCode((i&15)<<12|(F&63)<<6|C&63),f+=3);return A})(n),n}function I(u){return h.inject(L.LAYOUT_KEY,u??h.ref({}))}function q(u){const t=I();return h.computed(()=>{var e;return u.responsive??((e=h.unref(t))==null?void 0:e.responsive)??!0})}Object.defineProperty(exports,"LAYOUT_KEY",{enumerable:!0,get:()=>L.LAYOUT_KEY});exports.UNAUTHORIZED_TIP=_;exports.useGlobalProps=U;exports.useLayoutState=I;exports.useLicense=M;exports.useLocale=x;exports.useReceiver=w;exports.useResponsive=q;

package/lib/ele-config-provider/types/index.d.ts

@@ -10,17 +10,15 @@ import type { CopyableLocale } from '../../ele-copyable/types';
 /**
  * 全局配置
  */
-export interface EleGlobalProvide {
+export interface GlobalProvide {
+    /** 国际化 */
+    locale?: EleLocale;
     /** 表格配置 */
     table?: TableGlobalConfig;
     /** 地图密钥 */
     mapKey?: string;
     /** 授权码 */
     license?: string;
-    /** 国际化 */
-    locale?: EleLocale;
-    /** 是否开启页签缓存 */
-    keepAlive?: boolean;
 }
 /**
  * 表格配置
@@ -52,7 +50,7 @@ export interface UseLicenseResult {
     /** 是否授权 */
     authenticated: Ref<boolean>;
     /** 全局配置 */
-    globalConfig: EleGlobalProvide;
+    globalConfig: GlobalProvide;
 }
 /**
  * 获取国际化方法返回结果
@@ -61,7 +59,7 @@ export interface UseLocaleResult<T> {
     /** 语言 */
     lang: ComputedRef<T>;
     /** 全局配置 */
-    globalConfig: EleGlobalProvide;
+    globalConfig: GlobalProvide;
 }
 /**
  * 带国际化的组件属性

package/lib/ele-data-table/index.d.ts

@@ -32,7 +32,6 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<import("./types").TableEmptyProps>;
         default: () => null;
     };
-    /** 表格列配置 */
     rowClickChecked: import("vue").PropType<import("./types").RowClickChecked>;
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
@@ -62,6 +61,11 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -79,7 +83,6 @@ declare const _default: import("vue").DefineComponent<{
     headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -98,10 +101,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: import("vue").PropType<{
             hasChildren?: string | undefined;
@@ -187,7 +186,6 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<import("./types").TableEmptyProps>;
         default: () => null;
     };
-    /** 表格列配置 */
     rowClickChecked: import("vue").PropType<import("./types").RowClickChecked>;
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
@@ -217,6 +215,11 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -234,7 +237,6 @@ declare const _default: import("vue").DefineComponent<{
     headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -253,10 +255,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: import("vue").PropType<{
             hasChildren?: string | undefined;
@@ -298,6 +296,7 @@ declare const _default: import("vue").DefineComponent<{
     lazy: boolean;
     data: any[];
     scrollbarAlwaysOn: boolean;
+    indent: number;
     stripe: boolean;
     border: boolean;
     showHeader: boolean;
@@ -305,7 +304,6 @@ declare const _default: import("vue").DefineComponent<{
     highlightCurrentRow: boolean;
     defaultExpandAll: boolean;
     selectOnIndeterminate: boolean;
-    indent: number;
     treeProps: {
         hasChildren?: string | undefined;
         children?: string | undefined;

package/lib/ele-data-table/index.js

@@ -125,7 +125,7 @@ const index = vue.defineComponent({
             if (props$1.rowClickChecked && !util.isDisableRow(row, props$1.data.indexOf(row), props$1.columns)) {
               const selections = methods.getSelectionRows();
               if (props$1.rowClickChecked === "smart" && selections != null && selections.length === 1) {
-                methods.setSelectedRows([row]);
+                setSelectedRows([row]);
               } else {
                 methods.toggleRowSelection(row);
               }

package/lib/ele-data-table/props.d.ts

@@ -165,6 +165,11 @@ export declare const dataTableProps: {
         default: boolean;
     };
     showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -182,7 +187,6 @@ export declare const dataTableProps: {
     headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -201,10 +205,6 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: PropType<{
             hasChildren?: string | undefined;

package/lib/ele-data-table/style/index.scss

@@ -13,6 +13,10 @@ $ele-expand-path: 'M605.08 512.14L338.35 245.27l51.76-51.68 318.41 318.58L390.09
   background: none;
 }
 
+.ele-data-table > .el-table__inner-wrapper > .el-table__header-wrapper {
+  z-index: 4;
+}
+
 .ele-data-table {
   /* 单元格背景 */
   & > .el-table__inner-wrapper {
@@ -268,6 +272,7 @@ $ele-expand-path: 'M605.08 512.14L338.35 245.27l51.76-51.68 318.41 318.58L390.09
     bottom: 0;
     width: 0;
     border-left: 1px solid eleVar('table', 'border-color');
+    z-index: 5;
   }
 
   &.el-table > .el-table__inner-wrapper::before,
@@ -275,6 +280,7 @@ $ele-expand-path: 'M605.08 512.14L338.35 245.27l51.76-51.68 318.41 318.58L390.09
     right: 0;
     height: 0;
     border-top: 1px solid eleVar('table', 'border-color');
+    z-index: 5;
   }
 
   &.el-table:not(.has-footer) > .el-table__inner-wrapper::before {
@@ -338,7 +344,6 @@ $ele-expand-path: 'M605.08 512.14L338.35 245.27l51.76-51.68 318.41 318.58L390.09
     & > .el-table__inner-wrapper > .el-table__header-wrapper {
       position: sticky;
       top: eleVar('table', 'sticky-top');
-      z-index: 3;
     }
   }
 }

package/lib/ele-file-list/components/file-grid-item.js

@@ -148,11 +148,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       class: "ele-file-list-item-checkbox",
       onClick: _cache[1] || (_cache[1] = vue.withModifiers((...args) => _ctx.onCheckChange && _ctx.onCheckChange(...args), ["stop"]))
     }, _hoisted_5)) : vue.createCommentVNode("", true),
-    _ctx.contextMenus || _ctx.$slots.contextMenu ? (vue.openBlock(), vue.createBlock(_component_EleDropdown, vue.mergeProps({ key: 1 }, _ctx.contextMenuProps, {
+    _ctx.contextMenus || _ctx.$slots.contextMenu ? (vue.openBlock(), vue.createBlock(_component_EleDropdown, vue.mergeProps({
+      key: 1,
+      placement: "bottom-start",
+      popperClass: "ele-file-list-item-context"
+    }, _ctx.contextMenuProps, {
       ref: "dropdownRef",
       trigger: "click",
-      placement: "bottom-start",
-      popperClass: "ele-file-list-item-context",
       class: "ele-file-list-item-dropdown",
       items: _ctx.contextMenus,
       onCommand: _ctx.onItemContextMenu,

package/lib/ele-file-list/components/file-grid.d.ts

@@ -28,6 +28,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     itemRefs: Ref<GridItemInstance[]>;
     headerText: import("vue").ComputedRef<string | undefined>;
+    getContextMenus: (item: FileItem) => import("../../ele-dropdown/types").DropdownItem[] | undefined;
     onCheckAllChange: () => void;
     onItemClick: (item: FileItem) => void;
     onItemCheckChange: (item: FileItem) => void;

package/lib/ele-file-list/components/file-grid.js

@@ -48,6 +48,12 @@ const _sfc_main = vue.defineComponent({
       }
       return void 0;
     });
+    const getContextMenus = (item) => {
+      if (typeof props.contextMenus === "function") {
+        return props.contextMenus(item);
+      }
+      return props.contextMenus;
+    };
     const onCheckAllChange = () => {
       emit("checkAllChange");
     };
@@ -72,6 +78,7 @@ const _sfc_main = vue.defineComponent({
     return {
       itemRefs,
       headerText,
+      getContextMenus,
       onCheckAllChange,
       onItemClick,
       onItemCheckChange,
@@ -122,7 +129,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           selections: _ctx.selections,
           current: _ctx.current,
           icons: _ctx.icons,
-          contextMenus: typeof _ctx.contextMenus === "function" ? _ctx.contextMenus(item) : _ctx.contextMenus,
+          contextMenus: _ctx.getContextMenus(item),
           contextMenuProps: _ctx.contextMenuProps,
           onClick: _ctx.onItemClick,
           onCheckChange: _ctx.onItemCheckChange,

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

@@ -182,11 +182,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 4);
       }), 128))
     ], 32),
-    _ctx.contextMenus || _ctx.$slots.contextMenu ? (vue.openBlock(), vue.createBlock(_component_EleDropdown, vue.mergeProps({ key: 0 }, _ctx.contextMenuProps, {
+    _ctx.contextMenus || _ctx.$slots.contextMenu ? (vue.openBlock(), vue.createBlock(_component_EleDropdown, vue.mergeProps({
+      key: 0,
+      placement: "bottom-start",
+      popperClass: "ele-file-list-item-context"
+    }, _ctx.contextMenuProps, {
       ref: "dropdownRef",
       trigger: "click",
-      placement: "bottom-start",
-      popperClass: "ele-file-list-item-context",
       class: "ele-file-list-item-dropdown",
       items: _ctx.contextMenus,
       onCommand: _ctx.onItemContextMenu,

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

@@ -38,6 +38,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     itemRefs: Ref<TableItemInstance[]>;
     tableCols: import("vue").ComputedRef<ColumnItem[]>;
+    getContextMenus: (item: FileItem) => import("../../ele-dropdown/types").DropdownItem[] | undefined;
     onCheckAllChange: () => void;
     onItemClick: (item: FileItem) => void;
     onItemCheckChange: (item: FileItem) => void;

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

@@ -74,6 +74,12 @@ const _sfc_main = vue.defineComponent({
       ];
       return cols;
     });
+    const getContextMenus = (item) => {
+      if (typeof props.contextMenus === "function") {
+        return props.contextMenus(item);
+      }
+      return props.contextMenus;
+    };
     const onCheckAllChange = () => {
       emit("checkAllChange");
     };
@@ -107,6 +113,7 @@ const _sfc_main = vue.defineComponent({
     return {
       itemRefs,
       tableCols,
+      getContextMenus,
       onCheckAllChange,
       onItemClick,
       onItemCheckChange,
@@ -201,7 +208,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           current: _ctx.current,
           icons: _ctx.icons,
           columns: _ctx.tableCols,
-          contextMenus: typeof _ctx.contextMenus === "function" ? _ctx.contextMenus(item) : _ctx.contextMenus,
+          contextMenus: _ctx.getContextMenus(item),
           contextMenuProps: _ctx.contextMenuProps,
           onClick: _ctx.onItemClick,
           onCheckChange: _ctx.onItemCheckChange,

package/lib/ele-modal/index.d.ts

@@ -89,7 +89,7 @@ declare const _default: import("vue").DefineComponent<{
     dialogRef: import("vue").Ref<ElDialogInstance>;
     container: import("vue").Ref<Element>;
     isFullscreen: import("vue").Ref<boolean>;
-    destroyed: import("vue").Ref<boolean>;
+    enable: import("vue").Ref<boolean>;
     dialogProps: import("vue").ComputedRef<ElDialogProps>;
     updateModelValue: (modelValue: boolean) => void;
     toggleFullscreen: (fullscreen?: boolean) => void;

package/lib/ele-modal/index.js

@@ -20,7 +20,9 @@ const _sfc_main = vue.defineComponent({
     const container = vue.ref(util.getModalContainer());
     const isFullscreen = vue.ref(props$1.fullscreen ?? false);
     const isActivated = vue.ref(true);
-    const destroyed = vue.ref(false);
+    const enable = vue.ref(
+      props$1.destroyOnClose && !props$1.modelValue ? false : true
+    );
     const dialogClass = vue.computed(() => {
       const layoutState = vue.unref(layoutProvide);
       const classes = [util.wrapperClass];
@@ -94,6 +96,7 @@ const _sfc_main = vue.defineComponent({
         showClose: false,
         draggable: false,
         alignCenter: false,
+        destroyOnClose: false,
         modalClass: dialogClass.value
       };
       return Object.assign({}, attrs, core.pick(props$1, props.dialogPropKeys), opt);
@@ -124,6 +127,9 @@ const _sfc_main = vue.defineComponent({
       if (props$1.resetOnClose || props$1.destroyOnClose) {
         isFullscreen.value = props$1.fullscreen ?? false;
       }
+      if (!enable.value) {
+        enable.value = true;
+      }
       vue.nextTick(() => {
         const modalEl = getModalEl();
         if (props$1.resetOnClose) {
@@ -157,6 +163,9 @@ const _sfc_main = vue.defineComponent({
       emit("close");
     };
     const onClosed = () => {
+      if (enable.value) {
+        enable.value = false;
+      }
       emit("closed");
     };
     const onOpenAutoFocus = () => {
@@ -185,6 +194,18 @@ const _sfc_main = vue.defineComponent({
         }
       }
     );
+    vue.watch(
+      () => props$1.destroyOnClose,
+      (destroyOnClose) => {
+        if (destroyOnClose) {
+          if (!props$1.modelValue && enable.value) {
+            enable.value = false;
+          }
+        } else if (!enable.value) {
+          enable.value = true;
+        }
+      }
+    );
     vue.onActivated(() => {
       isActivated.value = true;
     });
@@ -195,7 +216,7 @@ const _sfc_main = vue.defineComponent({
       dialogRef,
       container,
       isFullscreen,
-      destroyed,
+      enable,
       dialogProps,
       updateModelValue,
       toggleFullscreen,
@@ -241,7 +262,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           class: "ele-modal-header",
           style: vue.normalizeStyle(_ctx.headerStyle)
         }, [
-          vue.createElementVNode("div", {
+          _ctx.enable ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 0,
             class: "ele-modal-title",
             style: vue.normalizeStyle(_ctx.titleStyle)
           }, [
@@ -252,9 +274,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             }, () => [
               vue.createTextVNode(vue.toDisplayString(_ctx.title), 1)
             ])
-          ], 4),
-          _ctx.maxable ? (vue.openBlock(), vue.createElementBlock("div", {
-            key: 0,
+          ], 4)) : vue.createCommentVNode("", true),
+          _ctx.enable && _ctx.maxable ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 1,
             class: "ele-modal-tool",
             style: vue.normalizeStyle(_ctx.fullscreenBtnStyle),
             onClick: _cache[0] || (_cache[0] = ($event) => _ctx.toggleFullscreen())
@@ -268,8 +290,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               })
             ])
           ], 4)) : vue.createCommentVNode("", true),
-          _ctx.showClose ? (vue.openBlock(), vue.createElementBlock("div", {
-            key: 1,
+          _ctx.enable && _ctx.showClose ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 2,
             class: "ele-modal-tool",
             style: vue.normalizeStyle(_ctx.closeBtnStyle),
             onClick: close
@@ -286,24 +308,26 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 4)
       ]),
       default: vue.withCtx(() => [
-        vue.createElementVNode("div", {
+        _ctx.enable ? (vue.openBlock(), vue.createElementBlock("div", {
+          key: 0,
           class: "ele-modal-body",
           style: vue.normalizeStyle(_ctx.bodyStyle)
         }, [
           vue.renderSlot(_ctx.$slots, "default")
-        ], 4)
+        ], 4)) : vue.createCommentVNode("", true)
       ]),
       _: 2
     }, [
       _ctx.$slots.footer ? {
         name: "footer",
         fn: vue.withCtx(() => [
-          vue.createElementVNode("div", {
+          _ctx.enable ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 0,
             class: "ele-modal-footer",
             style: vue.normalizeStyle(_ctx.footerStyle)
           }, [
             vue.renderSlot(_ctx.$slots, "footer")
-          ], 4)
+          ], 4)) : vue.createCommentVNode("", true)
         ]),
         key: "0"
       } : void 0