ele-admin-plus 1.1.3 → 1.1.4-beta.2

package/es/ele-tooltip/props.d.ts

@@ -1,10 +1,9 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue } from '../ele-app/types';
 /**
  * 属性
  */
 export declare const tooltipProps: {
-    bodyStyle: PropType<StyleValue>;
+    bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
     bg: StringConstructor;
     arrowBg: StringConstructor;
     keepAlive: BooleanConstructor;

package/es/ele-tour/index.d.ts

@@ -1,5 +1,4 @@
 import type { Ref } from 'vue';
-import type { StyleValue } from '../ele-app/types';
 import type { ElePopoverProps } from '../ele-avatar-group/types';
 import type { TourStep, TourLocale } from './types';
 declare const _default: import("vue").DefineComponent<{
@@ -26,10 +25,10 @@ declare const _default: import("vue").DefineComponent<{
     visible: Ref<boolean>;
     step: import("vue").ShallowRef<TourStep | null>;
     isLast: Ref<boolean>;
-    boxStyle: Ref<StyleValue>;
+    boxStyle: Ref<Partial<import("vue").CSSProperties>>;
     showMask: Ref<boolean>;
     popProps: import("vue").ShallowRef<ElePopoverProps>;
-    rootStyle: import("vue").ComputedRef<StyleValue>;
+    rootStyle: import("vue").ComputedRef<Partial<import("vue").CSSProperties>>;
     onPrev: () => void;
     onNext: () => void;
     onFinish: () => void;

package/es/ele-tour/style/index.scss

@@ -89,7 +89,7 @@
   transform: translateY(-50.1%);
   transform-origin: center !important;
   box-sizing: border-box;
-  max-width: 100%;
+  max-width: calc(100% - 32px);
 
   & > .el-popper__arrow {
     display: none;

package/es/ele-tour/util.js

@@ -1,9 +1,9 @@
 function getOffset(el) {
   const { top, left } = el.getBoundingClientRect();
-  const { pageYOffset, pageXOffset } = el.ownerDocument.defaultView ?? {};
+  const { scrollY, scrollX } = el.ownerDocument.defaultView ?? {};
   return {
-    top: top + (pageYOffset ?? 0),
-    left: left + (pageXOffset ?? 0)
+    top: top + (scrollY ?? 0),
+    left: left + (scrollX ?? 0)
   };
 }
 function getPopProps(visible, modal, props) {

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

@@ -18,10 +18,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    itemStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    buttonStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    itemStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    buttonStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     sortable: {
-        type: BooleanConstructor;
+        type: import("vue").PropType<boolean | Record<string | number | symbol, any>>;
         default: boolean;
     };
     progressProps: import("vue").PropType<import("../ele-app/types").ElProgressProps>;
@@ -36,6 +36,7 @@ declare const _default: import("vue").DefineComponent<{
         images: string[];
     };
     uploadEnable: import("vue").ComputedRef<boolean>;
+    draggableProps: import("vue").ComputedRef<Record<string | number | symbol, any>>;
     updateModelValue: (value: UploadItem[]) => void;
     onUpload: (file: File) => boolean;
     onItemRemove: (item: UploadItem) => void;
@@ -65,10 +66,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    itemStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    buttonStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    itemStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    buttonStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     sortable: {
-        type: BooleanConstructor;
+        type: import("vue").PropType<boolean | Record<string | number | symbol, any>>;
         default: boolean;
     };
     progressProps: import("vue").PropType<import("../ele-app/types").ElProgressProps>;
@@ -82,7 +83,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     disabled: boolean;
     readonly: boolean;
-    sortable: boolean;
+    sortable: boolean | Record<string | number | symbol, any>;
     drag: boolean;
     multiple: boolean;
     preview: boolean;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, computed, onDeactivated, nextTick, resolveComponent, openBlock, createBlock, normalizeClass, withCtx, createVNode, normalizeStyle, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, createElementBlock, createCommentVNode, createElementVNode } from "vue";
+import { defineComponent, ref, reactive, computed, onDeactivated, nextTick, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, normalizeStyle, normalizeClass, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, createElementBlock, createCommentVNode, createElementVNode } from "vue";
 import VueDraggable from "vuedraggable";
 import { ElUpload, ElImage, ElIcon } from "element-plus";
 import { Plus } from "@element-plus/icons-vue";
@@ -35,6 +35,20 @@ const _sfc_main = defineComponent({
     const uploadEnable = computed(() => {
       return !props.readonly && !(typeof props.limit === "number" && props.limit > 0 && props.modelValue != null && props.modelValue.length >= props.limit);
     });
+    const draggableProps = computed(() => {
+      const defaultProps = {
+        itemKey: "key",
+        animation: 300,
+        setData: () => void 0,
+        modelValue: props.modelValue,
+        draggable: ".ele-draggable",
+        class: ["ele-upload-list", { "is-disabled": props.disabled }]
+      };
+      if (typeof props.sortable === "boolean" || props.sortable == null) {
+        return defaultProps;
+      }
+      return Object.assign(defaultProps, props.sortable);
+    });
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
     };
@@ -90,6 +104,7 @@ const _sfc_main = defineComponent({
       previewRef,
       previewOption,
       uploadEnable,
+      draggableProps,
       updateModelValue,
       onUpload,
       onItemRemove,
@@ -113,15 +128,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElUpload = resolveComponent("ElUpload");
   const _component_ElImage = resolveComponent("ElImage");
   const _component_VueDraggable = resolveComponent("VueDraggable");
-  return openBlock(), createBlock(_component_VueDraggable, {
-    itemKey: "key",
-    animation: 300,
-    setData: () => void 0,
-    modelValue: _ctx.modelValue,
-    draggable: ".ele-draggable",
-    class: normalizeClass(["ele-upload-list", { "is-disabled": _ctx.disabled }]),
-    "onUpdate:modelValue": _ctx.updateModelValue
-  }, {
+  return openBlock(), createBlock(_component_VueDraggable, mergeProps(_ctx.draggableProps, { "onUpdate:modelValue": _ctx.updateModelValue }), {
     item: withCtx(({ element }) => [
       createVNode(_component_ListItem, {
         item: element,
@@ -188,7 +195,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ])
     ]),
     _: 3
-  }, 8, ["modelValue", "class", "onUpdate:modelValue"]);
+  }, 16, ["onUpdate:modelValue"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

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

@@ -1,5 +1,5 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue, ElProgressProps } from '../ele-app/types';
+import type { ElProgressProps } from '../ele-app/types';
 import type { UploadItem, UploadLocale } from './types';
 /**
  * 属性
@@ -22,10 +22,10 @@ export declare const uploadListProps: {
         type: StringConstructor;
         default: string;
     };
-    itemStyle: PropType<StyleValue>;
-    buttonStyle: PropType<StyleValue>;
+    itemStyle: PropType<Partial<import("vue").CSSProperties>>;
+    buttonStyle: PropType<Partial<import("vue").CSSProperties>>;
     sortable: {
-        type: BooleanConstructor;
+        type: PropType<boolean | Record<string | number | symbol, any>>;
         default: boolean;
     };
     progressProps: PropType<ElProgressProps>;

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

@@ -30,7 +30,7 @@ const uploadListProps = {
   buttonStyle: Object,
   // 是否开启拖拽排序
   sortable: {
-    type: Boolean,
+    type: [Boolean, Object],
     default: true
   },
   // 进度条属性

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

@@ -1,3 +1,4 @@
+import type { Ref } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     width: NumberConstructor;
     height: NumberConstructor;
@@ -8,13 +9,15 @@ declare const _default: import("vue").DefineComponent<{
     font: import("vue").PropType<import("./types").WatermarkFont>;
     gap: import("vue").PropType<import("./types").WatermarkGap>;
     offset: import("vue").PropType<import("./types").WatermarkOffset>;
-    customStyle: import("vue").PropType<import("vue").CSSProperties>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    fixed: BooleanConstructor;
+    disabled: BooleanConstructor;
 }, {
-    rootKey: import("vue").Ref<number>;
-    rootRef: import("vue").Ref<HTMLDivElement | null>;
-    imgKey: import("vue").Ref<number>;
-    imgRef: import("vue").Ref<HTMLDivElement | null>;
-    imgStyle: import("vue").Ref<import("vue").CSSProperties | undefined>;
+    rootKey: Ref<number>;
+    rootRef: Ref<HTMLDivElement | null>;
+    imgKey: Ref<number>;
+    imgRef: Ref<HTMLDivElement | null>;
+    imgStyle: Ref<Partial<import("vue").CSSProperties>>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     width: NumberConstructor;
     height: NumberConstructor;
@@ -25,6 +28,11 @@ declare const _default: import("vue").DefineComponent<{
     font: import("vue").PropType<import("./types").WatermarkFont>;
     gap: import("vue").PropType<import("./types").WatermarkGap>;
     offset: import("vue").PropType<import("./types").WatermarkOffset>;
-    customStyle: import("vue").PropType<import("vue").CSSProperties>;
-}>>, {}, {}>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    fixed: BooleanConstructor;
+    disabled: BooleanConstructor;
+}>>, {
+    disabled: boolean;
+    fixed: boolean;
+}, {}>;
 export default _default;

package/es/ele-watermark/index.js

@@ -1,5 +1,4 @@
-import { defineComponent, nextTick, ref, onMounted, watch, openBlock, createElementBlock, renderSlot, normalizeStyle } from "vue";
-import { useLicense } from "../ele-config-provider/receiver";
+import { defineComponent, nextTick, ref, onMounted, watch, openBlock, createElementBlock, normalizeStyle, renderSlot, createCommentVNode } from "vue";
 import { useMutation, getFont, getPixelRatio, getGap, rotateWatermark } from "./util";
 import { watermarkProps } from "./props";
 const SIZE = 2;
@@ -8,7 +7,6 @@ const _sfc_main = defineComponent({
   name: "EleWatermark",
   props: watermarkProps,
   setup(props) {
-    const { authenticated } = useLicense();
     const { observe, disconnect } = useMutation({
       getRoot: () => rootRef.value,
       getEl: () => imgRef.value,
@@ -31,16 +29,19 @@ const _sfc_main = defineComponent({
     const rootRef = ref(null);
     const imgKey = ref(1);
     const imgRef = ref(null);
-    const imgStyle = ref();
+    const imgStyle = ref({ display: "none" });
     const updateStyle = (base64, size) => {
+      const position = props.fixed ? "fixed" : "absolute";
+      const width = props.fixed ? "100vw" : "100%";
+      const height = props.fixed ? "100vh" : "100%";
       const style = {
-        position: "absolute !important",
+        position: `${position} !important`,
         top: "0 !important",
         left: "0 !important",
         right: "auto !important",
         bottom: "auto !important",
-        width: "100% !important",
-        height: "100% !important",
+        width: `${width} !important`,
+        height: `${height} !important`,
         pointerEvents: "none !important",
         backgroundRepeat: "repeat !important",
         opacity: "1 !important",
@@ -49,7 +50,7 @@ const _sfc_main = defineComponent({
         display: "block !important",
         ...props.customStyle
       };
-      if (!authenticated || !base64) {
+      if (!base64) {
         style.display = "none !important";
       } else {
         style.backgroundImage = `url('${base64}') !important`;
@@ -109,6 +110,11 @@ const _sfc_main = defineComponent({
       });
     };
     const render = () => {
+      if (props.disabled) {
+        disconnect();
+        imgStyle.value = { display: "none" };
+        return;
+      }
       const canvas = document.createElement("canvas");
       const ctx = canvas.getContext("2d");
       if (!ctx) {
@@ -188,15 +194,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", {
     ref: "rootRef",
     key: _ctx.rootKey,
-    style: { position: "relative" }
+    style: normalizeStyle(_ctx.fixed ? void 0 : { position: "relative" })
   }, [
     renderSlot(_ctx.$slots, "default"),
-    (openBlock(), createElementBlock("div", {
+    !_ctx.disabled ? (openBlock(), createElementBlock("div", {
       ref: "imgRef",
       key: _ctx.imgKey,
       style: normalizeStyle(_ctx.imgStyle)
-    }, null, 4))
-  ]);
+    }, null, 4)) : createCommentVNode("", true)
+  ], 4);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

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

@@ -10,6 +10,8 @@ export declare const watermarkProps: {
     font: PropType<WatermarkFont>;
     gap: PropType<WatermarkGap>;
     offset: PropType<WatermarkOffset>;
-    customStyle: PropType<import("vue").CSSProperties>;
+    customStyle: PropType<Partial<import("vue").CSSProperties>>;
+    fixed: BooleanConstructor;
+    disabled: BooleanConstructor;
 };
 export type WatermarkProps = ExtractPropTypes<typeof watermarkProps>;

package/es/ele-watermark/props.js

@@ -18,7 +18,11 @@ const watermarkProps = {
   // 距离左上角的偏移量
   offset: Array,
   // 自定义样式
-  customStyle: Object
+  customStyle: Object,
+  // 是否使用固定定位
+  fixed: Boolean,
+  // 是否禁用
+  disabled: Boolean
 };
 export {
   watermarkProps

package/es/ele-watermark/util.js

@@ -1,7 +1,7 @@
 import { onBeforeMount } from "vue";
 function getFont(font) {
   const style = {
-    color: "rgba(68, 68, 68, .25)",
+    color: "rgba(122, 122, 122, .35)",
     fontSize: 16,
     fontWeight: "normal",
     fontFamily: "sans-serif",

package/es/ele-xg-player/index.js

@@ -27,6 +27,7 @@ const _sfc_main = defineComponent({
     const destroy = () => {
       if (player && typeof player.destroy === "function") {
         player.destroy();
+        player = null;
       }
     };
     onMounted(() => {

package/es/style/index.scss

@@ -16,6 +16,7 @@
 @use '../ele-ellipsis/style/index.scss' as ellipsis;
 @use '../ele-file-list/style/index.scss' as fileList;
 @use '../ele-icon-select/style/index.scss' as iconSelect;
+@use '../ele-loading/style/index.scss' as loading;
 @use '../ele-map-picker/style/index.scss' as mapPicker;
 @use '../ele-menus/style/index.scss' as menus;
 @use '../ele-modal/style/index.scss' as modal;

package/es/style/nprogress.scss

@@ -1,4 +1,4 @@
-@use './themes/default.scss' as *;
+@use './util.scss' as *;
 
 /* Make clicks pass-through */
 #nprogress {
@@ -24,7 +24,7 @@
   right: 0;
   width: 100px;
   height: 100%;
-  box-shadow: 0 0 10px elVar('color-primary'), 0 0 5px elVar('color-primary');
+  box-shadow: (0 0 10px elVar('color-primary'), 0 0 5px elVar('color-primary'));
   opacity: 1;
 
   -webkit-transform: rotate(3deg) translate(0px, -4px);

package/es/style/themes/default.scss

@@ -241,7 +241,7 @@ $ele: map.deep-merge(
       'item-radius': elVar('border-radius', 'base'),
       'item-padding': 6px 4px,
       'item-border': 1px solid transparent,
-      'item-active-border-color': elVar('color-primary', 'light-8'),
+      'item-active-border-color': elVar('color-primary', 'light-7'),
       'item-active-bg': elVar('color-primary', 'light-9'),
       'icon-height': 84px,
       'icon-size': 56px,
@@ -294,11 +294,22 @@ $ele: map.deep-merge(
       'color': elVar('text-color', 'regular'),
       'hover-color': elVar('color-primary'),
       'hover-bg': elVar('color-primary', 'light-9'),
-      'hover-border': 1px solid elVar('color-primary', 'light-8'),
+      'hover-border': 1px solid elVar('color-primary', 'light-7'),
       'active-color': elVar('color-primary'),
       'active-bg': elVar('color-primary', 'light-9'),
       'active-border': 2px solid elVar('color-primary')
     ),
+    'loading': (
+      // 加载
+      'bg': elVar('mask-color'),
+      'size': 19px,
+      'space': 5px,
+      'index': 2000,
+      'sm-size': 13px,
+      'sm-space': 3px,
+      'lg-size': 29px,
+      'lg-space': 8px
+    ),
     'map': (
       // 地图位置选择
       'header-padding': 8px 14px
@@ -564,7 +575,7 @@ $ele: map.deep-merge(
       'transition': (color, background-color, border-color, font-weight)
     ),
     'tab-sm': (
-      // 标签页小型尺寸
+      // 标签页小号
       'height': 32px,
       'padding': 12px,
       'font-size': elVar('font-size', 'small'),
@@ -573,7 +584,7 @@ $ele: map.deep-merge(
       'tool-font-size': elVar('font-size', 'small')
     ),
     'tab-lg': (
-      // 标签页大型尺寸
+      // 标签页大号
       'height': 52px,
       'padding': 22px,
       'font-size': elVar('font-size', 'medium'),
@@ -639,9 +650,12 @@ $ele: map.deep-merge(
       'sm-radius': 0,
       'sticky-top': 0,
       'fixed-header-sticky-top': 94px,
-      'maximized-sticky-top': 40px
+      'maximized-sticky-top': 40px,
+      'fix-height': 0.45px,
+      'fix-border': 0.65px
     ),
     'table-select': (
+      // 下拉表格选择
       'padding': 10px,
       'th-bg': elVar('fill-color', 'light'),
       'tr-bg': elVar('bg-color', 'overlay'),
@@ -649,16 +663,24 @@ $ele: map.deep-merge(
       'mobile-space': 16px
     ),
     'tool-column': (
-      // 表格列配置
+      // 高级表格列配置
       'width': 220px,
       'max-height': 480px,
-      'header-padding': 6px 16px 4px 16px,
+      'header-padding': 6px 16px 4px 12px,
       'header-border': 1px solid elVar('border-color', 'light'),
       'body-padding': 6px 0,
-      'item-padding': 16px,
+      'item-padding': 12px,
       'item-height': 28px,
       'item-hover-bg': elVar('color-primary', 'light-9'),
-      'item-radius': 0
+      'item-radius': 0,
+      'btn-space': 0,
+      'btn-padding': 3px,
+      'btn-radius': elVar('border-radius', 'small'),
+      'btn-color': elVar('text-color', 'placeholder'),
+      'btn-hover-color': elVar('text-color', 'primary'),
+      'btn-hover-bg': transparent,
+      'btn-active-color': elVar('color-primary'),
+      'btn-active-bg': transparent
     ),
     'text': (
       // 文本
@@ -691,7 +713,7 @@ $ele: map.deep-merge(
       'font-size': 16px
     ),
     'popper': (
-      // 气泡通用
+      // 底层气泡
       'bg': elVar('bg-color', 'overlay'),
       'border': none,
       'radius': elVar('border-radius', 'base'),
@@ -704,7 +726,7 @@ $ele: map.deep-merge(
     'tooltip': (
       // 文字提示
       'color': '#fff',
-      'font-size': elVar('font-size', 'extra-small'),
+      'font-size': elVar('font-size', 'small'),
       'line-height': '22px',
       'padding': '6px 12px',
       'bg': '#000',
@@ -780,6 +802,7 @@ $ele: map.deep-merge(
     ),
     'table-filter': (
       // 表格筛选框
+      'max-height': none,
       'padding': 6px 0,
       'item-height': 32px,
       'item-margin': 0,
@@ -810,6 +833,7 @@ $ele: map.deep-merge(
       'icon-hover-bg': transparent,
       'icon-radius': elVar('border-radius', 'small'),
       'body-padding': 12px 20px,
+      'input-padding': 8px,
       'footer-padding': 8px 20px 18px 20px,
       'footer-border': none,
       'mobile-space': 16px
@@ -936,7 +960,7 @@ $ele: map.deep-merge(
       'shortcut-radius': 0,
       'shortcut-hover-color': elVar('text-color', 'primary'),
       'shortcut-hover-bg': elVar('fill-color', 'light'),
-      'range-icon-color': elVar('text-color', 'secondary'),
+      'range-icon-color': elVar('text-color', 'placeholder'),
       'range-icon-size': elVar('font-size', 'base')
     ),
     'timepicker': (

package/es/style/themes/rounded.scss

@@ -168,8 +168,10 @@ $ele-rounded: map.deep-merge(
     ),
     'tool-column': (
       'body-padding': 6px 4px,
-      'item-padding': 12px,
-      'item-radius': elVar('border-radius', 'small')
+      'item-padding': 8px,
+      'item-radius': elVar('border-radius', 'small'),
+      'btn-hover-bg': elVar('color-primary', 'light-8'),
+      'btn-active-bg': elVar('color-primary', 'light-7')
     ),
     'text': (
       'heading-weight': bold

package/es/style/themes/theme-util.scss

@@ -7,6 +7,7 @@
 @use '../../ele-dropdown/style/css-var.scss' as *;
 @use '../../ele-file-list/style/css-var.scss' as *;
 @use '../../ele-icon-select/style/css-var.scss' as *;
+@use '../../ele-loading/style/css-var.scss' as *;
 @use '../../ele-map-picker/style/css-var.scss' as *;
 @use '../../ele-menus/style/css-var.scss' as *;
 @use '../../ele-modal/style/css-var.scss' as *;
@@ -40,6 +41,7 @@
     @include set-dropdown-var($var);
     @include set-file-var($var);
     @include set-icon-var($var);
+    @include set-loading-var($var);
     @include set-map-var($var);
     @include set-menus-var($var);
     @include set-modal-var($var);

package/es/utils/core.d.ts

@@ -113,7 +113,7 @@ export declare function throttle<T extends (...args: any) => any>(func: T, wait:
  * @param obj 来源对象
  * @param fields 忽略的属性
  */
-export declare function omit<T extends object, K extends keyof T>(obj: T, fields: Array<K>): Omit<T, K>;
+export declare function omit<T extends object, K extends keyof T>(obj: T | null | undefined, fields: Array<K>): Omit<T, K>;
 /**
  * 摘选对象属性
  * @param obj 来源对象

package/es/utils/core.js

@@ -67,22 +67,24 @@ function eachTree(data, callback, childrenField = "children", parent) {
 }
 function mapTree(data, formatter, childrenField = "children", resultChildrenField = "children", parent) {
   const result = [];
-  data == null ? void 0 : data.forEach((d, i) => {
-    var _a;
-    const item = formatter(d, i, parent);
-    if (item) {
-      if ((_a = d[childrenField]) == null ? void 0 : _a.length) {
-        item[resultChildrenField] = mapTree(
-          d[childrenField],
-          formatter,
-          childrenField,
-          resultChildrenField,
-          item
-        );
+  if (data) {
+    data.forEach((d, i) => {
+      var _a;
+      const item = formatter(d, i, parent);
+      if (item) {
+        if ((_a = d[childrenField]) == null ? void 0 : _a.length) {
+          item[resultChildrenField] = mapTree(
+            d[childrenField],
+            formatter,
+            childrenField,
+            resultChildrenField,
+            item
+          );
+        }
+        result.push(item);
       }
-      result.push(item);
-    }
-  });
+    });
+  }
   return result;
 }
 function uuid(length = 32, radix) {

package/es/utils/resolvers.js

@@ -16,8 +16,8 @@ function EleAdminResolver(options = {}) {
   return {
     type: "component",
     resolve: (key) => {
-      var _a;
-      if (key.match(/^Ele[A-Z]/) && !((_a = options == null ? void 0 : options.exclude) == null ? void 0 : _a.includes(key))) {
+      var _a, _b;
+      if (key.match(/^Ele[A-Z]/) && !((_b = (_a = options == null ? void 0 : options.exclude) == null ? void 0 : _a.includes) == null ? void 0 : _b.call(_a, key))) {
         const packageName = "ele-admin-plus";
         const name = kebabCase(key);
         const dir = options.path ?? "/es";

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

@@ -10,13 +10,13 @@ declare const _default: import("vue").DefineComponent<{
     closeText: StringConstructor;
     showIcon: BooleanConstructor;
     effect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    iconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     iconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
-    closeIconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    closeIconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     closeIconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    descriptionStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    descriptionStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     transitionName: {
         type: StringConstructor;
         default: string;
@@ -40,13 +40,13 @@ declare const _default: import("vue").DefineComponent<{
     closeText: StringConstructor;
     showIcon: BooleanConstructor;
     effect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    iconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     iconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
-    closeIconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    closeIconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     closeIconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    descriptionStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    descriptionStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     transitionName: {
         type: StringConstructor;
         default: string;