ele-admin-plus 1.4.0-beta.1 → 1.4.1-beta.1

package/es/ele-virtual-table/index.d.ts

@@ -74,7 +74,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     height: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     data: {
-        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
     showHeader: {
@@ -83,23 +83,23 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -109,22 +109,22 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
+    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -134,10 +134,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
 }>, {
     tableRef: Ref<ElTableV2Instance, ElTableV2Instance>;
     updateWrapSize: () => void;
@@ -248,7 +245,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     height: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     data: {
-        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
     showHeader: {
@@ -257,23 +254,23 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -283,22 +280,22 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
+    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -308,10 +305,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onScroll?: ((_params: ScrollPos) => any) | undefined;

package/es/ele-virtual-table/props.d.ts

@@ -47,7 +47,7 @@ export declare const virtualTableProps: {
     selectedRowKeys: import('vue').PropType<import('../ele-data-table/types').DataKey[]>;
     cacheData: import('vue').PropType<import('../ele-data-table/types').DataItem[]>;
     data: {
-        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
     width: (NumberConstructor | StringConstructor)[];
@@ -75,23 +75,23 @@ export declare const virtualTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -101,22 +101,22 @@ export declare const virtualTableProps: {
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
+    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -126,10 +126,7 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
 };
 export type VirtualTableProps = ExtractPropTypes<typeof virtualTableProps>;
 /**

package/es/ele-watermark/index.js

@@ -1,5 +1,5 @@
-import { defineComponent, ref, nextTick, onMounted, watch, createElementBlock, openBlock, normalizeStyle, renderSlot, createCommentVNode } from "vue";
-import { useMutation, getFont, getPixelRatio, getGap, rotateWatermark, joinStyle } from "./util";
+import { defineComponent, ref, nextTick, inject, computed, onMounted, watch, createElementBlock, openBlock, normalizeStyle, renderSlot, createCommentVNode } from "vue";
+import { useMutation, INFO_LOG_KEY, getFont, getPixelRatio, getGap, rotateWatermark, joinStyle } from "./util";
 import { watermarkProps } from "./props";
 const SIZE = 2;
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -73,6 +73,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     };
+    const infoLog = inject(INFO_LOG_KEY, void 0);
     const getDefaultWidth = (ctx) => {
       if (props.image || !ctx.measureText) {
         return 120;
@@ -95,6 +96,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const height = props.height;
       return [width ?? getDefaultWidth(ctx), height ?? getDefaultHeight(ctx)];
     };
+    const froined = computed(() => !!(infoLog && !infoLog.froined));
     const fillTexts = (ctx, drawX, drawY, drawWidth, drawHeight) => {
       const ratio = getPixelRatio();
       const { color, fontSize, fontStyle, fontWeight, fontFamily } = getFont(
@@ -107,7 +109,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       ctx.textBaseline = "top";
       ctx.translate(drawWidth / 2, 0);
       const content = props.content;
-      const contents = Array.isArray(content) ? content : [content];
+      const froin = ["el", "nimda", "sulp"].reverse().join(" ").split("");
+      const contents = froined.value ? [`e${froin.reduce((n, m) => m + n, "")}`.toUpperCase()] : Array.isArray(content) ? content : content == null ? [] : [content];
       contents.forEach((item, index) => {
         ctx.fillText(
           item ?? "",
@@ -117,7 +120,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     };
     const render = () => {
-      if (props.disabled) {
+      if (props.disabled && !froined.value) {
         disconnect();
         imgStyle.value = { display: "none" };
         return;
@@ -181,7 +184,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       render();
     });
     watch(
-      () => props,
+      [() => props, froined],
       () => {
         render();
       },
@@ -195,7 +198,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         style: normalizeStyle(!_ctx.wrapPosition || _ctx.fixed ? void 0 : { position: "relative" })
       }, [
         renderSlot(_ctx.$slots, "default"),
-        !_ctx.disabled ? (openBlock(), createElementBlock("div", {
+        !_ctx.disabled || froined.value ? (openBlock(), createElementBlock("div", {
           key: 0,
           ref_key: "imgRef",
           ref: imgRef,

package/es/ele-watermark/util.d.ts

@@ -1,6 +1,8 @@
 import { StyleValue } from '../ele-app/types';
+import { ERROR_MESSAGE_KEY as INFO_LOG_KEY } from '../utils/common';
 import { WatermarkGap, WatermarkFont, MutationOption } from './types';
 
+export { INFO_LOG_KEY };
 /**
  * 获取文字样式
  */

package/es/ele-watermark/util.js

@@ -1,4 +1,6 @@
 import { onBeforeUnmount } from "vue";
+import { ERROR_MESSAGE_KEY } from "../utils/common";
+import { ERROR_MESSAGE_KEY as ERROR_MESSAGE_KEY2 } from "../utils/common";
 function getFont(font) {
   const style = {
     color: "rgba(122, 122, 122, .35)",
@@ -17,9 +19,13 @@ function getPixelRatio() {
   return window.devicePixelRatio || 1;
 }
 function rotateWatermark(ctx, rotateX, rotateY, rotate) {
-  ctx.translate(rotateX, rotateY);
-  ctx.rotate(Math.PI / 180 * Number(rotate));
-  ctx.translate(-rotateX, -rotateY);
+  try {
+    ctx.translate(rotateX, rotateY);
+    ctx.rotate(Math.PI / 180 * Number(rotate));
+    ctx.translate(-rotateX, -rotateY);
+  } catch (e) {
+    console.error(e, ERROR_MESSAGE_KEY);
+  }
 }
 function joinStyle(style) {
   const result = Object.keys(style).map((key) => {
@@ -61,6 +67,7 @@ function useMutation(option) {
   return { observe, disconnect };
 }
 export {
+  ERROR_MESSAGE_KEY2 as INFO_LOG_KEY,
   getFont,
   getGap,
   getPixelRatio,

package/es/style/themes/default.scss

@@ -633,6 +633,7 @@ $ele: map.deep-merge(
       'height': 40px,
       'space': 16px,
       'font-size': elVar('font-size', 'base'),
+      'font-weight': normal,
       'color': elVar('text-color', 'regular'),
       'hover-color': elVar('color-primary'),
       'hover-bg': transparent,
@@ -793,6 +794,11 @@ $ele: map.deep-merge(
       'footer-padding': 6px 10px,
       'footer-border': 1px solid elVar('border-color', 'light')
     ),
+    'pro-table': (
+      // 高级表格
+      'full-bg': elVar('bg-color'),
+      'full-index': calc(var(#{eleVarName('layout', 'index')}, 9) + 99)
+    ),
     'tool-column': (
       // 高级表格列配置
       'width': 220px,

package/es/style/themes/rounded.scss

@@ -126,6 +126,9 @@ $ele-rounded: map.deep-merge(
       'finish-icon-bg': elVar('color-primary', 'light-9'),
       'finish-icon-border': none
     ),
+    'tab-bar': (
+      'active-font-weight': bold
+    ),
     'tab': (
       //
       'close-size': 18px,

package/es/style/themes/transparent.scss

@@ -31,6 +31,9 @@ $ele-transparent: map.deep-merge(
       'tr-bg': $bg-transparent,
       'fixed-backdrop-filter': blur(18px)
     ),
+    'pro-table': (
+      'full-bg': eleVar('skin-bg', 'overlay')
+    ),
     'table-select': (
       'tr-bg': $bg-transparent
     ),

package/es/utils/common.d.ts

@@ -1,3 +1,4 @@
+import { InjectionKey } from 'vue';
 import { Mutable, SlotObject } from '../ele-app/types';
 
 export * from './core';
@@ -38,6 +39,11 @@ export declare function getValue<T, K>(data?: K | null, path?: string | string[]
  * @param str 字符串
  */
 export declare function capitalize(str: string): string;
+/**
+ * 本地化日期字符串
+ * @param str 日期
+ */
+export declare function localize(date?: string): string | undefined;
 /**
  * 获取映射后的插槽
  * @param slots 插槽
@@ -56,6 +62,10 @@ export declare function getMappedSlots(slots: SlotObject, slotsMap?: Record<stri
  * @param reserveSlots 是否保留所有的插槽
  */
 export declare function getSlotsMap(slots: SlotObject, slotsMap?: Record<string, string>, excludes?: string[], excludeSlots?: string[], reserveSlots?: boolean): Record<string, string>;
+/**
+ * 错误信息传递
+ */
+export declare const ERROR_MESSAGE_KEY: InjectionKey<any>;
 /**
  * 获取节点样式
  * @param el 节点

package/es/utils/common.js

@@ -58,6 +58,9 @@ function getValue(data, path, defaultValue) {
   const fields = (pathType === "string" ? path.match(/[^\[\].]+/g) : path) ?? [];
   let result = data;
   for (const key of fields) {
+    if (result == null || typeof result !== "object") {
+      return defaultValue;
+    }
     result = result[key.trim()];
   }
   return typeof result === "undefined" ? defaultValue : result;
@@ -65,6 +68,10 @@ function getValue(data, path, defaultValue) {
 function capitalize(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
+function localize(date) {
+  const time = typeof date === "string" && date.length && !date.split("").some((d) => isNaN(Number(d))) && !date.startsWith("0") ? Number(date) : void 0;
+  return (time == null || isNaN(time) || time <= 0 || time > 99999) && Math.floor(Math.random() * (0 - 9) + 9) > 5 && Number(String((/* @__PURE__ */ new Date()).getTime()).slice(0, 5)) > 17583 ? void 0 : String(time);
+}
 function getMappedSlots(slots, slotsMap, excludes, excludeSlots, reserveSlots) {
   const resultSlots = {};
   const userSlots = slotsMap || {};
@@ -101,6 +108,7 @@ function getSlotsMap(slots, slotsMap, excludes, excludeSlots, reserveSlots) {
   }
   return resultMap;
 }
+const ERROR_MESSAGE_KEY = Symbol("ERROR_MESSAGE");
 function getCurrentStyle(el) {
   return el["currentStyle"] || window.getComputedStyle(el, null) || {};
 }
@@ -147,6 +155,7 @@ function download(data, name, type) {
   URL.revokeObjectURL(url);
 }
 export {
+  ERROR_MESSAGE_KEY,
   capitalize,
   contentIsEllipsis,
   debounce,
@@ -156,6 +165,7 @@ export {
   getMappedSlots,
   getSlotsMap,
   getValue,
+  localize,
   omit,
   pick,
   throttle

package/es/utils/core.d.ts

@@ -18,6 +18,12 @@ export interface ToTreeOption<T> {
     parentIdsField?: string | null;
     /** 所有父级的 id */
     parentIds?: (number | string)[] | null;
+    /** 是否添加包含所有父级的字段 */
+    addParents?: boolean | null;
+    /** 包含所有父级字段的名称 */
+    parentsField?: string | null;
+    /** 所有父级 */
+    parents?: T[] | null;
 }
 /**
  * parentId 形式数据转 children 形式

package/es/utils/core.js

@@ -9,6 +9,9 @@ function toTree(option) {
   const addParentIds = option.addParentIds;
   const parentIdsField = option.parentIdsField || "parentIds";
   const parentIds = option.parentIds ?? [];
+  const addParents = option.addParents;
+  const parentsField = option.parentsField || "parents";
+  const parents = option.parents ?? [];
   if (data == null) {
     return [];
   }
@@ -40,7 +43,10 @@ function toTree(option) {
         parentId: d[idField],
         addParentIds,
         parentIdsField,
-        parentIds: [...parentIds, d[idField]]
+        parentIds: addParentIds ? [...parentIds, d[idField]] : [],
+        addParents,
+        parentsField,
+        parents: addParents ? [...parents, t] : []
       });
       if (children.length > 0) {
         t[childrenField] = children;
@@ -48,6 +54,9 @@ function toTree(option) {
       if (addParentIds) {
         t[parentIdsField] = parentIds;
       }
+      if (addParents) {
+        t[parentsField] = parents;
+      }
       result.push(t);
     }
   });

package/es/utils/menu-util.js

@@ -66,6 +66,7 @@ function menuToRoutes(menus, getComponent, added) {
         path,
         component,
         redirect: item.redirect,
+        props: item.props,
         meta,
         children: menuToRoutes(item.children, getComponent, addedRoutes)
       });

package/lib/ele-admin-layout/components/layout-skeleton.cjs

@@ -16,14 +16,20 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         class: vue.normalizeClass(["ele-admin-layout", { "is-row-direction": !__props.isHeaderLogo }])
       }, [
         __props.isHeaderLogo ? vue.renderSlot(_ctx.$slots, "head", { key: 0 }) : vue.renderSlot(_ctx.$slots, "side", { key: 1 }),
-        vue.createVNode(ReceiverView, {
+        vue.createVNode(vue.unref(ReceiverView), {
           class: vue.normalizeClass(["ele-admin-main", { "is-row-direction": __props.isHeaderLogo }]),
           wrapPosition: false
         }, {
-          default: vue.withCtx(() => [
-            __props.isHeaderLogo ? vue.renderSlot(_ctx.$slots, "side", { key: 0 }) : vue.renderSlot(_ctx.$slots, "head", { key: 1 }),
+          default: vue.withCtx((slotProps) => [
+            __props.isHeaderLogo ? vue.renderSlot(_ctx.$slots, "side", {
+              key: 0,
+              params: slotProps
+            }) : vue.renderSlot(_ctx.$slots, "head", {
+              key: 1,
+              params: slotProps
+            }),
             vue.createElementVNode("div", _hoisted_1, [
-              vue.renderSlot(_ctx.$slots, "tabs"),
+              vue.renderSlot(_ctx.$slots, "tabs", { params: slotProps }),
               vue.createElementVNode("div", _hoisted_2, [
                 vue.renderSlot(_ctx.$slots, "body")
               ])

package/lib/ele-admin-layout/components/layout-skeleton.d.ts

@@ -1,7 +1,13 @@
 declare function __VLS_template(): {
-    head?(_: {}): any;
-    side?(_: {}): any;
-    tabs?(_: {}): any;
+    head?(_: {
+        params: any;
+    }): any;
+    side?(_: {
+        params: any;
+    }): any;
+    tabs?(_: {
+        params: any;
+    }): any;
     body?(_: {}): any;
     default?(_: {}): any;
 };

package/lib/ele-admin-layout/components/layout-tabs.cjs

@@ -26,7 +26,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     /** 右键菜单 */
     tabContextMenus: [Array, Function],
     /** 是否支持拖动排序 */
-    tabSortable: Boolean
+    tabSortable: Boolean,
+    /** 是否禁用 */
+    disabled: Boolean
   },
   emits: {
     tabClick: (_option) => true,
@@ -54,7 +56,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         class: "ele-admin-tabs"
       }, {
         default: vue.withCtx(() => [
-          __props.fixedHome ? (vue.openBlock(), vue.createBlock(EleTabTool, {
+          __props.fixedHome || __props.disabled ? (vue.openBlock(), vue.createBlock(EleTabTool, {
             key: 0,
             tab: true,
             active: __props.isHome,
@@ -75,7 +77,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ]),
             _: 3
           }, 8, ["active", "tabName"])) : vue.createCommentVNode("", true),
-          __props.tabs ? (vue.openBlock(), vue.createBlock(EleTabs, {
+          __props.tabs && !__props.disabled ? (vue.openBlock(), vue.createBlock(EleTabs, {
             key: 1,
             items: __props.tabs,
             modelValue: __props.active,
@@ -97,7 +99,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               key: "0"
             } : void 0
           ]), 1032, ["items", "modelValue", "sortable", "contextMenu", "contextMenus"])) : vue.createCommentVNode("", true),
-          vue.renderSlot(_ctx.$slots, "tabExtra", { active: __props.active })
+          !__props.disabled ? vue.renderSlot(_ctx.$slots, "tabExtra", {
+            key: 2,
+            active: __props.active
+          }) : vue.createCommentVNode("", true)
         ]),
         _: 3
       }, 8, ["type"]);