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

package/es/ele-text/props.js

@@ -19,8 +19,12 @@ const textProps = {
   // 图标
   icon: [String, Object, Function],
   // 图标属性
-  iconProps: Object
+  iconProps: Object,
+  // 图标样式
+  iconStyle: Object
 };
+const textPropKeys = Object.keys(textProps);
 export {
+  textPropKeys,
   textProps
 };

package/es/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/es/ele-toolbar/index.js

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

package/es/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/es/ele-toolbar/props.js

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

package/es/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;