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

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

@@ -14,8 +14,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("click", e);
     };
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(ElButton), mergeProps(_ctx.buttonProps || {}, {
-        title: _ctx.tooltip,
+      return openBlock(), createBlock(unref(ElButton), mergeProps(__props.buttonProps || {}, {
+        title: __props.tooltip,
         class: "ele-pro-form-builder-tool-button",
         onClick: handleClick
       }), createSlots({ _: 2 }, [

package/es/ele-pro-form-builder/components/type-edit.js

@@ -24,21 +24,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         class: "ele-pro-form-builder-props-fluid-btn is-small-icon ele-pro-form-builder-type-select-btn",
         onClick: handleClick
       }, {
-        default: withCtx(() => {
-          var _a;
-          return [
-            createVNode(ComponentName, {
-              itemType: (_a = _ctx.formItem) == null ? void 0 : _a.type,
-              componentData: _ctx.componentData
-            }, null, 8, ["itemType", "componentData"]),
-            createVNode(unref(ElIcon), null, {
-              default: withCtx(() => [
-                createVNode(unref(ArrowDown))
-              ]),
-              _: 1
-            })
-          ];
-        }),
+        default: withCtx(() => [
+          createVNode(ComponentName, {
+            itemType: __props.formItem?.type,
+            componentData: __props.componentData
+          }, null, 8, ["itemType", "componentData"]),
+          createVNode(unref(ElIcon), null, {
+            default: withCtx(() => [
+              createVNode(unref(ArrowDown))
+            ]),
+            _: 1
+          })
+        ]),
         _: 1
       });
     };

package/es/ele-pro-form-builder/index.js

@@ -57,8 +57,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const getFormItems = () => {
-      var _a;
-      return ((_a = formProps.value) == null ? void 0 : _a.items) || [];
+      return formProps.value?.items || [];
     };
     const setFormItems = (items) => {
       if (!formProps.value) {
@@ -315,9 +314,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleSplitPanel, mergeProps({
-        space: "0px",
-        size: "280px",
-        allowCollapse: true
+        space: 0,
+        size: 280,
+        allowCollapse: true,
+        collapseBtnOffset: 2
       }, _ctx.splitPanelProps || {}, {
         collapse: leftSideCollapse.value,
         "onUpdate:collapse": _cache[8] || (_cache[8] = ($event) => leftSideCollapse.value = $event),
@@ -325,10 +325,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }), {
         body: withCtx(() => [
           createVNode(EleSplitPanel, mergeProps({
-            space: "0px",
-            size: "220px",
+            space: 0,
+            size: 220,
             reverse: true,
-            allowCollapse: true
+            allowCollapse: true,
+            collapseBtnOffset: 2
           }, _ctx.rightSplitPanelProps || {}, {
             collapse: rightSideCollapse.value,
             "onUpdate:collapse": _cache[6] || (_cache[6] = ($event) => rightSideCollapse.value = $event),
@@ -449,63 +450,60 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 3
           }, 16, ["collapse"])
         ]),
-        default: withCtx(() => {
-          var _a, _b, _c, _d;
-          return [
-            createVNode(EleTabBar, {
-              modelValue: leftTabActive.value,
-              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => leftTabActive.value = $event),
-              items: [
-                { value: "components", label: "组件库" },
-                { value: "templates", label: "模板库" },
-                { value: "outlines", label: "大纲" }
-              ]
-            }, null, 8, ["modelValue"]),
-            createElementVNode("div", _hoisted_1, [
-              leftTabActive.value === "outlines" ? (openBlock(), createBlock(OutlineTree, {
-                key: 0,
-                formItems: (_a = unref(formProps)) == null ? void 0 : _a.items,
-                currentFormItemId: currentFormItemId.value,
-                "onUpdate:currentFormItemId": _cache[1] || (_cache[1] = ($event) => currentFormItemId.value = $event),
-                componentData: _ctx.componentData,
-                itemTypeData: _ctx.itemTypeData,
-                onUpdateItems: handleUpdateItems,
-                onUpdateItemChildren: handleUpdateItemChildren,
-                onOpenTableTool: handleOpenTableTool,
-                onOpenComponentPicker: handleOpenComponentPicker
-              }, null, 8, ["formItems", "currentFormItemId", "componentData", "itemTypeData"])) : leftTabActive.value === "templates" ? (openBlock(), createBlock(TemplateList, {
-                key: 1,
-                templateData: _ctx.templateData,
-                onImportData: handleImport
-              }, null, 8, ["templateData"])) : (openBlock(), createBlock(ComponentList, {
-                key: 2,
-                formItems: (_b = unref(formProps)) == null ? void 0 : _b.items,
-                draggable: !unref(isMobileDevice) && !unref(isMobile),
-                componentData: _ctx.componentData,
-                itemTypeData: _ctx.itemTypeData,
-                onUpdateItems: handleUpdateItems
-              }, null, 8, ["formItems", "draggable", "componentData", "itemTypeData"]))
-            ]),
-            createVNode(TableToolMenu, {
-              ref_key: "tableToolMenuRef",
-              ref: tableToolMenuRef,
-              formItems: (_c = unref(formProps)) == null ? void 0 : _c.items,
+        default: withCtx(() => [
+          createVNode(EleTabBar, {
+            modelValue: leftTabActive.value,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => leftTabActive.value = $event),
+            items: [
+              { value: "components", label: "组件库" },
+              { value: "templates", label: "模板库" },
+              { value: "outlines", label: "大纲" }
+            ]
+          }, null, 8, ["modelValue"]),
+          createElementVNode("div", _hoisted_1, [
+            leftTabActive.value === "outlines" ? (openBlock(), createBlock(OutlineTree, {
+              key: 0,
+              formItems: unref(formProps)?.items,
+              currentFormItemId: currentFormItemId.value,
+              "onUpdate:currentFormItemId": _cache[1] || (_cache[1] = ($event) => currentFormItemId.value = $event),
               componentData: _ctx.componentData,
-              onUpdateItems: handleUpdateItems
-            }, null, 8, ["formItems", "componentData"]),
-            createVNode(ComponentPicker, {
-              modelValue: componentPickerOption.visible,
-              "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => componentPickerOption.visible = $event),
-              addParentFormItemId: componentPickerOption.addParentFormItemId,
-              editFormItemId: componentPickerOption.editFormItemId,
-              editFormItemType: componentPickerOption.editFormItemType,
-              formItems: (_d = unref(formProps)) == null ? void 0 : _d.items,
+              itemTypeData: _ctx.itemTypeData,
+              onUpdateItems: handleUpdateItems,
+              onUpdateItemChildren: handleUpdateItemChildren,
+              onOpenTableTool: handleOpenTableTool,
+              onOpenComponentPicker: handleOpenComponentPicker
+            }, null, 8, ["formItems", "currentFormItemId", "componentData", "itemTypeData"])) : leftTabActive.value === "templates" ? (openBlock(), createBlock(TemplateList, {
+              key: 1,
+              templateData: _ctx.templateData,
+              onImportData: handleImport
+            }, null, 8, ["templateData"])) : (openBlock(), createBlock(ComponentList, {
+              key: 2,
+              formItems: unref(formProps)?.items,
+              draggable: !unref(isMobileDevice) && !unref(isMobile),
               componentData: _ctx.componentData,
               itemTypeData: _ctx.itemTypeData,
               onUpdateItems: handleUpdateItems
-            }, null, 8, ["modelValue", "addParentFormItemId", "editFormItemId", "editFormItemType", "formItems", "componentData", "itemTypeData"])
-          ];
-        }),
+            }, null, 8, ["formItems", "draggable", "componentData", "itemTypeData"]))
+          ]),
+          createVNode(TableToolMenu, {
+            ref_key: "tableToolMenuRef",
+            ref: tableToolMenuRef,
+            formItems: unref(formProps)?.items,
+            componentData: _ctx.componentData,
+            onUpdateItems: handleUpdateItems
+          }, null, 8, ["formItems", "componentData"]),
+          createVNode(ComponentPicker, {
+            modelValue: componentPickerOption.visible,
+            "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => componentPickerOption.visible = $event),
+            addParentFormItemId: componentPickerOption.addParentFormItemId,
+            editFormItemId: componentPickerOption.editFormItemId,
+            editFormItemType: componentPickerOption.editFormItemType,
+            formItems: unref(formProps)?.items,
+            componentData: _ctx.componentData,
+            itemTypeData: _ctx.itemTypeData,
+            onUpdateItems: handleUpdateItems
+          }, null, 8, ["modelValue", "addParentFormItemId", "editFormItemId", "editFormItemType", "formItems", "componentData", "itemTypeData"])
+        ]),
         _: 3
       }, 16, ["collapse"]);
     };

package/es/ele-pro-form-builder/style/index.scss

@@ -10,61 +10,46 @@
 .ele-pro-form-builder-main-wrapper.ele-split-panel {
   height: 100%;
 
-  & > .ele-split-panel-wrap,
-  & > .ele-split-panel-body {
-    overflow: hidden;
-  }
+  & > .ele-split-panel-wrap {
+    & > .ele-split-panel-side {
+      display: flex;
+      flex-direction: column;
 
-  & > .ele-split-panel-wrap > .ele-split-panel-side {
-    display: flex;
-    flex-direction: column;
+      & > .ele-tab-bar {
+        flex-shrink: 0;
+        padding: 0 16px;
 
-    & > .ele-tab-bar {
-      flex-shrink: 0;
-      padding: 0 16px;
+        .ele-tab-item + .ele-tab-item {
+          margin-left: 22px;
+        }
+      }
 
-      .ele-tab-item + .ele-tab-item {
-        margin-left: 22px;
+      & > .ele-pro-form-builder-tab-body {
+        flex: 1 1 60px;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        box-sizing: border-box;
+        position: relative;
       }
     }
 
-    & > .ele-pro-form-builder-tab-body {
-      flex: 1;
-      overflow: hidden;
-      display: flex;
-      flex-direction: column;
-      box-sizing: border-box;
-      position: relative;
+    & > .ele-split-panel-tools > .ele-split-panel-collapse-btn {
+      z-index: 99;
     }
   }
-
-  &.is-responsive > .ele-split-panel-wrap > div.ele-split-panel-side {
-    background: none;
-  }
-
-  & > .ele-split-collapse-button {
-    z-index: 99;
-  }
 }
 
 .ele-pro-form-builder-wrapper.ele-split-panel {
   & > .ele-split-panel-wrap > .ele-split-panel-side {
     border-width: 0 1px 0 0;
   }
-
-  &.is-collapse > .ele-split-collapse-button {
-    margin-left: 2px;
-  }
 }
 
 .ele-pro-form-builder-main-wrapper.ele-split-panel {
   & > .ele-split-panel-wrap > .ele-split-panel-side {
     border-width: 0 0 0 1px;
   }
-
-  &.is-collapse > .ele-split-collapse-button {
-    margin-right: 2px;
-  }
 }
 
 /* 主体 */
@@ -75,7 +60,7 @@
 }
 
 .ele-pro-form-builder-body {
-  flex: 1;
+  flex: 1 1 60px;
   display: flex;
   flex-direction: column;
   padding: 12px;
@@ -224,7 +209,7 @@
   }
 }
 
-@media screen and (max-width: 992px) {
+@media screen and (max-width: #{$pad-max-width}) {
   .ele-pro-form-builder-header > .ele-pro-form-builder-screen-radio {
     display: none;
   }

package/es/ele-pro-layout/components/{pro-iframe.js → iframe-group.js}

@@ -5,8 +5,8 @@ const _hoisted_1 = { class: "ele-admin-iframe-wrap" };
 const _hoisted_2 = ["data-id", "src"];
 const _hoisted_3 = ["data-id", "src"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...{ name: "ProIframe" },
-  __name: "pro-iframe",
+  ...{ name: "IframeGroup" },
+  __name: "iframe-group",
   props: {
     /** 是否支持内嵌缓存 */
     keepAlive: Boolean,
@@ -28,9 +28,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const data = computed(() => {
       const list = [];
       props.tabData.forEach((t) => {
-        var _a, _b;
-        const isAlive = ((_a = t.meta) == null ? void 0 : _a.keepAlive) !== false;
-        if (t.key && ((_b = t.meta) == null ? void 0 : _b.iframe) && isAlive) {
+        const isAlive = t.meta?.keepAlive !== false;
+        if (t.key && t.meta?.iframe && isAlive) {
           const src = getIframeSrc(t.fullPath, t.meta.iframe);
           list.push({ id: t.key, src, refresh: t.refresh });
         }

package/es/ele-pro-layout/index.d.ts

@@ -31,7 +31,7 @@ declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & {
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: null;
     };
     menus: import('vue').PropType<MenuItem[] | null>;
@@ -93,7 +93,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     layout: import('vue').PropType<Layout>;
     compact: BooleanConstructor;
     maximized: import('vue').PropType<Maximized>;
-    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     tabBar: {
         type: import('vue').PropType<TabBar>;
         default: boolean;
@@ -110,6 +109,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sidebarMenuProps: import('vue').PropType<EleMenusProps>;
     sideboxMenuProps: import('vue').PropType<EleMenusProps>;
     sidebarLayout: import('vue').PropType<SidebarLayout>;
+    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     sidebarStyle: {
         type: import('vue').PropType<import('./types').SidebarStyle>;
         default: string;
@@ -183,6 +183,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
 }>, {
     layoutRef: import('vue').Ref<EleAdminLayoutInstance, EleAdminLayoutInstance>;
+    openModal: (option: import('../ele-modal-render/types').ModalItem) => import('../ele-modal-render/types').ModalItemId;
+    closeModal: (modalId?: import('../ele-modal-render/types').ModalItemId) => void;
+    closeAllModal: () => void;
+    updateModalProps: (modalId?: import('../ele-modal-render/types').ModalItemId, option?: Record<string, any>) => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     tabContextMenu: (_option: TabItemEventOption) => void;
     "update:maximized": (_maximized: boolean) => void;
@@ -199,7 +203,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bodySizeChange: (_option: import('./types').BodySizeChangeOption) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: null;
     };
     menus: import('vue').PropType<MenuItem[] | null>;
@@ -261,7 +265,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     layout: import('vue').PropType<Layout>;
     compact: BooleanConstructor;
     maximized: import('vue').PropType<Maximized>;
-    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     tabBar: {
         type: import('vue').PropType<TabBar>;
         default: boolean;
@@ -278,6 +281,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sidebarMenuProps: import('vue').PropType<EleMenusProps>;
     sideboxMenuProps: import('vue').PropType<EleMenusProps>;
     sidebarLayout: import('vue').PropType<SidebarLayout>;
+    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     sidebarStyle: {
         type: import('vue').PropType<import('./types').SidebarStyle>;
         default: string;
@@ -365,13 +369,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onBodySizeChange?: ((_option: import('./types').BodySizeChangeOption) => any) | undefined;
 }>, {
     height: string | number;
+    transitionDelay: number;
+    expanded: boolean;
     uniqueOpened: boolean;
     collapse: boolean;
     ellipsis: boolean;
-    expanded: boolean;
     compact: boolean;
-    transitionDelay: number;
-    responsive: boolean;
     tabBar: TabBar;
     breadcrumb: boolean | EleBreadcrumbProps;
     backTop: boolean | EleBacktopProps;
@@ -391,6 +394,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sideboxIconSlot: string;
     menuScrollToActive: boolean;
     keepAlive: boolean;
+    responsive: boolean;
     redirectPath: string;
     fluid: boolean;
     compressOnEsc: boolean;