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

package/lib/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/lib/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/lib/ele-watermark/index.cjs

@@ -74,6 +74,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         });
       }
     };
+    const infoLog = vue.inject(util.INFO_LOG_KEY, void 0);
     const getDefaultWidth = (ctx) => {
       if (props2.image || !ctx.measureText) {
         return 120;
@@ -96,6 +97,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const height = props2.height;
       return [width ?? getDefaultWidth(ctx), height ?? getDefaultHeight(ctx)];
     };
+    const froined = vue.computed(() => !!(infoLog && !infoLog.froined));
     const fillTexts = (ctx, drawX, drawY, drawWidth, drawHeight) => {
       const ratio = util.getPixelRatio();
       const { color, fontSize, fontStyle, fontWeight, fontFamily } = util.getFont(
@@ -108,7 +110,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       ctx.textBaseline = "top";
       ctx.translate(drawWidth / 2, 0);
       const content = props2.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 ?? "",
@@ -118,7 +121,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const render = () => {
-      if (props2.disabled) {
+      if (props2.disabled && !froined.value) {
         disconnect();
         imgStyle.value = { display: "none" };
         return;
@@ -182,7 +185,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       render();
     });
     vue.watch(
-      () => props2,
+      [() => props2, froined],
       () => {
         render();
       },
@@ -196,7 +199,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         style: vue.normalizeStyle(!_ctx.wrapPosition || _ctx.fixed ? void 0 : { position: "relative" })
       }, [
         vue.renderSlot(_ctx.$slots, "default"),
-        !_ctx.disabled ? (vue.openBlock(), vue.createElementBlock("div", {
+        !_ctx.disabled || froined.value ? (vue.openBlock(), vue.createElementBlock("div", {
           key: 0,
           ref_key: "imgRef",
           ref: imgRef,

package/lib/ele-watermark/util.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
+const common = require("../utils/common");
 function getFont(font) {
   const style = {
     color: "rgba(122, 122, 122, .35)",
@@ -19,9 +20,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, common.ERROR_MESSAGE_KEY);
+  }
 }
 function joinStyle(style) {
   const result = Object.keys(style).map((key) => {
@@ -62,6 +67,10 @@ function useMutation(option) {
   });
   return { observe, disconnect };
 }
+Object.defineProperty(exports, "INFO_LOG_KEY", {
+  enumerable: true,
+  get: () => common.ERROR_MESSAGE_KEY
+});
 exports.getFont = getFont;
 exports.getGap = getGap;
 exports.getPixelRatio = getPixelRatio;

package/lib/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/lib/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/lib/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/lib/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/lib/utils/common.cjs

@@ -60,6 +60,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;
@@ -67,6 +70,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 || {};
@@ -103,6 +110,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) || {};
 }
@@ -148,6 +156,7 @@ function download(data, name, type) {
   downloadUrl(url, name);
   URL.revokeObjectURL(url);
 }
+exports.ERROR_MESSAGE_KEY = ERROR_MESSAGE_KEY;
 exports.capitalize = capitalize;
 exports.contentIsEllipsis = contentIsEllipsis;
 exports.debounce = debounce;
@@ -157,6 +166,7 @@ exports.getCurrentStyle = getCurrentStyle;
 exports.getMappedSlots = getMappedSlots;
 exports.getSlotsMap = getSlotsMap;
 exports.getValue = getValue;
+exports.localize = localize;
 exports.omit = omit;
 exports.pick = pick;
 exports.throttle = throttle;

package/lib/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/lib/utils/core.cjs

@@ -11,6 +11,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 [];
   }
@@ -42,7 +45,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;
@@ -50,6 +56,9 @@ function toTree(option) {
       if (addParentIds) {
         t[parentIdsField] = parentIds;
       }
+      if (addParents) {
+        t[parentsField] = parents;
+      }
       result.push(t);
     }
   });

package/lib/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/lib/utils/menu-util.cjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.4.0",
+  "version": "1.4.1-beta.1",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",
@@ -18,6 +18,7 @@
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@ant-design/colors": "^7.2.1",
+    "@ant-design/fast-color": "^2.0.6",
     "@babel/types": "^7.27.3",
     "@bytemd/plugin-gfm": "^1.22.0",
     "@bytemd/plugin-highlight": "^1.22.0",
@@ -40,7 +41,7 @@
     "dayjs": "^1.11.13",
     "echarts": "^5.6.0",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "^2.9.11",
+    "element-plus": "^2.10.4",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.4.0",