ele-admin-plus 1.4.1 → 1.5.0-beta.2

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

@@ -18,6 +18,14 @@ export declare const popoverProps: {
     /** 自定义内容样式 */
     contentStyle: PropType<StyleValue>;
     title: StringConstructor;
+    content: {
+        readonly type: PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "";
+    };
     width: {
         readonly type: PropType<string | number>;
         readonly required: false;
@@ -26,6 +34,14 @@ export declare const popoverProps: {
     } & {
         readonly default: 150;
     };
+    offset: {
+        readonly type: PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
     showArrow: {
         readonly type: PropType<boolean>;
         readonly required: false;
@@ -57,14 +73,6 @@ export declare const popoverProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    content: {
-        readonly type: PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
     persistent: {
         readonly type: PropType<boolean>;
         readonly required: false;
@@ -103,14 +111,6 @@ export declare const popoverProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    offset: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: undefined;
-    };
     placement: {
         readonly type: PropType<import('element-plus').Placement>;
         readonly required: false;
@@ -161,6 +161,7 @@ export declare const popoverProps: {
     };
     popperStyle: PropType<StyleValue>;
     popperClass: StringConstructor;
+    zIndex: NumberConstructor;
     className: StringConstructor;
     arrowOffset: {
         readonly type: PropType<number>;
@@ -170,6 +171,7 @@ export declare const popoverProps: {
     } & {
         readonly default: 5;
     };
+    focusOnTarget: BooleanConstructor;
     virtualRef: {
         readonly type: PropType<import('element-plus').Measurable>;
         readonly required: false;
@@ -178,7 +180,6 @@ export declare const popoverProps: {
     };
     virtualTriggering: BooleanConstructor;
     ariaLabel: StringConstructor;
-    zIndex: NumberConstructor;
     gpuAcceleration: {
         readonly type: PropType<boolean>;
         readonly required: false;

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

@@ -9,7 +9,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
-    margin: (StringConstructor | NumberConstructor)[];
+    margin: (NumberConstructor | StringConstructor)[];
     direction: import('vue').PropType<import('./types').PrintDirection | null>;
     orientation: import('vue').PropType<import('./types').PrintOrientation | null>;
     target: import('vue').PropType<import('./types').PrintTarget | null>;
@@ -18,26 +18,26 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>, {
     print: (options?: any) => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    done: () => void;
     "update:modelValue": (_value: boolean) => void;
+    done: () => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: BooleanConstructor;
     headerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
-    margin: (StringConstructor | NumberConstructor)[];
+    margin: (NumberConstructor | StringConstructor)[];
     direction: import('vue').PropType<import('./types').PrintDirection | null>;
     orientation: import('vue').PropType<import('./types').PrintOrientation | null>;
     target: import('vue').PropType<import('./types').PrintTarget | null>;
     static: BooleanConstructor;
     options: ObjectConstructor;
 }>> & Readonly<{
-    onDone?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((_value: boolean) => any) | undefined;
+    onDone?: (() => any) | undefined;
 }>, {
-    static: boolean;
     modelValue: boolean;
+    static: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/es/ele-printer/index.js

@@ -1,5 +1,4 @@
-import { defineComponent, ref, shallowRef, computed, watch, onMounted, createBlock, openBlock, Teleport, createElementVNode, mergeProps, createElementBlock, createCommentVNode, normalizeStyle, renderSlot, createVNode, unref, withCtx, nextTick } from "vue";
-import ReceiverView from "../ele-config-provider/components/receiver-view";
+import { defineComponent, ref, shallowRef, computed, watch, onMounted, createBlock, openBlock, Teleport, createElementVNode, mergeProps, createElementBlock, createCommentVNode, normalizeStyle, renderSlot, nextTick } from "vue";
 import { usePrinter, getPrintContainer, mergeOptions } from "./util";
 import { printerEmits, printerProps } from "./props";
 const _hoisted_1 = { key: 0 };
@@ -64,11 +63,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         disabled: isStatic.value && !visible.value
       }, [
         createElementVNode("table", mergeProps(_ctx.$attrs, {
-          class: [
-            "ele-printer",
-            { "is-open": visible.value },
-            { "is-static": isStatic.value }
-          ]
+          class: ["ele-printer", [{ "is-open": visible.value }, { "is-static": isStatic.value }]]
         }), [
           _ctx.$slots.header ? (openBlock(), createElementBlock("thead", _hoisted_1, [
             createElementVNode("tr", null, [
@@ -85,15 +80,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createElementVNode("tbody", null, [
             createElementVNode("tr", null, [
               createElementVNode("td", null, [
-                createVNode(unref(ReceiverView), {
+                createElementVNode("div", {
                   class: "ele-printer-body",
                   style: normalizeStyle(_ctx.bodyStyle)
-                }, {
-                  default: withCtx(() => [
-                    renderSlot(_ctx.$slots, "default")
-                  ]),
-                  _: 3
-                }, 8, ["style"])
+                }, [
+                  renderSlot(_ctx.$slots, "default")
+                ], 4)
               ])
             ])
           ]),

package/es/ele-printer/util.js

@@ -65,7 +65,6 @@ function getPrintFrame() {
   return elem;
 }
 function doPrintOnFrame(opt, printId, timeout) {
-  var _a;
   const pFrame = getPrintFrame();
   const pWin = pFrame.contentWindow;
   if (!pWin) {
@@ -100,13 +99,13 @@ function doPrintOnFrame(opt, printId, timeout) {
       ${"setTimeout(() => {"}
         window.print(${printOption});
         window.parent.postMessage('elePrintDone_${printId}', '*');
-      ${"}, " + timeout + ");"}
+      ${["}, ", timeout, ");"].join("")}
     };
   <\/script>
   `;
-  const html = ((_a = document.querySelector("html")) == null ? void 0 : _a.outerHTML) || "";
+  const html = document.querySelector("html")?.outerHTML || "";
   const content = html.replace(/<script/g, '<textarea style="display:none;" ').replace(/<\/script>/g, "</textarea>").replace(/<\/html>/, optHtml + "</html>");
-  pDoc.write("<!DOCTYPE html>" + content);
+  pDoc.write(`<!DOCTYPE html>${content}`);
   pDoc.close();
   return pWin;
 }

package/es/ele-pro-form/components/builder-tool-wrapper.js

@@ -16,9 +16,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
         createElementVNode("div", {
-          class: normalizeClass(["ele-pro-form-builder-item-handle", { "is-disabled": !_ctx.handle }])
+          class: normalizeClass(["ele-pro-form-builder-item-handle", { "is-disabled": !__props.handle }])
         }, [
-          _ctx.handle ? (openBlock(), createBlock(unref(ElIcon), {
+          __props.handle ? (openBlock(), createBlock(unref(ElIcon), {
             key: 0,
             class: "ele-pro-form-builder-item-handle-icon"
           }, {
@@ -28,16 +28,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           })) : createCommentVNode("", true),
           renderSlot(_ctx.$slots, "builderItemHandleContent", {
-            item: _ctx.item,
-            activeItemKey: _ctx.activeItemKey
+            item: __props.item,
+            activeItemKey: __props.activeItemKey
           }, () => [
-            createElementVNode("div", _hoisted_2, toDisplayString(_ctx.item.type), 1)
+            createElementVNode("div", _hoisted_2, toDisplayString(__props.item.type), 1)
           ])
         ], 2),
         createElementVNode("div", _hoisted_3, [
           renderSlot(_ctx.$slots, "builderItemTools", {
-            item: _ctx.item,
-            activeItemKey: _ctx.activeItemKey
+            item: __props.item,
+            activeItemKey: __props.activeItemKey
           })
         ])
       ]);

package/es/ele-pro-form/components/builder-wrapper.js

@@ -17,18 +17,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass([
-          "ele-pro-form-builder-item-wrapper",
-          { "is-div-type": _ctx.item.type === "div" },
-          { "is-active": _ctx.activeItemKey != null && _ctx.activeItemKey === _ctx.item.key }
-        ]),
+        class: normalizeClass(["ele-pro-form-builder-item-wrapper", [
+          { "is-div-type": __props.item.type === "div" },
+          { "is-active": __props.activeItemKey != null && __props.activeItemKey === __props.item.key }
+        ]]),
         onClick: withModifiers(handleItemBuilderWrapperClick, ["stop"])
       }, [
         renderSlot(_ctx.$slots, "default"),
         createVNode(BuilderToolWrapper, {
-          item: _ctx.item,
-          activeItemKey: _ctx.activeItemKey,
-          handle: _ctx.handle
+          item: __props.item,
+          activeItemKey: __props.activeItemKey,
+          handle: __props.handle
         }, createSlots({ _: 2 }, [
           renderList(Object.keys(_ctx.$slots), (name) => {
             return {

package/es/ele-pro-form/components/draggable-row.js

@@ -28,43 +28,35 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("updateItems", data);
     };
     const ns = useNamespace("row");
-    const gutter = computed(() => {
-      var _a;
-      return ((_a = props.componentData) == null ? void 0 : _a.gutter) ?? 0;
-    });
+    const gutter = computed(() => props.componentData?.gutter ?? 0);
     const rowStyle = computed(() => {
-      var _a;
       const styles = {};
-      if (!((_a = props.componentData) == null ? void 0 : _a.gutter)) {
+      if (!props.componentData?.gutter) {
         return styles;
       }
       styles.marginRight = styles.marginLeft = `-${props.componentData.gutter / 2}px`;
       return styles;
     });
-    const rowClass = computed(() => {
-      var _a, _b, _c, _d;
-      return [
-        "ele-pro-form-builder-grid-container-wrapper",
-        ns.b(),
-        ns.is(
-          `justify-${((_a = props.componentData) == null ? void 0 : _a.justify) ?? "start"}`,
-          (((_b = props.componentData) == null ? void 0 : _b.justify) ?? "start") !== "start"
-        ),
-        ns.is(`align-${(_c = props.componentData) == null ? void 0 : _c.align}`, !!((_d = props.componentData) == null ? void 0 : _d.align))
-      ];
-    });
+    const rowClass = computed(() => [
+      "ele-pro-form-builder-grid-container-wrapper",
+      ns.b(),
+      ns.is(
+        `justify-${props.componentData?.justify ?? "start"}`,
+        (props.componentData?.justify ?? "start") !== "start"
+      ),
+      ns.is(`align-${props.componentData?.align}`, !!props.componentData?.align)
+    ]);
     provide(rowContextKey, { gutter });
     return (_ctx, _cache) => {
-      var _a;
       return openBlock(), createBlock(unref(VueDraggable), {
         itemKey: "key",
         animation: 150,
-        modelValue: _ctx.itemsData,
+        modelValue: __props.itemsData,
         setData: () => void 0,
         group: unref(sortableGroupName),
         handle: ".ele-pro-form-builder-item-handle",
         draggable: ".ele-pro-form-builder-grid-item-wrapper",
-        tag: ((_a = _ctx.componentData) == null ? void 0 : _a.tag) ?? "div",
+        tag: __props.componentData?.tag ?? "div",
         class: normalizeClass(rowClass.value),
         style: normalizeStyle(rowStyle.value),
         "onUpdate:modelValue": handleUpdateItemsModelValue
@@ -76,16 +68,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               class: "ele-pro-form-builder-grid-item-wrapper"
             },
             unref(getScreenSizeColProps)(
-              _ctx.screenSize,
-              _ctx.gridColProps,
+              __props.screenSize,
+              __props.gridColProps,
               unref(translateJsCode)(
                 element.colProps || {},
-                _ctx.formData,
-                _ctx.formItems || [],
-                _ctx.searchExpand,
-                _ctx.httpRequest,
-                _ctx.getProFormRefs,
-                _ctx.getAndCacheCode
+                __props.formData,
+                __props.formItems || [],
+                __props.searchExpand,
+                __props.httpRequest,
+                __props.getProFormRefs,
+                __props.getAndCacheCode
               ).result
             )
           ), {
@@ -102,27 +94,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           fn: withCtx(() => [
             createVNode(unref(ElCol), normalizeProps(guardReactiveProps(
               unref(getScreenSizeColProps)(
-                _ctx.screenSize,
-                _ctx.autoContentExtraCol ? unref(computeContentExtraCol)(
-                  _ctx.gridColProps,
-                  (_ctx.formItems || []).filter(
+                __props.screenSize,
+                __props.autoContentExtraCol ? unref(computeContentExtraCol)(
+                  __props.gridColProps,
+                  (__props.formItems || []).filter(
                     (item) => unref(isShowItem)(
                       item,
-                      _ctx.formData,
-                      _ctx.formItems || [],
-                      _ctx.searchExpand,
-                      _ctx.editable
+                      __props.formData,
+                      __props.formItems || [],
+                      __props.searchExpand,
+                      __props.editable
                     )
                   ).length
                 ) : { span: 24 },
                 unref(translateJsCode)(
-                  _ctx.contentExtraColProps || {},
-                  _ctx.formData,
-                  _ctx.formItems || [],
-                  _ctx.searchExpand,
-                  _ctx.httpRequest,
-                  _ctx.getProFormRefs,
-                  _ctx.getAndCacheCode
+                  __props.contentExtraColProps || {},
+                  __props.formData,
+                  __props.formItems || [],
+                  __props.searchExpand,
+                  __props.httpRequest,
+                  __props.getProFormRefs,
+                  __props.getAndCacheCode
                 ).result
               )
             )), {

package/es/ele-pro-form/components/item-type-data.js

@@ -91,32 +91,23 @@ const defaultItemTypeData = [
     type: "tabs",
     component: markRaw(EleTabs),
     isContainer: true,
-    defaultProps: ({ item, modelValue }) => {
-      var _a, _b;
-      return {
-        type: "border-card",
-        modelValue: modelValue ?? ((_b = (_a = item.children) == null ? void 0 : _a[0]) == null ? void 0 : _b.prop)
-      };
-    },
+    defaultProps: ({ item, modelValue }) => ({
+      type: "border-card",
+      modelValue: modelValue ?? item.children?.[0]?.prop
+    }),
     reservedProps: ({ item, isShowFormItem }) => ({
-      items: (item.children || []).filter((c) => isShowFormItem(c)).map((c) => {
-        var _a, _b, _c, _d, _e;
-        return {
-          name: ((_a = c.props) == null ? void 0 : _a.name) ?? c.prop,
-          label: ((_b = c.props) == null ? void 0 : _b.label) ?? c.label,
-          disabled: (_c = c.props) == null ? void 0 : _c.disabled,
-          closable: (_d = c.props) == null ? void 0 : _d.closable,
-          lazy: (_e = c.props) == null ? void 0 : _e.lazy,
-          slot: "itemContent",
-          meta: c
-        };
-      })
+      items: (item.children || []).filter((c) => isShowFormItem(c)).map((c) => ({
+        name: c.props?.name ?? c.prop,
+        label: c.props?.label ?? c.label,
+        disabled: c.props?.disabled,
+        closable: c.props?.closable,
+        lazy: c.props?.lazy,
+        slot: "itemContent",
+        meta: c
+      }))
     }),
     reservedSlots: ({ renderChildren }) => ({
-      itemContent: (slotProps) => {
-        var _a;
-        return renderChildren((_a = slotProps == null ? void 0 : slotProps.item) == null ? void 0 : _a.meta, false, true);
-      },
+      itemContent: (slotProps) => renderChildren(slotProps?.item?.meta, false, true),
       default: () => void 0
     })
   },
@@ -149,12 +140,9 @@ const defaultItemTypeData = [
     component: markRaw(ElCollapse),
     isContainer: true,
     sortDisabled: true,
-    defaultProps: ({ item, modelValue }) => {
-      var _a, _b, _c, _d, _e, _f;
-      return {
-        modelValue: modelValue ?? (((_a = item.props) == null ? void 0 : _a.accordion) ? ((_d = (_c = (_b = item.children) == null ? void 0 : _b[0]) == null ? void 0 : _c.props) == null ? void 0 : _d.name) ?? ((_f = (_e = item.children) == null ? void 0 : _e[0]) == null ? void 0 : _f.prop) : [])
-      };
-    },
+    defaultProps: ({ item, modelValue }) => ({
+      modelValue: modelValue ?? (item.props?.accordion ? item.children?.[0]?.props?.name ?? item.children?.[0]?.prop : [])
+    }),
     reservedProps: ({ updateModelValue }) => ({
       "onUpdate:modelValue": updateModelValue
     })

package/es/ele-pro-form/components/pro-form-footer.d.ts

@@ -2,8 +2,14 @@ import { CSSProperties, PropType } from 'vue';
 import { ElFormItemProps, ElButtonProps, ElLinkProps } from '../../ele-app/el';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & {
-    footer?(_: {}): any;
-    footerExtra?(_: {}): any;
+    footer?(_: {
+        submitForm: () => void;
+        resetForm: () => void;
+    }): any;
+    footerExtra?(_: {
+        submitForm: () => void;
+        resetForm: () => void;
+    }): any;
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 底栏 ElFormItem 属性 */

package/es/ele-pro-form/components/pro-form-footer.js

@@ -52,21 +52,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("reset");
     };
     return (_ctx, _cache) => {
-      var _a, _b;
       return openBlock(), createBlock(unref(ElFormItem), mergeProps({
-        class: [
-          "ele-pro-form-footer",
-          { "is-search-expand": __props.autoFooterCol && __props.searchExpand }
-        ]
+        class: ["ele-pro-form-footer", { "is-search-expand": __props.autoFooterCol && __props.searchExpand }]
       }, __props.footerProps || {}, {
-        labelWidth: typeof ((_a = __props.footerProps) == null ? void 0 : _a.labelWidth) === "number" ? `${__props.footerProps.labelWidth}px` : (_b = __props.footerProps) == null ? void 0 : _b.labelWidth
+        labelWidth: typeof __props.footerProps?.labelWidth === "number" ? `${__props.footerProps.labelWidth}px` : __props.footerProps?.labelWidth
       }), createSlots({
         default: withCtx(() => [
           createElementVNode("div", {
             class: "ele-pro-form-footer-body",
             style: normalizeStyle(__props.footerStyle)
           }, [
-            renderSlot(_ctx.$slots, "footer", {}, () => [
+            renderSlot(_ctx.$slots, "footer", {
+              submitForm: handleSubmit,
+              resetForm: handleReset
+            }, () => [
               createVNode(unref(ElButton), mergeProps({ type: "primary" }, __props.submitButtonProps || {}, { onClick: handleSubmit }), {
                 default: withCtx(() => [
                   createTextVNode(toDisplayString(__props.submitText), 1)
@@ -84,12 +83,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               key: 0,
               type: "primary",
               underline: "never",
-              style: { "margin-left": "12px" }
+              style: { marginLeft: "12px" }
             }, __props.searchExpandButtonProps || {}, { onClick: toggleSearchExpand }), {
               default: withCtx(() => [
                 __props.searchExpand ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                   createElementVNode("span", null, toDisplayString(__props.searchShrinkText), 1),
-                  createVNode(unref(ElIcon), { style: { "vertical-align": "-1px" } }, {
+                  createVNode(unref(ElIcon), { style: { verticalAlign: "-1px" } }, {
                     default: withCtx(() => [
                       createVNode(unref(ArrowUp))
                     ]),
@@ -97,7 +96,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   })
                 ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                   createElementVNode("span", null, toDisplayString(__props.searchExpandText), 1),
-                  createVNode(unref(ElIcon), { style: { "vertical-align": "-2px" } }, {
+                  createVNode(unref(ElIcon), { style: { verticalAlign: "-2px" } }, {
                     default: withCtx(() => [
                       createVNode(unref(ArrowDown))
                     ]),
@@ -107,7 +106,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }, 16)) : createCommentVNode("", true),
-            renderSlot(_ctx.$slots, "footerExtra")
+            renderSlot(_ctx.$slots, "footerExtra", {
+              submitForm: handleSubmit,
+              resetForm: handleReset
+            })
           ], 4)
         ]),
         _: 2
@@ -117,9 +119,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           __props.footerSlots,
           ["default"],
           ownSlots
-        ), (slotName, name) => {
+        ), (slotName, compSlotName) => {
           return {
-            name,
+            name: compSlotName,
             fn: withCtx((slotProps) => [
               renderSlot(_ctx.$slots, slotName, normalizeProps(guardReactiveProps(slotProps || {})))
             ])