ele-admin-plus 1.2.0-beta.3 → 1.2.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/es/ele-admin-layout/index.d.ts +14 -1
  2. package/es/ele-admin-layout/index.js +41 -26
  3. package/es/ele-admin-layout/props.d.ts +9 -0
  4. package/es/ele-admin-layout/props.js +9 -0
  5. package/es/ele-admin-layout/style/index.scss +7 -2
  6. package/es/ele-virtual-table/types.d.ts +1 -1
  7. package/es/ele-virtual-table/util.d.ts +3 -3
  8. package/lib/ele-admin-layout/index.cjs +40 -25
  9. package/lib/ele-admin-layout/index.d.ts +14 -1
  10. package/lib/ele-admin-layout/props.cjs +9 -0
  11. package/lib/ele-admin-layout/props.d.ts +9 -0
  12. package/lib/ele-admin-layout/style/index.scss +7 -2
  13. package/lib/ele-virtual-table/types.d.ts +1 -1
  14. package/lib/ele-virtual-table/util.d.ts +3 -3
  15. package/package.json +5 -5
package/es/ele-admin-layout/index.d.ts CHANGED
@@ -70,6 +70,12 @@ declare const _default: import('vue').DefineComponent<{
70
70
  sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
71
71
  tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
72
72
  contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
73
+ logoSrc: StringConstructor;
74
+ logoTitle: StringConstructor;
75
+ menuScrollToActive: {
76
+ type: BooleanConstructor;
77
+ default: boolean;
78
+ };
73
79
  mobile: BooleanConstructor;
74
80
  }, {
75
81
  ownSlots: string[];
@@ -144,7 +150,7 @@ declare const _default: import('vue').DefineComponent<{
144
150
  sideMenuItemClick: (_item: MenuItem, _e: MouseEvent) => boolean;
145
151
  sideMouseenter: (_e: MouseEvent) => boolean;
146
152
  sideMouseleave: (_e: MouseEvent) => boolean;
147
- tabClick: (_option: TabEventOption) => boolean;
153
+ tabClick: (_option: TabEventOption) => boolean; /** 是否是移动端风格折叠状态 */
148
154
  tabRemove: (_name: string) => boolean;
149
155
  tabContextMenu: (_option: TabEventOption) => boolean;
150
156
  tabSortChange: (_data: TabPaneItem[]) => boolean;
@@ -217,6 +223,12 @@ declare const _default: import('vue').DefineComponent<{
217
223
  sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
218
224
  tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
219
225
  contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
226
+ logoSrc: StringConstructor;
227
+ logoTitle: StringConstructor;
228
+ menuScrollToActive: {
229
+ type: BooleanConstructor;
230
+ default: boolean;
231
+ };
220
232
  mobile: BooleanConstructor;
221
233
  }>> & {
222
234
  onTabClick?: ((_option: TabEventOption) => any) | undefined;
@@ -260,6 +272,7 @@ declare const _default: import('vue').DefineComponent<{
260
272
  sidebarIconSlot: string;
261
273
  sideboxTitleSlot: string;
262
274
  sideboxIconSlot: string;
275
+ menuScrollToActive: boolean;
263
276
  mobile: boolean;
264
277
  }, {}>;
265
278
  export default _default;
package/es/ele-admin-layout/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { defineComponent, shallowRef, computed, shallowReactive, provide, watch, nextTick, onMounted, resolveComponent, openBlock, createBlock, normalizeClass, normalizeStyle, withCtx, createElementBlock, renderSlot, createCommentVNode, mergeProps, createSlots, normalizeProps, guardReactiveProps, renderList, createVNode, Fragment, createElementVNode } from "vue";
1
+ import { defineComponent, shallowRef, computed, shallowReactive, provide, watch, nextTick, onMounted, resolveComponent, openBlock, createBlock, normalizeClass, normalizeStyle, withCtx, createElementBlock, renderSlot, createElementVNode, createCommentVNode, toDisplayString, mergeProps, createSlots, normalizeProps, guardReactiveProps, renderList, createVNode, Fragment } from "vue";
2
2
  import { ElScrollbar } from "element-plus";
3
3
  import { useTimer } from "../utils/hook";
4
4
  import EleMenus from "../ele-menus/index";
@@ -103,7 +103,7 @@ const _sfc_main = defineComponent({
103
103
  };
104
104
  const sidebarScrollToActive = () => {
105
105
  stopSidebarMenuTimer();
106
- if (sidebarMenuRef.value == null || isCollapseMobile.value || isMixSidebar.value && isCollapseSidebar.value) {
106
+ if (!props.menuScrollToActive || sidebarMenuRef.value == null || isCollapseMobile.value || isMixSidebar.value && isCollapseSidebar.value) {
107
107
  return;
108
108
  }
109
109
  startSidebarMenuTimer(() => {
@@ -112,7 +112,7 @@ const _sfc_main = defineComponent({
112
112
  };
113
113
  const sideboxScrollToActive = () => {
114
114
  stopSideboxMenuTimer();
115
- if (sideboxMenuRef.value == null || isCollapseMobile.value) {
115
+ if (!props.menuScrollToActive || sideboxMenuRef.value == null || isCollapseMobile.value) {
116
116
  return;
117
117
  }
118
118
  startSideboxMenuTimer(() => {
@@ -326,35 +326,38 @@ const _hoisted_1 = {
326
326
  key: 0,
327
327
  class: "ele-admin-logo"
328
328
  };
329
- const _hoisted_2 = {
329
+ const _hoisted_2 = ["src"];
330
+ const _hoisted_3 = {
330
331
  key: 1,
331
332
  class: "ele-admin-tools"
332
333
  };
333
- const _hoisted_3 = {
334
+ const _hoisted_4 = {
334
335
  key: 2,
335
336
  class: "ele-admin-breadcrumb"
336
337
  };
337
- const _hoisted_4 = {
338
+ const _hoisted_5 = {
338
339
  key: 3,
339
340
  class: "ele-admin-menus"
340
341
  };
341
- const _hoisted_5 = {
342
+ const _hoisted_6 = {
342
343
  key: 5,
343
344
  class: "ele-admin-tools"
344
345
  };
345
- const _hoisted_6 = {
346
+ const _hoisted_7 = {
346
347
  key: 0,
347
348
  class: "ele-admin-logo"
348
349
  };
349
- const _hoisted_7 = {
350
+ const _hoisted_8 = ["src"];
351
+ const _hoisted_9 = {
350
352
  key: 0,
351
353
  class: "ele-admin-logo-title"
352
354
  };
353
- const _hoisted_8 = {
355
+ const _hoisted_10 = {
354
356
  key: 1,
355
357
  class: "ele-admin-logo"
356
358
  };
357
- const _hoisted_9 = {
359
+ const _hoisted_11 = ["src"];
360
+ const _hoisted_12 = {
358
361
  ref: "modalsRef",
359
362
  class: "ele-admin-modals"
360
363
  };
@@ -395,20 +398,24 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
395
398
  onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.handleHeadMouseenter && _ctx.handleHeadMouseenter(...args)),
396
399
  onMouseleave: _cache[1] || (_cache[1] = (...args) => _ctx.handleHeadMouseleave && _ctx.handleHeadMouseleave(...args))
397
400
  }, [
398
- _ctx.isHeaderLogo && (_ctx.$slots.logo || _ctx.$slots.logoTitle) ? (openBlock(), createElementBlock("div", _hoisted_1, [
399
- renderSlot(_ctx.$slots, "logo"),
400
- renderSlot(_ctx.$slots, "logoTitle")
401
+ _ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (openBlock(), createElementBlock("div", _hoisted_1, [
402
+ _ctx.logoSrc || _ctx.$slots.logo ? renderSlot(_ctx.$slots, "logo", { key: 0 }, () => [
403
+ createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_2)
404
+ ]) : createCommentVNode("", true),
405
+ _ctx.logoTitle || _ctx.$slots.logoTitle ? renderSlot(_ctx.$slots, "logoTitle", { key: 1 }, () => [
406
+ createElementVNode("h1", null, toDisplayString(_ctx.logoTitle), 1)
407
+ ]) : createCommentVNode("", true)
401
408
  ])) : createCommentVNode("", true),
402
- _ctx.$slots.left ? (openBlock(), createElementBlock("div", _hoisted_2, [
409
+ _ctx.$slots.left ? (openBlock(), createElementBlock("div", _hoisted_3, [
403
410
  renderSlot(_ctx.$slots, "left")
404
411
  ])) : createCommentVNode("", true),
405
- _ctx.breadcrumb ? (openBlock(), createElementBlock("div", _hoisted_3, [
412
+ _ctx.breadcrumb ? (openBlock(), createElementBlock("div", _hoisted_4, [
406
413
  renderSlot(_ctx.$slots, "breadcrumb", {}, () => [
407
414
  _ctx.levels && _ctx.levels.length ? (openBlock(), createBlock(_component_EleBreadcrumb, mergeProps({ key: 0 }, _ctx.breadcrumb === true ? {} : _ctx.breadcrumb, { items: _ctx.levels }), null, 16, ["items"])) : createCommentVNode("", true)
408
415
  ])
409
416
  ])) : createCommentVNode("", true),
410
417
  renderSlot(_ctx.$slots, "center"),
411
- !_ctx.showHeaderTabs || _ctx.showHeaderMenus ? (openBlock(), createElementBlock("div", _hoisted_4, [
418
+ !_ctx.showHeaderTabs || _ctx.showHeaderMenus ? (openBlock(), createElementBlock("div", _hoisted_5, [
412
419
  _ctx.showHeaderMenus && _ctx.headerMenus ? (openBlock(), createBlock(_component_EleMenus, mergeProps({
413
420
  key: 0,
414
421
  mode: "horizontal",
@@ -468,7 +475,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
468
475
  };
469
476
  })
470
477
  ]), 1032, ["tabs", "active", "fixedHome", "homePath", "isHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "class", "style", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : createCommentVNode("", true),
471
- _ctx.$slots.right ? (openBlock(), createElementBlock("div", _hoisted_5, [
478
+ _ctx.$slots.right ? (openBlock(), createElementBlock("div", _hoisted_6, [
472
479
  renderSlot(_ctx.$slots, "right")
473
480
  ])) : createCommentVNode("", true)
474
481
  ], 38)) : createCommentVNode("", true)
@@ -500,8 +507,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
500
507
  onMouseenter: _cache[2] || (_cache[2] = (...args) => _ctx.handleBoxMouseEnter && _ctx.handleBoxMouseEnter(...args)),
501
508
  onMouseleave: _cache[3] || (_cache[3] = (...args) => _ctx.handleBoxMouseLeave && _ctx.handleBoxMouseLeave(...args))
502
509
  }, [
503
- !_ctx.isHeaderLogo && _ctx.$slots.logo ? (openBlock(), createElementBlock("div", _hoisted_6, [
504
- renderSlot(_ctx.$slots, "logo")
510
+ !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.$slots.logo) ? (openBlock(), createElementBlock("div", _hoisted_7, [
511
+ renderSlot(_ctx.$slots, "logo", {}, () => [
512
+ createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_8)
513
+ ])
505
514
  ])) : createCommentVNode("", true),
506
515
  renderSlot(_ctx.$slots, "boxTop"),
507
516
  createVNode(_component_ElScrollbar, { class: "ele-admin-menus" }, {
@@ -555,12 +564,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
555
564
  onMouseleave: _cache[5] || (_cache[5] = (...args) => _ctx.handleSideMouseLeave && _ctx.handleSideMouseLeave(...args))
556
565
  }, [
557
566
  _ctx.isMixSidebar ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
558
- !_ctx.isHeaderLogo && _ctx.$slots.logoTitle ? (openBlock(), createElementBlock("div", _hoisted_7, [
559
- renderSlot(_ctx.$slots, "logoTitle")
567
+ !_ctx.isHeaderLogo && (_ctx.logoTitle || _ctx.$slots.logoTitle) ? (openBlock(), createElementBlock("div", _hoisted_9, [
568
+ renderSlot(_ctx.$slots, "logoTitle", {}, () => [
569
+ createElementVNode("h1", null, toDisplayString(_ctx.logoTitle), 1)
570
+ ])
560
571
  ])) : createCommentVNode("", true)
561
- ], 64)) : !_ctx.isHeaderLogo && (_ctx.$slots.logo || _ctx.$slots.logoTitle) ? (openBlock(), createElementBlock("div", _hoisted_8, [
562
- renderSlot(_ctx.$slots, "logo"),
563
- renderSlot(_ctx.$slots, "logoTitle")
572
+ ], 64)) : !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (openBlock(), createElementBlock("div", _hoisted_10, [
573
+ _ctx.logoSrc || _ctx.$slots.logo ? renderSlot(_ctx.$slots, "logo", { key: 0 }, () => [
574
+ createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_11)
575
+ ]) : createCommentVNode("", true),
576
+ _ctx.logoTitle || _ctx.$slots.logoTitle ? renderSlot(_ctx.$slots, "logoTitle", { key: 1 }, () => [
577
+ createElementVNode("h1", null, toDisplayString(_ctx.logoTitle), 1)
578
+ ]) : createCommentVNode("", true)
564
579
  ])) : createCommentVNode("", true),
565
580
  renderSlot(_ctx.$slots, "top"),
566
581
  createVNode(_component_ElScrollbar, { class: "ele-admin-menus" }, {
@@ -650,7 +665,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
650
665
  target: _ctx.fixedBody && _ctx.contentRef ? _ctx.contentRef : void 0,
651
666
  style: _ctx.fixedBody ? { position: "absolute" } : void 0
652
667
  }, _ctx.backTop === true ? {} : _ctx.backTop), null, 16, ["target", "style"])) : createCommentVNode("", true),
653
- createElementVNode("div", _hoisted_9, null, 512)
668
+ createElementVNode("div", _hoisted_12, null, 512)
654
669
  ]),
655
670
  default: withCtx(() => [
656
671
  createElementVNode("div", {
package/es/ele-admin-layout/props.d.ts CHANGED
@@ -120,6 +120,15 @@ export declare const adminLayoutProps: {
120
120
  tabsCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
121
121
  /** 内容区样式 */
122
122
  contentCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
123
+ /** logo图片地址 */
124
+ logoSrc: StringConstructor;
125
+ /** logo文字 */
126
+ logoTitle: StringConstructor;
127
+ /** 菜单是否自动滚动到选中位置 */
128
+ menuScrollToActive: {
129
+ type: BooleanConstructor;
130
+ default: boolean;
131
+ };
123
132
  /** 是否是移动端风格 */
124
133
  mobile: BooleanConstructor;
125
134
  };
package/es/ele-admin-layout/props.js CHANGED
@@ -110,6 +110,15 @@ const adminLayoutProps = {
110
110
  tabsCustomStyle: Object,
111
111
  /** 内容区样式 */
112
112
  contentCustomStyle: Object,
113
+ /** logo图片地址 */
114
+ logoSrc: String,
115
+ /** logo文字 */
116
+ logoTitle: String,
117
+ /** 菜单是否自动滚动到选中位置 */
118
+ menuScrollToActive: {
119
+ type: Boolean,
120
+ default: true
121
+ },
113
122
  /** 是否是移动端风格 */
114
123
  mobile: Boolean
115
124
  };
package/es/ele-admin-layout/style/index.scss CHANGED
@@ -206,8 +206,13 @@
206
206
  }
207
207
  }
208
208
 
209
- .ele-admin-logo > img + h1 {
210
- margin-left: 8px;
209
+ .ele-admin-logo > img {
210
+ width: 30px;
211
+ height: 30px;
212
+
213
+ & + h1 {
214
+ margin-left: 8px;
215
+ }
211
216
  }
212
217
 
213
218
  .ele-admin-sidebar.is-collapse > .ele-admin-logo > img + h1 {
package/es/ele-virtual-table/types.d.ts CHANGED
@@ -167,7 +167,7 @@ export interface SumCol extends ColSize {
167
167
  /** 唯一值 */
168
168
  key: string;
169
169
  /** 显示文本 */
170
- text?: string;
170
+ text?: string | VNode;
171
171
  /** 对齐方式 */
172
172
  align?: string;
173
173
  /** 固定列 */
package/es/ele-virtual-table/util.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { SetupContext } from 'vue';
1
+ import { SetupContext, VNode } from 'vue';
2
2
  import { TableV2SortOrder } from 'element-plus';
3
3
  import { DataKey, DataItem, Column, Columns, Sorter, Filter, FilterValue, OrderValue, TableSize, RowKey, RowSelectable, TreeProps, ShowOverflowTooltip, SpanMethod, ColumnIndex, SummaryMethod } from '../ele-data-table/types';
4
4
  import { VirtualColumn, VirtualColumns, BodyColumns, HeaderColumn, HeaderRows, ColSize, CustomRenderProps, SortBy, TreeTableProps, CellSpan, CellParams, VirtualRow } from './types';
@@ -125,7 +125,7 @@ export declare function isAutoRowHeight(hasExpandCol: boolean, bodyCols: BodyCol
125
125
  * @param props 属性
126
126
  * @param ctx SetupContext
127
127
  */
128
- export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
128
+ export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | VNode<import('vue').RendererNode, import('vue').RendererElement, {
129
129
  [key: string]: any;
130
130
  }>)[] | undefined;
131
131
  /**
@@ -192,7 +192,7 @@ export declare function getCellSpan(params: CellParams, spanMethod?: SpanMethod)
192
192
  * @param bodyCols 表格主体列配置
193
193
  * @param data 表格数据
194
194
  */
195
- export declare function getUserSums(summaryMethod?: SummaryMethod, bodyCols?: BodyColumns, data?: DataItem[]): string[] | undefined;
195
+ export declare function getUserSums(summaryMethod?: SummaryMethod, bodyCols?: BodyColumns, data?: DataItem[]): (string | VNode)[] | undefined;
196
196
  /**
197
197
  * 计算列合计值
198
198
  * @param data 表格数据
package/lib/ele-admin-layout/index.cjs CHANGED
@@ -104,7 +104,7 @@ const _sfc_main = vue.defineComponent({
104
104
  };
105
105
  const sidebarScrollToActive = () => {
106
106
  stopSidebarMenuTimer();
107
- if (sidebarMenuRef.value == null || isCollapseMobile.value || isMixSidebar.value && isCollapseSidebar.value) {
107
+ if (!props$1.menuScrollToActive || sidebarMenuRef.value == null || isCollapseMobile.value || isMixSidebar.value && isCollapseSidebar.value) {
108
108
  return;
109
109
  }
110
110
  startSidebarMenuTimer(() => {
@@ -113,7 +113,7 @@ const _sfc_main = vue.defineComponent({
113
113
  };
114
114
  const sideboxScrollToActive = () => {
115
115
  stopSideboxMenuTimer();
116
- if (sideboxMenuRef.value == null || isCollapseMobile.value) {
116
+ if (!props$1.menuScrollToActive || sideboxMenuRef.value == null || isCollapseMobile.value) {
117
117
  return;
118
118
  }
119
119
  startSideboxMenuTimer(() => {
@@ -327,35 +327,38 @@ const _hoisted_1 = {
327
327
  key: 0,
328
328
  class: "ele-admin-logo"
329
329
  };
330
- const _hoisted_2 = {
330
+ const _hoisted_2 = ["src"];
331
+ const _hoisted_3 = {
331
332
  key: 1,
332
333
  class: "ele-admin-tools"
333
334
  };
334
- const _hoisted_3 = {
335
+ const _hoisted_4 = {
335
336
  key: 2,
336
337
  class: "ele-admin-breadcrumb"
337
338
  };
338
- const _hoisted_4 = {
339
+ const _hoisted_5 = {
339
340
  key: 3,
340
341
  class: "ele-admin-menus"
341
342
  };
342
- const _hoisted_5 = {
343
+ const _hoisted_6 = {
343
344
  key: 5,
344
345
  class: "ele-admin-tools"
345
346
  };
346
- const _hoisted_6 = {
347
+ const _hoisted_7 = {
347
348
  key: 0,
348
349
  class: "ele-admin-logo"
349
350
  };
350
- const _hoisted_7 = {
351
+ const _hoisted_8 = ["src"];
352
+ const _hoisted_9 = {
351
353
  key: 0,
352
354
  class: "ele-admin-logo-title"
353
355
  };
354
- const _hoisted_8 = {
356
+ const _hoisted_10 = {
355
357
  key: 1,
356
358
  class: "ele-admin-logo"
357
359
  };
358
- const _hoisted_9 = {
360
+ const _hoisted_11 = ["src"];
361
+ const _hoisted_12 = {
359
362
  ref: "modalsRef",
360
363
  class: "ele-admin-modals"
361
364
  };
@@ -396,20 +399,24 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
396
399
  onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.handleHeadMouseenter && _ctx.handleHeadMouseenter(...args)),
397
400
  onMouseleave: _cache[1] || (_cache[1] = (...args) => _ctx.handleHeadMouseleave && _ctx.handleHeadMouseleave(...args))
398
401
  }, [
399
- _ctx.isHeaderLogo && (_ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
400
- vue.renderSlot(_ctx.$slots, "logo"),
401
- vue.renderSlot(_ctx.$slots, "logoTitle")
402
+ _ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
403
+ _ctx.logoSrc || _ctx.$slots.logo ? vue.renderSlot(_ctx.$slots, "logo", { key: 0 }, () => [
404
+ vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_2)
405
+ ]) : vue.createCommentVNode("", true),
406
+ _ctx.logoTitle || _ctx.$slots.logoTitle ? vue.renderSlot(_ctx.$slots, "logoTitle", { key: 1 }, () => [
407
+ vue.createElementVNode("h1", null, vue.toDisplayString(_ctx.logoTitle), 1)
408
+ ]) : vue.createCommentVNode("", true)
402
409
  ])) : vue.createCommentVNode("", true),
403
- _ctx.$slots.left ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
410
+ _ctx.$slots.left ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
404
411
  vue.renderSlot(_ctx.$slots, "left")
405
412
  ])) : vue.createCommentVNode("", true),
406
- _ctx.breadcrumb ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
413
+ _ctx.breadcrumb ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
407
414
  vue.renderSlot(_ctx.$slots, "breadcrumb", {}, () => [
408
415
  _ctx.levels && _ctx.levels.length ? (vue.openBlock(), vue.createBlock(_component_EleBreadcrumb, vue.mergeProps({ key: 0 }, _ctx.breadcrumb === true ? {} : _ctx.breadcrumb, { items: _ctx.levels }), null, 16, ["items"])) : vue.createCommentVNode("", true)
409
416
  ])
410
417
  ])) : vue.createCommentVNode("", true),
411
418
  vue.renderSlot(_ctx.$slots, "center"),
412
- !_ctx.showHeaderTabs || _ctx.showHeaderMenus ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
419
+ !_ctx.showHeaderTabs || _ctx.showHeaderMenus ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
413
420
  _ctx.showHeaderMenus && _ctx.headerMenus ? (vue.openBlock(), vue.createBlock(_component_EleMenus, vue.mergeProps({
414
421
  key: 0,
415
422
  mode: "horizontal",
@@ -469,7 +476,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
469
476
  };
470
477
  })
471
478
  ]), 1032, ["tabs", "active", "fixedHome", "homePath", "isHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "class", "style", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : vue.createCommentVNode("", true),
472
- _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
479
+ _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_6, [
473
480
  vue.renderSlot(_ctx.$slots, "right")
474
481
  ])) : vue.createCommentVNode("", true)
475
482
  ], 38)) : vue.createCommentVNode("", true)
@@ -501,8 +508,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
501
508
  onMouseenter: _cache[2] || (_cache[2] = (...args) => _ctx.handleBoxMouseEnter && _ctx.handleBoxMouseEnter(...args)),
502
509
  onMouseleave: _cache[3] || (_cache[3] = (...args) => _ctx.handleBoxMouseLeave && _ctx.handleBoxMouseLeave(...args))
503
510
  }, [
504
- !_ctx.isHeaderLogo && _ctx.$slots.logo ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_6, [
505
- vue.renderSlot(_ctx.$slots, "logo")
511
+ !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.$slots.logo) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
512
+ vue.renderSlot(_ctx.$slots, "logo", {}, () => [
513
+ vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_8)
514
+ ])
506
515
  ])) : vue.createCommentVNode("", true),
507
516
  vue.renderSlot(_ctx.$slots, "boxTop"),
508
517
  vue.createVNode(_component_ElScrollbar, { class: "ele-admin-menus" }, {
@@ -556,12 +565,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
556
565
  onMouseleave: _cache[5] || (_cache[5] = (...args) => _ctx.handleSideMouseLeave && _ctx.handleSideMouseLeave(...args))
557
566
  }, [
558
567
  _ctx.isMixSidebar ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
559
- !_ctx.isHeaderLogo && _ctx.$slots.logoTitle ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
560
- vue.renderSlot(_ctx.$slots, "logoTitle")
568
+ !_ctx.isHeaderLogo && (_ctx.logoTitle || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, [
569
+ vue.renderSlot(_ctx.$slots, "logoTitle", {}, () => [
570
+ vue.createElementVNode("h1", null, vue.toDisplayString(_ctx.logoTitle), 1)
571
+ ])
561
572
  ])) : vue.createCommentVNode("", true)
562
- ], 64)) : !_ctx.isHeaderLogo && (_ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_8, [
563
- vue.renderSlot(_ctx.$slots, "logo"),
564
- vue.renderSlot(_ctx.$slots, "logoTitle")
573
+ ], 64)) : !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, [
574
+ _ctx.logoSrc || _ctx.$slots.logo ? vue.renderSlot(_ctx.$slots, "logo", { key: 0 }, () => [
575
+ vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_11)
576
+ ]) : vue.createCommentVNode("", true),
577
+ _ctx.logoTitle || _ctx.$slots.logoTitle ? vue.renderSlot(_ctx.$slots, "logoTitle", { key: 1 }, () => [
578
+ vue.createElementVNode("h1", null, vue.toDisplayString(_ctx.logoTitle), 1)
579
+ ]) : vue.createCommentVNode("", true)
565
580
  ])) : vue.createCommentVNode("", true),
566
581
  vue.renderSlot(_ctx.$slots, "top"),
567
582
  vue.createVNode(_component_ElScrollbar, { class: "ele-admin-menus" }, {
@@ -651,7 +666,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
651
666
  target: _ctx.fixedBody && _ctx.contentRef ? _ctx.contentRef : void 0,
652
667
  style: _ctx.fixedBody ? { position: "absolute" } : void 0
653
668
  }, _ctx.backTop === true ? {} : _ctx.backTop), null, 16, ["target", "style"])) : vue.createCommentVNode("", true),
654
- vue.createElementVNode("div", _hoisted_9, null, 512)
669
+ vue.createElementVNode("div", _hoisted_12, null, 512)
655
670
  ]),
656
671
  default: vue.withCtx(() => [
657
672
  vue.createElementVNode("div", {
package/lib/ele-admin-layout/index.d.ts CHANGED
@@ -70,6 +70,12 @@ declare const _default: import('vue').DefineComponent<{
70
70
  sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
71
71
  tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
72
72
  contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
73
+ logoSrc: StringConstructor;
74
+ logoTitle: StringConstructor;
75
+ menuScrollToActive: {
76
+ type: BooleanConstructor;
77
+ default: boolean;
78
+ };
73
79
  mobile: BooleanConstructor;
74
80
  }, {
75
81
  ownSlots: string[];
@@ -144,7 +150,7 @@ declare const _default: import('vue').DefineComponent<{
144
150
  sideMenuItemClick: (_item: MenuItem, _e: MouseEvent) => boolean;
145
151
  sideMouseenter: (_e: MouseEvent) => boolean;
146
152
  sideMouseleave: (_e: MouseEvent) => boolean;
147
- tabClick: (_option: TabEventOption) => boolean;
153
+ tabClick: (_option: TabEventOption) => boolean; /** 是否是移动端风格折叠状态 */
148
154
  tabRemove: (_name: string) => boolean;
149
155
  tabContextMenu: (_option: TabEventOption) => boolean;
150
156
  tabSortChange: (_data: TabPaneItem[]) => boolean;
@@ -217,6 +223,12 @@ declare const _default: import('vue').DefineComponent<{
217
223
  sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
218
224
  tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
219
225
  contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
226
+ logoSrc: StringConstructor;
227
+ logoTitle: StringConstructor;
228
+ menuScrollToActive: {
229
+ type: BooleanConstructor;
230
+ default: boolean;
231
+ };
220
232
  mobile: BooleanConstructor;
221
233
  }>> & {
222
234
  onTabClick?: ((_option: TabEventOption) => any) | undefined;
@@ -260,6 +272,7 @@ declare const _default: import('vue').DefineComponent<{
260
272
  sidebarIconSlot: string;
261
273
  sideboxTitleSlot: string;
262
274
  sideboxIconSlot: string;
275
+ menuScrollToActive: boolean;
263
276
  mobile: boolean;
264
277
  }, {}>;
265
278
  export default _default;
package/lib/ele-admin-layout/props.cjs CHANGED
@@ -112,6 +112,15 @@ const adminLayoutProps = {
112
112
  tabsCustomStyle: Object,
113
113
  /** 内容区样式 */
114
114
  contentCustomStyle: Object,
115
+ /** logo图片地址 */
116
+ logoSrc: String,
117
+ /** logo文字 */
118
+ logoTitle: String,
119
+ /** 菜单是否自动滚动到选中位置 */
120
+ menuScrollToActive: {
121
+ type: Boolean,
122
+ default: true
123
+ },
115
124
  /** 是否是移动端风格 */
116
125
  mobile: Boolean
117
126
  };
package/lib/ele-admin-layout/props.d.ts CHANGED
@@ -120,6 +120,15 @@ export declare const adminLayoutProps: {
120
120
  tabsCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
121
121
  /** 内容区样式 */
122
122
  contentCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
123
+ /** logo图片地址 */
124
+ logoSrc: StringConstructor;
125
+ /** logo文字 */
126
+ logoTitle: StringConstructor;
127
+ /** 菜单是否自动滚动到选中位置 */
128
+ menuScrollToActive: {
129
+ type: BooleanConstructor;
130
+ default: boolean;
131
+ };
123
132
  /** 是否是移动端风格 */
124
133
  mobile: BooleanConstructor;
125
134
  };
package/lib/ele-admin-layout/style/index.scss CHANGED
@@ -206,8 +206,13 @@
206
206
  }
207
207
  }
208
208
 
209
- .ele-admin-logo > img + h1 {
210
- margin-left: 8px;
209
+ .ele-admin-logo > img {
210
+ width: 30px;
211
+ height: 30px;
212
+
213
+ & + h1 {
214
+ margin-left: 8px;
215
+ }
211
216
  }
212
217
 
213
218
  .ele-admin-sidebar.is-collapse > .ele-admin-logo > img + h1 {
package/lib/ele-virtual-table/types.d.ts CHANGED
@@ -167,7 +167,7 @@ export interface SumCol extends ColSize {
167
167
  /** 唯一值 */
168
168
  key: string;
169
169
  /** 显示文本 */
170
- text?: string;
170
+ text?: string | VNode;
171
171
  /** 对齐方式 */
172
172
  align?: string;
173
173
  /** 固定列 */
package/lib/ele-virtual-table/util.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { SetupContext } from 'vue';
1
+ import { SetupContext, VNode } from 'vue';
2
2
  import { TableV2SortOrder } from 'element-plus';
3
3
  import { DataKey, DataItem, Column, Columns, Sorter, Filter, FilterValue, OrderValue, TableSize, RowKey, RowSelectable, TreeProps, ShowOverflowTooltip, SpanMethod, ColumnIndex, SummaryMethod } from '../ele-data-table/types';
4
4
  import { VirtualColumn, VirtualColumns, BodyColumns, HeaderColumn, HeaderRows, ColSize, CustomRenderProps, SortBy, TreeTableProps, CellSpan, CellParams, VirtualRow } from './types';
@@ -125,7 +125,7 @@ export declare function isAutoRowHeight(hasExpandCol: boolean, bodyCols: BodyCol
125
125
  * @param props 属性
126
126
  * @param ctx SetupContext
127
127
  */
128
- export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
128
+ export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | VNode<import('vue').RendererNode, import('vue').RendererElement, {
129
129
  [key: string]: any;
130
130
  }>)[] | undefined;
131
131
  /**
@@ -192,7 +192,7 @@ export declare function getCellSpan(params: CellParams, spanMethod?: SpanMethod)
192
192
  * @param bodyCols 表格主体列配置
193
193
  * @param data 表格数据
194
194
  */
195
- export declare function getUserSums(summaryMethod?: SummaryMethod, bodyCols?: BodyColumns, data?: DataItem[]): string[] | undefined;
195
+ export declare function getUserSums(summaryMethod?: SummaryMethod, bodyCols?: BodyColumns, data?: DataItem[]): (string | VNode)[] | undefined;
196
196
  /**
197
197
  * 计算列合计值
198
198
  * @param data 表格数据
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ele-admin-plus",
3
- "version": "1.2.0-beta.3",
3
+ "version": "1.2.0-beta.4",
4
4
  "type": "module",
5
5
  "scripts": {
6
6
  "dev": "vite --host --config vite.global.ts",
@@ -41,14 +41,14 @@
41
41
  "dayjs": "^1.11.11",
42
42
  "echarts": "^5.5.0",
43
43
  "echarts-wordcloud": "^2.1.0",
44
- "element-plus": "^2.7.4",
44
+ "element-plus": "^2.7.5",
45
45
  "eslint": "^8.57.0",
46
46
  "eslint-config-prettier": "^9.1.0",
47
47
  "eslint-plugin-prettier": "^5.1.3",
48
48
  "eslint-plugin-vue": "^9.26.0",
49
49
  "esno": "^4.7.0",
50
50
  "exceljs": "^4.4.0",
51
- "execa": "^9.1.0",
51
+ "execa": "^9.2.0",
52
52
  "github-markdown-css": "^5.5.1",
53
53
  "highlight.js": "^11.9.0",
54
54
  "jsbarcode": "^3.11.6",
@@ -64,14 +64,14 @@
64
64
  "tinymce": "^5.10.9",
65
65
  "typescript": "^5.4.5",
66
66
  "unplugin-vue-components": "^0.27.0",
67
- "vite": "^5.2.12",
67
+ "vite": "^5.2.13",
68
68
  "vite-plugin-dts": "^3.9.1",
69
69
  "vue": "^3.4.27",
70
70
  "vue-echarts": "^6.7.3",
71
71
  "vue-eslint-parser": "^9.4.3",
72
72
  "vue-i18n": "^9.13.1",
73
73
  "vue-router": "^4.3.2",
74
- "vue-tsc": "^2.0.19",
74
+ "vue-tsc": "^2.0.21",
75
75
  "vuedraggable": "^4.1.0",
76
76
  "xgplayer": "^3.0.18",
77
77
  "xgplayer-hls": "^3.0.18",