ele-admin-plus 1.1.6-beta.5 → 1.1.6

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

@@ -11,16 +11,16 @@ declare const _default: import("vue").DefineComponent<{
     showIcon: BooleanConstructor;
     effect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    iconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
+    iconProps: import("vue").PropType<import("../ele-app/el").ElIconProps>; /** 是否非关闭状态 */
     closeIconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    closeIconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
+    closeIconProps: import("vue").PropType<import("../ele-app/el").ElIconProps>;
     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;
-    };
+    }; /** 打开 */
 }, {
     visible: import("vue").Ref<boolean>;
     isRich: import("vue").ComputedRef<boolean>;
@@ -41,16 +41,16 @@ declare const _default: import("vue").DefineComponent<{
     showIcon: BooleanConstructor;
     effect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    iconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
+    iconProps: import("vue").PropType<import("../ele-app/el").ElIconProps>; /** 是否非关闭状态 */
     closeIconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    closeIconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
+    closeIconProps: import("vue").PropType<import("../ele-app/el").ElIconProps>;
     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;
-    };
+    }; /** 打开 */
 }>> & {
     onClose?: ((_e: MouseEvent) => any) | undefined;
 }, {

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

@@ -1,5 +1,5 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { ElIconProps } from '../ele-app/types';
+import type { ElIconProps } from '../ele-app/el';
 /**
  * 属性
  */

package/{lib/ele-app/types/element.d.ts → es/ele-app/el.d.ts}

@@ -1,61 +1,158 @@
 import type { ExtractPropTypes } from 'vue';
-import type { IconProps, RowProps, ColProps, BreadcrumbProps, BreadcrumbItemProps, InputProps, TagProps, AvatarProps, PopoverProps, ElTooltipProps as TooltipProps, PopconfirmProps, AlertProps, ButtonProps, CardProps, EmptyProps, ProgressProps, MenuProps, MenuItemProps, SubMenuProps, MenuItemGroupProps, BadgeProps, LinkProps, DialogProps, StepProps, TabsProps, TabPaneProps, TableProps, TableV2Props, ElPopper, ElPopover, ElTooltip, ElBreadcrumb, ElDrawer, ElInput, ElDropdown, ElMenu, ElSubMenu, ElDialog, ElTable, ElTableV2, ElTabs, ElImage, ElScrollbar, ElTreeV2 } from 'element-plus';
+import type {
+  IconProps,
+  RowProps,
+  ColProps,
+  BreadcrumbProps,
+  BreadcrumbItemProps,
+  InputProps,
+  TagProps,
+  AvatarProps,
+  PopoverProps,
+  ElTooltipProps as TooltipProps,
+  PopconfirmProps,
+  AlertProps,
+  ButtonProps,
+  CardProps,
+  EmptyProps,
+  ProgressProps,
+  MenuProps,
+  MenuItemProps,
+  SubMenuProps,
+  MenuItemGroupProps,
+  BadgeProps,
+  LinkProps,
+  DialogProps,
+  StepProps,
+  TabsProps,
+  TabPaneProps,
+  TableProps,
+  TableV2Props,
+  ElPopper,
+  ElPopover,
+  ElTooltip,
+  ElBreadcrumb,
+  ElDrawer,
+  ElInput,
+  ElDropdown,
+  ElMenu,
+  ElSubMenu,
+  ElDialog,
+  ElTable,
+  ElTableV2,
+  ElTabs,
+  ElImage,
+  ElScrollbar,
+  ElTreeV2
+} from 'element-plus';
 import type { dropdownProps } from 'element-plus';
 import type { dropdownItemProps } from 'element-plus';
 import type columnProps from 'element-plus/es/components/table/src/table-column/defaults';
 import type { TreeProps } from 'element-plus/es/components/tree-v2/src/types';
-import type { ComponentProps } from './core';
+import type { ComponentProps } from './types';
+
 /**
  * 组件属性
  */
 export type ElIconProps = ComponentProps<IconProps>;
+
 export type ElRowProps = ComponentProps<RowProps>;
+
 export type ElColProps = ComponentProps<ColProps>;
+
 export type ElBreadcrumbProps = ComponentProps<BreadcrumbProps>;
+
 export type ElBreadcrumbItemProps = ComponentProps<BreadcrumbItemProps>;
-export type ElDropdownProps = ComponentProps<ExtractPropTypes<typeof dropdownProps>>;
-export type ElDropdownItemProps = ComponentProps<ExtractPropTypes<typeof dropdownItemProps>>;
+
+export type ElDropdownProps = ComponentProps<
+  ExtractPropTypes<typeof dropdownProps>
+>;
+
+export type ElDropdownItemProps = ComponentProps<
+  ExtractPropTypes<typeof dropdownItemProps>
+>;
+
 export type ElInputProps = ComponentProps<InputProps>;
+
 export type ElTagProps = ComponentProps<TagProps>;
+
 export type ElAvatarProps = ComponentProps<AvatarProps>;
+
 export type ElTooltipProps = Partial<TooltipProps>;
+
 export type ElPopoverProps = Partial<PopoverProps>;
+
 export type ElPopconfirmProps = Partial<PopconfirmProps>;
+
 export type ElAlertProps = ComponentProps<AlertProps>;
+
 export type ElButtonProps = ComponentProps<ButtonProps>;
+
 export type ElCardProps = ComponentProps<CardProps>;
+
 export type ElEmptyProps = ComponentProps<EmptyProps>;
+
 export type ElProgressProps = ComponentProps<ProgressProps>;
+
 export type ElMenuProps = ComponentProps<MenuProps>;
+
 export type ElMenuItemProps = ComponentProps<MenuItemProps>;
+
 export type ElSubMenuProps = ComponentProps<SubMenuProps>;
+
 export type ElMenuItemGroupProps = ComponentProps<MenuItemGroupProps>;
+
 export type ElBadgeProps = ComponentProps<BadgeProps>;
+
 export type ElLinkProps = ComponentProps<LinkProps>;
+
 export type ElDialogProps = ComponentProps<DialogProps>;
+
 export type ElStepProps = ComponentProps<StepProps>;
+
 export type ElTabsProps = ComponentProps<TabsProps>;
+
 export type ElTabPaneProps = ComponentProps<TabPaneProps>;
+
 export type ElTableProps<T> = ComponentProps<TableProps<T>>;
+
 export type ElTableV2Props = ComponentProps<TableV2Props>;
+
 export type ElColumnProps = Partial<ExtractPropTypes<typeof columnProps>>;
+
 export type ElTreeV2Props = ComponentProps<TreeProps>;
+
 /**
  * 组件实例
  */
 export type ElPopperInstance = InstanceType<typeof ElPopper> | null;
+
 export type ElPopoverInstance = InstanceType<typeof ElPopover> | null;
+
 export type ElTooltipInstance = InstanceType<typeof ElTooltip> | null;
+
 export type ElBreadcrumbInstance = InstanceType<typeof ElBreadcrumb> | null;
+
 export type ElDrawerInstance = InstanceType<typeof ElDrawer> | null;
+
 export type ElInputInstance = InstanceType<typeof ElInput> | null;
+
 export type ElDropdownInstance = InstanceType<typeof ElDropdown> | null;
+
 export type ElMenuInstance = InstanceType<typeof ElMenu> | null;
+
 export type ElSubMenuInstance = InstanceType<typeof ElSubMenu> | null;
+
 export type ElDialogInstance = InstanceType<typeof ElDialog> | null;
+
 export type ElTableInstance = InstanceType<typeof ElTable> | null;
+
 export type ElTableV2Instance = InstanceType<typeof ElTableV2> | null;
+
 export type ElTabsInstance = InstanceType<typeof ElTabs> | null;
+
 export type ElImageInstance = InstanceType<typeof ElImage> | null;
+
 export type ElScrollbarInstance = InstanceType<typeof ElScrollbar> | null;
+
 export type ElTreeV2Instance = InstanceType<typeof ElTreeV2> | null;

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

@@ -1,4 +1,3 @@
-export type { ClassValue } from './types';
 declare const _default: import("vue").DefineComponent<{}, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }>[] | undefined, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;

package/es/ele-app/plus.d.ts

@@ -0,0 +1,75 @@
+import type { ComponentProps } from './types';
+import type EleBasicSelect from '../ele-basic-select/index';
+import type { CropperProps } from '../ele-cropper/props';
+import type { DataTableProps } from '../ele-data-table/props';
+import type EleDataTable from '../ele-data-table/index';
+import type { DropdownProps } from '../ele-dropdown/props';
+import type EleDropdown from '../ele-dropdown/index';
+import type { LoadingProps } from '../ele-loading/props';
+import type { MenusProps } from '../ele-menus/props';
+import type { MenuItem } from '../ele-menus/types';
+import type { ModalProps } from '../ele-modal/props';
+import type { PaginationProps } from '../ele-pagination/props';
+import type { PopoverProps } from '../ele-popover/props';
+import type ElePopover from '../ele-popover/index';
+import type { ProTableProps } from '../ele-pro-table/props';
+import type EleProTable from '../ele-pro-table/index';
+import type EleTabs from '../ele-tabs/index';
+import type { TextProps } from '../ele-text/props';
+import type EleText from '../ele-text/index';
+import type { ToolbarProps } from '../ele-toolbar/props';
+import type { TooltipProps } from '../ele-tooltip/props';
+import type EleTooltip from '../ele-tooltip/index';
+import type EleVirtualTable from '../ele-virtual-table/index';
+
+/**
+ * 组件属性
+ */
+export type EleCropperProps = ComponentProps<CropperProps>;
+
+export type EleDataTableProps = ComponentProps<DataTableProps>;
+
+export type EleDropdownProps = ComponentProps<DropdownProps>;
+
+export type EleLoadingProps = ComponentProps<LoadingProps>;
+
+export type EleMenusProps = ComponentProps<MenusProps>;
+
+export type EleMenuItemProps = Partial<MenuItem>;
+
+export type EleModalProps = ComponentProps<ModalProps>;
+
+export type ElePaginationProps = ComponentProps<PaginationProps>;
+
+export type ElePopoverProps = Partial<PopoverProps>;
+
+export type EleProTableProps = ComponentProps<ProTableProps>;
+
+export type EleTextProps = ComponentProps<TextProps>;
+
+export type EleToolbarProps = ComponentProps<ToolbarProps>;
+
+export type EleTooltipProps = Partial<TooltipProps>;
+
+/**
+ * 组件实例
+ */
+export type EleBasicSelectInstance = InstanceType<typeof EleBasicSelect> | null;
+
+export type EleDataTableInstance = InstanceType<typeof EleDataTable> | null;
+
+export type EleDropdownInstance = InstanceType<typeof EleDropdown> | null;
+
+export type ElePopoverInstance = InstanceType<typeof ElePopover> | null;
+
+export type EleProTableInstance = InstanceType<typeof EleProTable> | null;
+
+export type EleTabsInstance = InstanceType<typeof EleTabs> | null;
+
+export type EleTextInstance = InstanceType<typeof EleText> | null;
+
+export type EleTooltipInstance = InstanceType<typeof EleTooltip> | null;
+
+export type EleVirtualTableInstance = InstanceType<
+  typeof EleVirtualTable
+> | null;

package/es/ele-app/style/common/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/message/index.js

@@ -1,2 +1,2 @@
-import "element-plus/es/components/message/style/index";
-import "./index.scss";
+import 'element-plus/es/components/message/style/index';
+import './index.scss';

package/es/ele-app/style/overwrite/autocomplete/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/backtop/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/cascader/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/checkbox/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/color-picker/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/date-picker/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/descriptions/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/image-viewer/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/index.js

@@ -1,17 +1,17 @@
-import "./autocomplete/index";
-import "./backtop/index";
-import "./cascader/index";
-import "./checkbox/index";
-import "./color-picker/index";
-import "./date-picker/index";
-import "./descriptions/index";
-import "./image-viewer/index";
-import "./message-box/index";
-import "./notification/index";
-import "./popper/index";
-import "./radio/index";
-import "./select/index";
-import "./table-filter/index";
-import "./tag/index";
-import "./tree/index";
-import "./tree-select/index";
+import './autocomplete/index';
+import './backtop/index';
+import './cascader/index';
+import './checkbox/index';
+import './color-picker/index';
+import './date-picker/index';
+import './descriptions/index';
+import './image-viewer/index';
+import './message-box/index';
+import './notification/index';
+import './popper/index';
+import './radio/index';
+import './select/index';
+import './table-filter/index';
+import './tag/index';
+import './tree/index';
+import './tree-select/index';

package/es/ele-app/style/overwrite/message-box/index.js

@@ -1,2 +1,2 @@
-import "element-plus/es/components/message-box/style/index";
-import "./index.scss";
+import 'element-plus/es/components/message-box/style/index';
+import './index.scss';

package/es/ele-app/style/overwrite/notification/index.js

@@ -1,2 +1,2 @@
-import "element-plus/es/components/notification/style/index";
-import "./index.scss";
+import 'element-plus/es/components/notification/style/index';
+import './index.scss';

package/es/ele-app/style/overwrite/popper/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/radio/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/select/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/table-filter/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/tag/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/tree/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/tree/index.scss

@@ -5,9 +5,11 @@
 @include set-el-tree-var($ele);
 
 /* Tree */
-.el-tree {
+body .el-tree {
   background: none;
+}
 
+.el-tree {
   .el-tree-node {
     padding-top: eleVar('tree', 'item-margin');
     box-sizing: border-box;

package/es/ele-app/style/overwrite/tree-select/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/style/overwrite/tree-select/index.scss

@@ -11,6 +11,10 @@
     padding: eleVar('tree-select', 'padding') !important;
   }
 
+  .el-tree {
+    background: none;
+  }
+
   .el-tree-node__content {
     position: relative;
     z-index: 0;

package/es/ele-app/style/scrollbar/index.js

@@ -1 +1 @@
-import "./index.scss";
+import './index.scss';

package/es/ele-app/{types/core.d.ts → types.d.ts}

@@ -1,29 +1,35 @@
 import type { CSSProperties, SetupContext } from 'vue';
+
 /**
  * 样式值
  */
 export type StyleValue = Partial<CSSProperties>;
+
 /**
  * 样式多个值
  */
 export type StyleValues = StyleValue | Array<StyleValue>;
+
 /**
  * 类名值
  */
 export type ClassValue = string | Record<string, boolean | undefined>;
+
 /**
  * 类名多个值
  */
 export type ClassValues = ClassValue | Array<ClassValue>;
+
 /**
  * 组件属性
  */
 export type ComponentProps<T> = Partial<T> & {
-    /** 类名 */
-    class?: ClassValues;
-    /** 样式 */
-    style?: StyleValues;
+  /** 类名 */
+  class?: ClassValues;
+  /** 样式 */
+  style?: StyleValues;
 };
+
 /**
  * 组件事件触发器
  */

package/es/ele-avatar-group/index.d.ts

@@ -36,8 +36,8 @@ declare const _default: import("vue").DefineComponent<{
     onError: (option: AvatarErrorOption) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     itemClick: (_item: AvatarItem) => boolean;
-    moreClick: () => boolean;
-    error: (_option: AvatarErrorOption) => boolean; /** 是否显示更多 */
+    moreClick: () => boolean; /** 是否显示更多 */
+    error: (_option: AvatarErrorOption) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {
         type: import("vue").PropType<AvatarItem[]>;

package/es/ele-avatar-group/types.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 数据
+ */
+export interface AvatarItem extends Record<keyof any, any> {
+  /** 循环的 key */
+  key?: string | number | symbol;
+  /** 头像名称 */
+  label?: string;
+  /** 头像链接 */
+  value?: string;
+}
+
+/**
+ * 图片加载失败事件参数
+ */
+export interface AvatarErrorOption {
+  /** 数据 */
+  item: AvatarItem;
+  /** 事件 */
+  e: Event;
+}

package/{lib/ele-bar-code/types/index.d.ts → es/ele-bar-code/types.d.ts}

@@ -1,8 +1,10 @@
 import type { api } from 'jsbarcode';
+
 /**
  * 条形码实例
  */
 export type JsBarCodeInstance = Required<api> | null;
+
 /**
  * 条码渲染方式
  */

package/es/ele-basic-select/index.d.ts

@@ -1,4 +1,5 @@
-import type { ElInputInstance, EleTooltipInstance } from '../ele-app/types';
+import type { ElInputInstance } from '../ele-app/el';
+import type { EleTooltipInstance } from '../ele-app/plus';
 import type { SelectedItem } from './types';
 declare const _default: import("vue").DefineComponent<{
     value: {
@@ -15,14 +16,14 @@ declare const _default: import("vue").DefineComponent<{
     maxTagCount: NumberConstructor;
     maxTagTextLength: NumberConstructor;
     tagType: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
-    automaticDropdown: BooleanConstructor; /** 输入框组件 */
+    automaticDropdown: BooleanConstructor;
     filterable: BooleanConstructor;
-    visible: BooleanConstructor;
+    visible: BooleanConstructor; /** 多选搜索框组件 */
     teleported: BooleanConstructor;
     persistent: BooleanConstructor;
     placement: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
     transition: {
-        type: StringConstructor;
+        type: StringConstructor; /** 多选时搜索框值 */
         default: string;
     };
     popperOptions: import("vue").PropType<Partial<import("element-plus").Options> | undefined>;
@@ -71,14 +72,14 @@ declare const _default: import("vue").DefineComponent<{
     maxTagCount: NumberConstructor;
     maxTagTextLength: NumberConstructor;
     tagType: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
-    automaticDropdown: BooleanConstructor; /** 输入框组件 */
+    automaticDropdown: BooleanConstructor;
     filterable: BooleanConstructor;
-    visible: BooleanConstructor;
+    visible: BooleanConstructor; /** 多选搜索框组件 */
     teleported: BooleanConstructor;
     persistent: BooleanConstructor;
     placement: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
     transition: {
-        type: StringConstructor;
+        type: StringConstructor; /** 多选时搜索框值 */
         default: string;
     };
     popperOptions: import("vue").PropType<Partial<import("element-plus").Options> | undefined>;

package/{lib/ele-basic-select/types/index.d.ts → es/ele-basic-select/types.d.ts}

@@ -2,24 +2,27 @@
  * 单选值
  */
 export type SingleValue = string | number | boolean;
+
 /**
  * 多选值
  */
 export type MultipleValue = Array<SingleValue>;
+
 /**
  * 值
  */
 export type SelectValue = SingleValue | MultipleValue | undefined | null;
+
 /**
  * 多选选中数据
  */
 export interface SelectedItem {
-    /** 文本 */
-    label: string;
-    /** 值 */
-    value: SingleValue;
-    /** 是否不显示 */
-    hide?: boolean;
-    /** 排序号 */
-    index?: number;
+  /** 文本 */
+  label: string;
+  /** 值 */
+  value: SingleValue;
+  /** 是否不显示 */
+  hide?: boolean;
+  /** 排序号 */
+  index?: number;
 }

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

@@ -1,4 +1,4 @@
-import type { ElBreadcrumbInstance } from '../ele-app/types';
+import type { ElBreadcrumbInstance } from '../ele-app/el';
 declare const _default: import("vue").DefineComponent<{
     items: {
         type: import("vue").PropType<import("./types").BreadcrumbItem[]>;

package/es/ele-breadcrumb/types.d.ts

@@ -0,0 +1,21 @@
+import type { Component } from 'vue';
+import type { StyleValue } from '../ele-app/types';
+import type { ElIconProps, ElBreadcrumbItemProps } from '../ele-app/el';
+
+/**
+ * 面包屑数据
+ */
+export interface BreadcrumbItem extends ElBreadcrumbItemProps {
+  /** 循环的 key */
+  key?: string | number | symbol;
+  /** 标题 */
+  title?: string;
+  /** 图标 */
+  icon?: string | Component;
+  /** 图标属性 */
+  iconProps?: ElIconProps;
+  /** 图标样式 */
+  iconStyle?: StyleValue;
+  /** 插槽名称 */
+  slot?: Exclude<string, 'default'>;
+}