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

package/lib/ele-pro-form-builder/types.d.ts

@@ -1,17 +1,17 @@
-import type { ComponentProps, UserComponent } from '../ele-app/types';
-import type { ProFormItemKey, ProFormItemProps } from '../ele-pro-form/types';
-import type { ProFormProps } from '../ele-pro-form/props';
+import type { UserComponent, StyleValue } from '../ele-app/types';
+import type { EleProFormProps } from '../ele-app/plus';
+import type {
+  ProFormItemKey,
+  ProFormItemProps,
+  ScreenSize
+} from '../ele-pro-form/types';
 import type { TreeTableColumn } from '../ele-tree-table/types';
-
-/**
- * 表单配置模板
- */
-export type TemplateFormConfig = ComponentProps<ProFormProps>;
+export type TemplateFormConfig = EleProFormProps;
 
 /**
  * 表单除表单项外的配置数据
  */
-export type TemplateFormProps = Omit<TemplateFormConfig, 'items'>;
+export type TemplateFormProps = Omit<EleProFormProps, 'items'>;
 
 /**
  * 表单模板库模板
@@ -22,7 +22,7 @@ export interface TemplateItem {
   /** 模板缩略图 */
   cover?: UserComponent;
   /** 模板数据 */
-  config: TemplateFormConfig;
+  config: EleProFormProps;
 }
 
 /**
@@ -51,6 +51,8 @@ export interface ComponentItem {
   configForm?: ProFormItemProps[];
   /** 生成 ElForm 代码时组件名称 */
   componentName: string;
+  /** 生成代码时组件引入语句 */
+  componentImport?: string;
 }
 
 /**
@@ -66,7 +68,12 @@ export interface ComponentGroup {
 /**
  * 顶栏右侧操作按钮名称
  */
-export type HeaderRightToolName = 'import' | 'export' | 'clear' | 'preview';
+export type HeaderRightToolName =
+  | 'import'
+  | 'export'
+  | 'clear'
+  | 'preview'
+  | 'code';
 
 /**
  * 添加表单项需要的数据
@@ -104,11 +111,6 @@ export interface UpdateItemsResult {
   updateItems: UpdateItemResult[];
 }
 
-/**
- * 屏幕尺寸
- */
-export type ScreenSize = 'pc' | 'pad' | 'phone';
-
 /**
  * 样式编辑数据
  */
@@ -170,3 +172,22 @@ export interface TableGridRow {
  * 表格跨行跨列处理时数据
  */
 export type TableGridData = TableGridRow[];
+
+/**
+ * 组件选择弹窗配置
+ */
+export interface ComponentPickerOption {
+  visible?: boolean;
+  addParentFormItemId?: ProFormItemKey;
+  editFormItemId?: ProFormItemKey;
+  editFormItemType?: string;
+}
+
+/**
+ * 屏幕尺寸数据
+ */
+export interface ScreenItem {
+  value: ScreenSize;
+  icon: UserComponent;
+  iconStyle?: StyleValue;
+}

package/lib/ele-pro-form-builder/util.cjs

@@ -1,15 +1,22 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const icons = require("../icons");
+const vue = require("vue");
+const index = require("../icons/index");
 const componentData = require("./components/component-data");
+const defaultHeaderRightTools = [
+  "import",
+  "export",
+  "clear",
+  "preview"
+];
 const screenItems = [
-  { value: "pc", icon: icons.DesktopOutlined },
+  { value: "pc", icon: vue.markRaw(index.DesktopOutlined) },
   {
     value: "pad",
-    icon: icons.MobileOutlined,
+    icon: vue.markRaw(index.MobileOutlined),
     iconStyle: { transform: "rotate(270deg) scale(1.06)" }
   },
-  { value: "phone", icon: icons.MobileOutlined }
+  { value: "phone", icon: vue.markRaw(index.MobileOutlined) }
 ];
 const defaultConfigFormItems = [
   {
@@ -23,6 +30,9 @@ const defaultConfigFormItems = [
         { value: "small", label: "小型" }
       ],
       class: "ele-pro-form-builder-props-options-check-card"
+    },
+    itemProps: {
+      style: { marginTop: "8px" }
     }
   },
   {
@@ -181,4 +191,5 @@ Object.defineProperty(exports, "defaultComponentData", {
 });
 exports.defaultConfigFormItems = defaultConfigFormItems;
 exports.defaultConfigFormPresetProps = defaultConfigFormPresetProps;
+exports.defaultHeaderRightTools = defaultHeaderRightTools;
 exports.screenItems = screenItems;

package/lib/ele-pro-form-builder/util.d.ts

@@ -1,21 +1,15 @@
 import { ProFormItemProps } from '../ele-pro-form/types';
-import { TemplateFormProps } from './types';
+import { TemplateFormProps, HeaderRightToolName, ScreenItem } from './types';
 
 export { defaultComponentData } from './components/component-data';
+/**
+ * 默认表头工具栏右侧按钮布局
+ */
+export declare const defaultHeaderRightTools: HeaderRightToolName[];
 /**
  * 屏幕尺寸选项
  */
-export declare const screenItems: ({
-    value: string;
-    icon: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
-    iconStyle?: undefined;
-} | {
-    value: string;
-    icon: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
-    iconStyle: {
-        transform: string;
-    };
-})[];
+export declare const screenItems: ScreenItem[];
 /**
  * 表单属性设置的表单项配置
  */

package/lib/ele-pro-layout/index.cjs

@@ -1,9 +1,9 @@
 "use strict";
 const vue = require("vue");
 const vueRouter = require("vue-router");
-const icons = require("../icons");
+const index = require("../icons/index");
 const hook = require("../utils/hook");
-const core = require("../utils/core");
+const common = require("../utils/common");
 const ProIframe = require("./components/pro-iframe");
 const util = require("./util");
 const props = require("./props");
@@ -93,7 +93,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         data.push({
           key: to,
           to,
-          icon: vue.markRaw(icons.HomeOutlined),
+          icon: vue.markRaw(index.HomeOutlined),
           iconStyle: is
         });
       }
@@ -281,11 +281,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleLogoClick = (e) => {
       emit("logoClick", isHome.value, e);
     };
-    const handleHeadMenuOpen = (index, indexPath) => {
-      emit("headMenuOpen", index, indexPath);
+    const handleHeadMenuOpen = (index2, indexPath) => {
+      emit("headMenuOpen", index2, indexPath);
     };
-    const handleHeadMenuClose = (index, indexPath) => {
-      emit("headMenuClose", index, indexPath);
+    const handleHeadMenuClose = (index2, indexPath) => {
+      emit("headMenuClose", index2, indexPath);
     };
     const handleHeadMenuItemClick = (item, e) => {
       const path = item.index;
@@ -293,7 +293,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (!path || trigger !== "click" && trigger !== "hover") {
         return;
       }
-      if (core.isExternalLink(path)) {
+      if (common.isExternalLink(path)) {
         e.stopPropagation();
         if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
           return;
@@ -345,7 +345,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (trigger !== "hover" || !path) {
         return;
       }
-      if (!core.isExternalLink(path) && props$1.beforeClick && props$1.beforeClick(item, e) === false) {
+      if (!common.isExternalLink(path) && props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
       const temp = util.getActiveChilds(navData.value, path, "tempChildren");
@@ -381,7 +381,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (!path || trigger !== "click" && trigger !== "hover") {
         return;
       }
-      if (core.isExternalLink(path)) {
+      if (common.isExternalLink(path)) {
         e.stopPropagation();
         if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
           return;
@@ -430,7 +430,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (trigger !== "hover" || !path) {
         return;
       }
-      if (!core.isExternalLink(path) && props$1.beforeClick && props$1.beforeClick(item, e) === false) {
+      if (!common.isExternalLink(path) && props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
       const temp = util.getActiveChilds(boxData.value, path, "tempChildren");
@@ -449,11 +449,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleBoxMouseLeave = () => {
       resetMenuState();
     };
-    const handleSideMenuOpen = (index, indexPath) => {
-      emit("sideMenuOpen", index, indexPath);
+    const handleSideMenuOpen = (index2, indexPath) => {
+      emit("sideMenuOpen", index2, indexPath);
     };
-    const handleSideMenuClose = (index, indexPath) => {
-      emit("sideMenuClose", index, indexPath);
+    const handleSideMenuClose = (index2, indexPath) => {
+      emit("sideMenuClose", index2, indexPath);
     };
     const handleSideMenuItemClick = (item, e) => {
       const path = item.index;
@@ -464,7 +464,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
-      if (core.isExternalLink(path)) {
+      if (common.isExternalLink(path)) {
         e.stopPropagation();
         window.open(path);
         return;
@@ -633,7 +633,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const updateMenuData = () => {
       let home;
-      menuData.value = core.mapTree(props$1.menus, (item) => {
+      menuData.value = common.mapTree(props$1.menus, (item) => {
         var _a, _b;
         if (!home && !((_a = item.children) == null ? void 0 : _a.length)) {
           home = item;
@@ -776,7 +776,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleResize = () => {
       const el = getContentElem();
       if (el) {
-        const width = el.clientWidth;
+        const clientWidth = el.clientWidth || 0;
+        const limitedWidth = 1120;
+        const maxWidth = clientWidth > limitedWidth ? limitedWidth : clientWidth;
+        const width = props$1.fluid ? clientWidth : maxWidth;
         const height = el.clientHeight;
         if (width !== state.contentWidth || height !== state.contentHeight) {
           state.contentWidth = width;
@@ -785,7 +788,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       }
     };
-    hook.useWindowListener(core.debounce(() => handleResize(), 500));
+    hook.useWindowListener(common.debounce(() => handleResize(), 500));
     const [startBodyResizeTimer] = hook.useTimer(600);
     vue.watch([() => props$1.collapse, () => props$1.compact], () => {
       startBodyResizeTimer(() => {
@@ -839,6 +842,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         sidebarLayout: routeSideType.value,
         headerStyle: _ctx.headerStyle,
         sidebarStyle: _ctx.sidebarStyle,
+        mixSidebarStyle: _ctx.mixSidebarStyle,
         tabStyle: _ctx.tabStyle,
         fixedHeader: _ctx.fixedHeader,
         fixedSidebar: _ctx.fixedSidebar,
@@ -859,6 +863,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         headerCustomStyle: _ctx.headerCustomStyle,
         sidebarCustomStyle: _ctx.sidebarCustomStyle,
         sideboxCustomStyle: _ctx.sideboxCustomStyle,
+        sideCustomStyle: _ctx.sideCustomStyle,
         tabsCustomStyle: _ctx.tabsCustomStyle,
         contentCustomStyle: _ctx.contentCustomStyle,
         logoStyle: _ctx.logoStyle,
@@ -866,6 +871,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         headerMenusStyle: _ctx.headerMenusStyle,
         sidebarMenusStyle: _ctx.sidebarMenusStyle,
         sideboxMenusStyle: _ctx.sideboxMenusStyle,
+        logoSrc: _ctx.logoSrc,
+        logoTitle: _ctx.logoTitle,
+        menuScrollToActive: _ctx.menuScrollToActive,
         mobile: mobile.value,
         class: vue.normalizeClass(["ele-pro-layout", { "ele-admin-limited": !_ctx.fluid }]),
         "onUpdate:collapse": updateCollapse,
@@ -979,7 +987,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ])
           };
         })
-      ]), 1032, ["height", "headerMenus", "headerActive", "sidebarMenus", "sidebarActive", "sideboxMenus", "sideboxActive", "tabs", "tabActive", "levels", "collapse", "compact", "maximized", "tabBar", "breadcrumb", "backTop", "headerMenuProps", "sidebarMenuProps", "sideboxMenuProps", "layout", "sidebarLayout", "headerStyle", "sidebarStyle", "tabStyle", "fixedHeader", "fixedSidebar", "fixedBody", "logoInHeader", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "headerTitleSlot", "headerIconSlot", "sidebarTitleSlot", "sidebarIconSlot", "sideboxTitleSlot", "sideboxIconSlot", "headerCustomStyle", "sidebarCustomStyle", "sideboxCustomStyle", "tabsCustomStyle", "contentCustomStyle", "logoStyle", "logoTitleStyle", "headerMenusStyle", "sidebarMenusStyle", "sideboxMenusStyle", "mobile", "class"]);
+      ]), 1032, ["height", "headerMenus", "headerActive", "sidebarMenus", "sidebarActive", "sideboxMenus", "sideboxActive", "tabs", "tabActive", "levels", "collapse", "compact", "maximized", "tabBar", "breadcrumb", "backTop", "headerMenuProps", "sidebarMenuProps", "sideboxMenuProps", "layout", "sidebarLayout", "headerStyle", "sidebarStyle", "mixSidebarStyle", "tabStyle", "fixedHeader", "fixedSidebar", "fixedBody", "logoInHeader", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "headerTitleSlot", "headerIconSlot", "sidebarTitleSlot", "sidebarIconSlot", "sideboxTitleSlot", "sideboxIconSlot", "headerCustomStyle", "sidebarCustomStyle", "sideboxCustomStyle", "sideCustomStyle", "tabsCustomStyle", "contentCustomStyle", "logoStyle", "logoTitleStyle", "headerMenusStyle", "sidebarMenusStyle", "sideboxMenusStyle", "logoSrc", "logoTitle", "menuScrollToActive", "mobile", "class"]);
     };
   }
 });