ele-admin-plus 1.0.0-beta.2 → 1.0.0-beta.4

package/lib/ele-tabs/index.js

@@ -2,6 +2,7 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const SortableJs = require("sortablejs");
+const core = require("../utils/core");
 const TabTitle = require("./components/tab-title");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
@@ -9,10 +10,13 @@ const _sfc_main = vue.defineComponent({
   components: { ElTabs: elementPlus.ElTabs, ElTabPane: elementPlus.ElTabPane, TabTitle },
   props: props.tabsProps,
   emits: props.tabsEmits,
-  setup(props2, { emit }) {
+  setup(props$1, { emit }) {
     const current = { sortIns: null, isScroll: false };
     const tabRef = vue.ref(null);
     const itemRefs = vue.ref([]);
+    const tabProps = vue.computed(() => {
+      return core.pick(props$1, props.tabPropKeys);
+    });
     const onUpdateModelValue = (name) => {
       emit("update:modelValue", name);
     };
@@ -68,7 +72,7 @@ const _sfc_main = vue.defineComponent({
     const bindDragSort = () => {
       unbindDragSort();
       const el = getNavEl();
-      if (!props2.sortable || !el) {
+      if (!props$1.sortable || !el) {
         return;
       }
       current.sortIns = new SortableJs(el, {
@@ -76,7 +80,7 @@ const _sfc_main = vue.defineComponent({
         draggable: ".el-tabs__item",
         onUpdate: ({ oldDraggableIndex, newDraggableIndex }) => {
           if (typeof oldDraggableIndex === "number" && typeof newDraggableIndex === "number") {
-            const temp = [...props2.items];
+            const temp = [...props$1.items];
             temp.splice(
               newDraggableIndex,
               0,
@@ -134,7 +138,7 @@ const _sfc_main = vue.defineComponent({
     const bindEvents = () => {
       bindDragSort();
       const el = getHeaderEl();
-      if (el) {
+      if (props$1.mousewheel && el) {
         el.addEventListener("mousewheel", onMousewheel);
         el.addEventListener("DOMMouseScroll", onFMousewheel);
       }
@@ -154,14 +158,16 @@ const _sfc_main = vue.defineComponent({
       unbindEvents();
     });
     vue.watch(
-      () => props2.sortable,
+      () => props$1.sortable,
       () => {
         bindDragSort();
       }
     );
     return {
+      omit: core.omit,
       tabRef,
       itemRefs,
+      tabProps,
       onUpdateModelValue,
       onTabClick,
       onTabChange,
@@ -188,18 +194,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_TabTitle = vue.resolveComponent("TabTitle");
   const _component_ElTabPane = vue.resolveComponent("ElTabPane");
   const _component_ElTabs = vue.resolveComponent("ElTabs");
-  return vue.openBlock(), vue.createBlock(_component_ElTabs, {
-    ref: "tabRef",
-    modelValue: _ctx.modelValue,
-    closable: _ctx.closable,
-    addable: _ctx.addable,
-    editable: _ctx.editable,
-    tabPosition: _ctx.tabPosition,
-    stretch: _ctx.stretch,
-    beforeLeave: _ctx.beforeLeave,
+  return vue.openBlock(), vue.createBlock(_component_ElTabs, vue.mergeProps({ ref: "tabRef" }, _ctx.tabProps, {
     type: _ctx.type === "card" || _ctx.type === "border-card" ? _ctx.type : void 0,
-    class: vue.normalizeClass([
-      "ele-tab",
+    class: [
+      "ele-tabs",
       { "is-small": _ctx.size === "small" },
       { "is-large": _ctx.size === "large" },
       { "is-default": !_ctx.type || _ctx.type === "default" },
@@ -208,7 +206,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       { "is-indicator": _ctx.type === "indicator" },
       { "is-button": _ctx.type === "button" },
       { "is-center": _ctx.center }
-    ]),
+    ],
     "onUpdate:modelValue": _ctx.onUpdateModelValue,
     onTabClick: _ctx.onTabClick,
     onTabChange: _ctx.onTabChange,
@@ -216,17 +214,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     onTabAdd: _ctx.onTabAdd,
     onEdit: _ctx.onEdit,
     onContextmenu: _ctx.onContextmenu
-  }, {
+  }), {
     default: vue.withCtx(() => [
       (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.items, (item, index2) => {
-        return vue.openBlock(), vue.createBlock(_component_ElTabPane, {
-          key: index2 + "-" + item.name,
-          label: item.label,
-          disabled: item.disabled,
-          name: item.name,
-          closable: item.closable,
-          lazy: item.lazy
-        }, vue.createSlots({
+        return vue.openBlock(), vue.createBlock(_component_ElTabPane, vue.mergeProps({
+          key: index2 + "-" + item.name
+        }, _ctx.omit(item, ["meta"])), vue.createSlots({
           label: vue.withCtx(() => [
             vue.createVNode(_component_TabTitle, {
               ref_for: true,
@@ -266,11 +259,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "0"
           } : void 0
-        ]), 1032, ["label", "disabled", "name", "closable", "lazy"]);
+        ]), 1040);
       }), 128))
     ]),
     _: 3
-  }, 8, ["modelValue", "closable", "addable", "editable", "tabPosition", "stretch", "beforeLeave", "type", "class", "onUpdate:modelValue", "onTabClick", "onTabChange", "onTabRemove", "onTabAdd", "onEdit", "onContextmenu"]);
+  }, 16, ["type", "class", "onUpdate:modelValue", "onTabClick", "onTabChange", "onTabRemove", "onTabAdd", "onEdit", "onContextmenu"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;

package/lib/ele-tabs/props.d.ts

@@ -1,5 +1,7 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { TabPaneItem, TabSize, TabType, TabEventOption, DropdownInstance } from './types';
+import { tabsProps as elTabsProps } from 'element-plus';
+import type { ElDropdownInstance } from '../ele-app/types';
+import type { TabPaneItem, TabSize, TabType, TabEventOption } from './types';
 /**
  * 属性
  */
@@ -13,6 +15,7 @@ export declare const tabsProps: {
     center: BooleanConstructor;
     contextMenu: BooleanConstructor;
     sortable: BooleanConstructor;
+    mousewheel: BooleanConstructor;
     handleClick: BooleanConstructor;
     activeName: {
         readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
@@ -48,7 +51,7 @@ export type TabsProps = ExtractPropTypes<typeof tabsProps>;
 export declare const tabsEmits: {
     tabItemClick: (_opt: TabEventOption) => boolean;
     tabContextMenu: (_opt: TabEventOption) => boolean;
-    tabContextOpen: (_ref: DropdownInstance) => boolean;
+    tabContextOpen: (_ref: ElDropdownInstance) => boolean;
     tabSortChange: (_data: TabPaneItem[]) => boolean;
     "update:modelValue": (name: import("element-plus").TabPaneName) => boolean;
     tabClick: (pane: {
@@ -73,3 +76,8 @@ export declare const tabsEmits: {
     tabRemove: (name: import("element-plus").TabPaneName) => boolean;
     tabAdd: () => boolean;
 };
+export type TabPropKeys = Array<keyof typeof elTabsProps>;
+/**
+ * 标签页组件属性名
+ */
+export declare const tabPropKeys: TabPropKeys;

package/lib/ele-tabs/props.js

@@ -18,6 +18,8 @@ const tabsProps = {
   contextMenu: Boolean,
   // 是否支持拖动排序
   sortable: Boolean,
+  // 是否支持鼠标滚轮滑动
+  mousewheel: Boolean,
   // 是否自己处理页签点击事件
   handleClick: Boolean
 };
@@ -32,5 +34,7 @@ const tabsEmits = {
   // 拖动排序改变事件
   tabSortChange: (_data) => true
 };
+const tabPropKeys = Object.keys(elementPlus.tabsProps);
+exports.tabPropKeys = tabPropKeys;
 exports.tabsEmits = tabsEmits;
 exports.tabsProps = tabsProps;

package/lib/ele-tabs/style/css-var.scss

@@ -1,33 +1,33 @@
 @use '../../style/themes/default.scss' as *;
 
 @mixin set-tab-var($var) {
-  .ele-tab > .el-tabs__header,
+  .ele-tabs > .el-tabs__header,
   .ele-tab-tool {
     @include set-ele-var('tab', $var);
   }
 
-  .ele-tab.is-small > .el-tabs__header,
+  .ele-tabs.is-small > .el-tabs__header,
   .ele-tab-wrap.is-small .ele-tab-tool {
     @include set-ele-var('tab-small', $var);
   }
 
-  .ele-tab.is-large > .el-tabs__header,
+  .ele-tabs.is-large > .el-tabs__header,
   .ele-tab-wrap.is-large .ele-tab-tool {
     @include set-ele-var('tab-large', $var);
   }
 
-  .ele-tab.is-simple > .el-tabs__header,
-  .ele-tab.is-indicator > .el-tabs__header,
+  .ele-tabs.is-simple > .el-tabs__header,
+  .ele-tabs.is-indicator > .el-tabs__header,
   .ele-tab-wrap.is-simple .ele-tab-tool,
   .ele-tab-wrap.is-indicator .ele-tab-tool {
     @include set-ele-var('tab-simple', $var);
   }
 
-  .ele-tab.is-indicator > .el-tabs__header {
+  .ele-tabs.is-indicator > .el-tabs__header {
     @include set-ele-var('tab-indicator', $var);
   }
 
-  .ele-tab.is-button > .el-tabs__header,
+  .ele-tabs.is-button > .el-tabs__header,
   .ele-tab-wrap.is-button .ele-tab-tool,
   .ele-admin-tab-card .ele-admin-tabs {
     @include set-ele-var('tab-button', $var);

package/lib/ele-tabs/style/index.scss

@@ -4,7 +4,7 @@
 @include set-tab-var($ele);
 
 /* 标签页 */
-.ele-tab {
+.ele-tabs {
   & > .el-tabs__header {
     #{elVarName('tabs', 'header-height')}: eleVar('tab', 'height');
     margin: 0;
@@ -15,7 +15,7 @@
       display: flex;
 
       &::after {
-        height: 1px;
+        height: 0.8px;
         background-color: eleVar('tab', 'line-color');
       }
     }
@@ -32,6 +32,7 @@
 
     .el-tabs__item {
       padding: 0 !important;
+      line-height: elVar('tabs', 'header-height');
       transition: color 0.3s, background-color 0.3s, border-color 0.3s;
 
       // 右键菜单
@@ -346,7 +347,7 @@
   position: relative;
 
   // 页签
-  & > .ele-tab {
+  & > .ele-tabs {
     flex: 1;
     overflow: hidden;
 

package/lib/ele-tabs/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { TabPaneProps, ElDropdown } from 'element-plus';
+import type { TabPaneProps } from 'element-plus';
 import type SortableJs from 'sortablejs';
 /**
  * 页签数据
@@ -23,10 +23,6 @@ export interface TabEventOption {
     active?: string | number;
     command?: string;
 }
-/**
- * 下拉菜单实例
- */
-export type DropdownInstance = InstanceType<typeof ElDropdown> | null;
 /**
  * 页签实例数据
  */

package/lib/ele-text/index.d.ts

@@ -11,6 +11,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     italic: BooleanConstructor;
     icon: import("vue").PropType<import("./types").TextIcon>;
     iconProps: import("vue").PropType<Partial<import("element-plus").IconProps>>;
+    iconStyle: import("vue").PropType<import("vue").CSSProperties>;
 }, {
     authenticated: import("vue").Ref<boolean>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -26,6 +27,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     italic: BooleanConstructor;
     icon: import("vue").PropType<import("./types").TextIcon>;
     iconProps: import("vue").PropType<Partial<import("element-plus").IconProps>>;
+    iconStyle: import("vue").PropType<import("vue").CSSProperties>;
 }>>, {
     tag: string;
     deleted: boolean;

package/lib/ele-text/index.js

@@ -1,14 +1,14 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const licenseUtil = require("../utils/license-util");
+const receiver = require("../ele-config-provider/receiver");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleText",
-  component: { ElIcon: elementPlus.ElIcon },
+  components: { ElIcon: elementPlus.ElIcon },
   props: props.textProps,
   setup() {
-    const { authenticated } = licenseUtil.useLicense();
+    const { authenticated } = receiver.useLicense();
     return { authenticated };
   }
 });
@@ -47,9 +47,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   }, {
     default: vue.withCtx(() => [
-      _ctx.authenticated && _ctx.icon ? (vue.openBlock(), vue.createBlock(_component_ElIcon, vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.iconProps)), {
+      _ctx.authenticated && _ctx.icon ? (vue.openBlock(), vue.createBlock(_component_ElIcon, vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.iconProps || {})), {
         default: vue.withCtx(() => [
-          (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.icon)))
+          (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.icon), {
+            style: vue.normalizeStyle(_ctx.iconStyle)
+          }, null, 8, ["style"]))
         ]),
         _: 1
       }, 16)) : vue.createCommentVNode("", true),

package/lib/ele-text/props.d.ts

@@ -1,4 +1,4 @@
-import type { PropType, ExtractPropTypes } from 'vue';
+import type { PropType, ExtractPropTypes, CSSProperties } from 'vue';
 import type { IconProps } from 'element-plus';
 import type { TextType, TextSize, TextIcon } from './types';
 /**
@@ -17,5 +17,11 @@ export declare const textProps: {
     italic: BooleanConstructor;
     icon: PropType<TextIcon>;
     iconProps: PropType<Partial<IconProps>>;
+    iconStyle: PropType<CSSProperties>;
 };
 export type TextProps = ExtractPropTypes<typeof textProps>;
+export type TextPropKeys = Array<keyof typeof textProps>;
+/**
+ * 属性名
+ */
+export declare const textPropKeys: TextPropKeys;

package/lib/ele-text/props.js

@@ -21,6 +21,10 @@ const textProps = {
   // 图标
   icon: [String, Object, Function],
   // 图标属性
-  iconProps: Object
+  iconProps: Object,
+  // 图标样式
+  iconStyle: Object
 };
+const textPropKeys = Object.keys(textProps);
+exports.textPropKeys = textPropKeys;
 exports.textProps = textProps;

package/lib/ele-toolbar/index.d.ts

@@ -1,14 +1,27 @@
 declare const _sfc_main: import("vue").DefineComponent<{
     title: StringConstructor;
     subtitle: StringConstructor;
-    theme: import("vue").PropType<import("./types").ToolbarTheme>;
+    theme: {
+        type: import("vue").PropType<import("./types").ToolbarTheme>;
+        default: string;
+    };
+    titleStyle: import("vue").PropType<import("vue").CSSProperties>;
+    bodyStyle: import("vue").PropType<import("vue").CSSProperties>;
+    toolsStyle: import("vue").PropType<import("vue").CSSProperties>;
     form: BooleanConstructor;
 }, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: StringConstructor;
     subtitle: StringConstructor;
-    theme: import("vue").PropType<import("./types").ToolbarTheme>;
+    theme: {
+        type: import("vue").PropType<import("./types").ToolbarTheme>;
+        default: string;
+    };
+    titleStyle: import("vue").PropType<import("vue").CSSProperties>;
+    bodyStyle: import("vue").PropType<import("vue").CSSProperties>;
+    toolsStyle: import("vue").PropType<import("vue").CSSProperties>;
     form: BooleanConstructor;
 }>>, {
+    theme: import("./types").ToolbarTheme;
     form: boolean;
 }, {}>;
 export default _sfc_main;

package/lib/ele-toolbar/index.js

@@ -14,22 +14,16 @@ const _export_sfc = (sfc, props2) => {
   }
   return target;
 };
-const _hoisted_1 = {
-  key: 0,
-  class: "ele-toolbar-title"
-};
-const _hoisted_2 = { class: "ele-toolbar-body" };
-const _hoisted_3 = { class: "ele-toolbar-tools" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleText = vue.resolveComponent("EleText");
   return vue.openBlock(), vue.createElementBlock("div", {
-    class: vue.normalizeClass([
-      "ele-toolbar",
-      { "is-plain": "plain" === _ctx.theme },
-      { "is-form": _ctx.form }
-    ])
+    class: vue.normalizeClass(["ele-toolbar", { "is-plain": "plain" === _ctx.theme }])
   }, [
-    _ctx.title || _ctx.subtitle ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+    _ctx.title || _ctx.subtitle ? (vue.openBlock(), vue.createElementBlock("div", {
+      key: 0,
+      class: "ele-toolbar-title",
+      style: vue.normalizeStyle(_ctx.titleStyle)
+    }, [
       _ctx.title ? (vue.openBlock(), vue.createBlock(_component_EleText, {
         key: 0,
         type: "heading"
@@ -48,13 +42,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ]),
         _: 1
       })) : vue.createCommentVNode("", true)
-    ])) : vue.createCommentVNode("", true),
-    vue.createElementVNode("div", _hoisted_2, [
+    ], 4)) : vue.createCommentVNode("", true),
+    vue.createElementVNode("div", {
+      class: "ele-toolbar-body",
+      style: vue.normalizeStyle(_ctx.bodyStyle)
+    }, [
       vue.renderSlot(_ctx.$slots, "default")
-    ]),
-    vue.createElementVNode("div", _hoisted_3, [
+    ], 4),
+    vue.createElementVNode("div", {
+      class: "ele-toolbar-tools",
+      style: vue.normalizeStyle(_ctx.toolsStyle)
+    }, [
       vue.renderSlot(_ctx.$slots, "tools")
-    ])
+    ], 4)
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/lib/ele-toolbar/props.d.ts

@@ -1,4 +1,4 @@
-import type { PropType, ExtractPropTypes } from 'vue';
+import type { PropType, ExtractPropTypes, CSSProperties } from 'vue';
 import type { ToolbarTheme } from './types';
 /**
  * 属性
@@ -6,7 +6,13 @@ import type { ToolbarTheme } from './types';
 export declare const toolbarProps: {
     title: StringConstructor;
     subtitle: StringConstructor;
-    theme: PropType<ToolbarTheme>;
+    theme: {
+        type: PropType<ToolbarTheme>;
+        default: string;
+    };
+    titleStyle: PropType<CSSProperties>;
+    bodyStyle: PropType<CSSProperties>;
+    toolsStyle: PropType<CSSProperties>;
     form: BooleanConstructor;
 };
 export type ToolbarProps = ExtractPropTypes<typeof toolbarProps>;

package/lib/ele-toolbar/props.js

@@ -6,7 +6,16 @@ const toolbarProps = {
   // 二级标题
   subtitle: String,
   // 主题风格
-  theme: String,
+  theme: {
+    type: String,
+    default: "plain"
+  },
+  // 标题区样式
+  titleStyle: Object,
+  // 内容区样式
+  bodyStyle: Object,
+  // 按钮区样式
+  toolsStyle: Object,
   // 是否是表单
   form: Boolean
 };

package/lib/ele-toolbar/style/index.scss

@@ -22,7 +22,7 @@
   }
 
   .ele-toolbar-body {
-    flex-shrink: 0;
+    flex: auto;
     max-width: 100%;
     margin: eleVar('toolbar', 'space') 0;
   }
@@ -37,6 +37,7 @@
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-end;
+    align-items: center;
   }
 
   // 朴素风格
@@ -47,22 +48,6 @@
     margin: eleVar('toolbar-plain', 'margin');
   }
 
-  // 表单
-  &.is-form {
-    .ele-toolbar-body {
-      margin: 0;
-    }
-
-    .el-row > .el-col {
-      margin-top: eleVar('toolbar', 'space');
-      margin-bottom: eleVar('toolbar', 'space');
-    }
-
-    .el-form-item {
-      margin-bottom: 0;
-    }
-  }
-
   // 修复上传列表占位
   .el-upload-list {
     margin: 0;