ele-admin-plus 1.1.7 → 1.1.8-beta.2

package/es/ele-card/index.js

@@ -1,9 +1,7 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, normalizeClass, createSlots, withCtx, renderSlot, createElementVNode, normalizeStyle, createTextVNode, toDisplayString, createCommentVNode } from "vue";
-import { ElCard } from "element-plus";
+import { defineComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createTextVNode, toDisplayString, createCommentVNode } from "vue";
 import { cardProps } from "./props";
 const _sfc_main = defineComponent({
   name: "EleCard",
-  components: { ElCard },
   props: cardProps
 });
 const _export_sfc = (sfc, props) => {
@@ -14,57 +12,46 @@ const _export_sfc = (sfc, props) => {
   return target;
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_ElCard = resolveComponent("ElCard");
-  return openBlock(), createBlock(_component_ElCard, {
-    bodyStyle: _ctx.bodyStyle,
-    bodyClass: _ctx.bodyClass,
-    shadow: _ctx.shadow,
+  return openBlock(), createElementBlock("div", {
     class: normalizeClass([
       "ele-card",
-      { "is-plain": !_ctx.bordered },
+      { "is-border": _ctx.bordered },
+      { "is-shadow": _ctx.shadow === "always" },
+      { "is-hover-shadow": _ctx.shadow === "hover" },
       { "is-flex-table": _ctx.flexTable }
     ])
-  }, createSlots({
-    default: withCtx(() => [
-      renderSlot(_ctx.$slots, "default")
-    ]),
-    _: 2
   }, [
-    _ctx.header || _ctx.$slots.header || _ctx.$slots.extra ? {
-      name: "header",
-      fn: withCtx(() => [
-        createElementVNode("div", {
-          class: "ele-card-header",
-          style: normalizeStyle(_ctx.headerStyle)
-        }, [
-          createElementVNode("div", {
-            class: "ele-card-title",
-            style: normalizeStyle(_ctx.titleStyle)
-          }, [
-            renderSlot(_ctx.$slots, "header", {}, () => [
-              createTextVNode(toDisplayString(_ctx.header), 1)
-            ])
-          ], 4),
-          _ctx.$slots.extra ? renderSlot(_ctx.$slots, "extra", { key: 0 }) : createCommentVNode("", true)
-        ], 4)
-      ]),
-      key: "0"
-    } : void 0,
-    _ctx.footer || _ctx.$slots.footer ? {
-      name: "footer",
-      fn: withCtx(() => [
-        createElementVNode("div", {
-          class: "ele-card-footer",
-          style: normalizeStyle(_ctx.footerStyle)
-        }, [
-          renderSlot(_ctx.$slots, "footer", {}, () => [
-            createTextVNode(toDisplayString(_ctx.footer), 1)
-          ])
-        ], 4)
-      ]),
-      key: "1"
-    } : void 0
-  ]), 1032, ["bodyStyle", "bodyClass", "shadow", "class"]);
+    _ctx.header || _ctx.$slots.header || _ctx.$slots.extra ? (openBlock(), createElementBlock("div", {
+      key: 0,
+      class: "ele-card-header",
+      style: normalizeStyle(_ctx.headerStyle)
+    }, [
+      createElementVNode("div", {
+        class: "ele-card-title",
+        style: normalizeStyle(_ctx.titleStyle)
+      }, [
+        renderSlot(_ctx.$slots, "header", {}, () => [
+          createTextVNode(toDisplayString(_ctx.header), 1)
+        ])
+      ], 4),
+      _ctx.$slots.extra ? renderSlot(_ctx.$slots, "extra", { key: 0 }) : createCommentVNode("", true)
+    ], 4)) : createCommentVNode("", true),
+    createElementVNode("div", {
+      class: normalizeClass(["ele-card-body", _ctx.bodyClass]),
+      style: normalizeStyle(_ctx.bodyStyle)
+    }, [
+      renderSlot(_ctx.$slots, "default")
+    ], 6),
+    _ctx.footer || _ctx.$slots.footer ? (openBlock(), createElementBlock("div", {
+      key: 1,
+      class: "ele-card-footer",
+      style: normalizeStyle(_ctx.footerStyle)
+    }, [
+      renderSlot(_ctx.$slots, "footer", {}, () => [
+        createTextVNode(toDisplayString(_ctx.footer), 1)
+      ])
+    ], 4)) : createCommentVNode("", true)
+  ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

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

@@ -12,10 +12,7 @@ export declare const cardProps: {
     /** 主体类名 */
     bodyClass: StringConstructor;
     /** 阴影 */
-    shadow: {
-        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
-        default: string;
-    };
+    shadow: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
     /** 边框 */
     bordered: BooleanConstructor;
     /** 标题栏样式 */

package/es/ele-card/props.js

@@ -8,10 +8,7 @@ const cardProps = {
   /** 主体类名 */
   bodyClass: String,
   /** 阴影 */
-  shadow: {
-    type: String,
-    default: "never"
-  },
+  shadow: String,
   /** 边框 */
   bordered: Boolean,
   /** 标题栏样式 */

package/es/ele-card/style/index.js

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

package/es/ele-card/style/index.scss

@@ -5,93 +5,80 @@
 @include set-card-var($ele);
 
 .ele-card {
-  &.el-card {
-    color: inherit;
-    overflow: visible;
-    box-sizing: border-box;
-    background: eleVar('card', 'bg');
-    border-radius: eleVar('card', 'radius');
-    transition: (
-      border-color $ele-transition,
-      background-color $ele-transition,
-      box-shadow $ele-transition
-    );
+  box-sizing: border-box;
+  background: eleVar('card', 'bg');
+  border-radius: eleVar('card', 'radius');
+  transition: (
+    border-color $ele-transition,
+    background-color $ele-transition,
+    box-shadow $ele-transition
+  );
 
-    & > .el-card__body {
-      box-sizing: border-box;
-    }
-
-    & > .el-card__header {
-      padding: 0;
-      border: none;
-    }
-
-    & > .el-card__footer {
-      padding: 0;
-      border: none;
-    }
-
-    &.is-always-shadow {
-      box-shadow: eleVar('card', 'shadow');
-    }
-
-    &.is-hover-shadow:hover,
-    &.is-hover-shadow:focus {
-      box-shadow: eleVar('card', 'hover-shadow');
-    }
+  &.is-border {
+    border: eleVar('card', 'border');
   }
 
-  .ele-card-header {
-    display: flex;
-    align-items: center;
-    color: eleVar('card', 'header-color');
-    font-size: eleVar('card', 'header-font-size');
-    font-weight: eleVar('card', 'header-font-weight');
-    line-height: eleVar('card', 'header-line-height');
-    border-bottom: eleVar('card', 'header-border');
-    padding: eleVar('card', 'header-padding');
-    box-sizing: border-box;
+  &.is-shadow {
+    box-shadow: eleVar('card', 'shadow');
   }
 
-  .ele-card-title {
-    flex: 1;
+  &.is-hover-shadow:hover {
+    box-shadow: eleVar('card', 'hover-shadow');
   }
+}
 
-  .ele-card-footer {
-    border-top: eleVar('card', 'footer-border');
-    padding: eleVar('card', 'footer-padding');
-    box-sizing: border-box;
-  }
+.ele-card-body {
+  padding: eleVar('card', 'padding');
+  box-sizing: border-box;
+}
 
-  /* 去掉边框 */
-  &.is-plain {
-    border-width: 0;
-  }
+.ele-card-header {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  color: eleVar('card', 'header-color');
+  font-size: eleVar('card', 'header-font-size');
+  font-weight: eleVar('card', 'header-font-weight');
+  line-height: eleVar('card', 'header-line-height');
+  padding: eleVar('card', 'header-padding');
+  border-bottom: eleVar('card', 'header-border');
+  box-sizing: border-box;
+}
 
-  /* 内部表格高度铺满 */
-  &.is-flex-table {
+.ele-card-title {
+  flex: 1;
+}
+
+.ele-card-footer {
+  flex-shrink: 0;
+  padding: eleVar('card', 'footer-padding');
+  border-top: eleVar('card', 'footer-border');
+  box-sizing: border-box;
+}
+
+/* 内部表格高度铺满 */
+.ele-card.is-flex-table {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
+
+  & > .ele-card-body {
     flex: 1;
     display: flex;
     flex-direction: column;
     overflow: auto;
 
-    & > .el-card__body {
+    & > .ele-pro-table {
       flex: 1;
       display: flex;
       flex-direction: column;
       overflow: auto;
 
-      & > .ele-pro-table {
+      & > .ele-pro-table-view {
         flex: 1;
-        display: flex;
-        flex-direction: column;
-        overflow: auto;
-
-        & > .ele-pro-table-view {
-          flex: 1;
-          height: 100%;
-          overflow: hidden;
-        }
+        height: 100%;
+        overflow: hidden;
       }
     }
   }

package/es/ele-cropper/style/index.scss

@@ -23,6 +23,13 @@
     }
   }
 
+  .ele-cropper-image,
+  .ele-cropper-image > .cropper-container,
+  .ele-cropper-image > .cropper-container > .cropper-wrap-box,
+  .ele-cropper-image > .cropper-container > .cropper-drag-box {
+    border-radius: elVar('border-radius', 'base');
+  }
+
   .ele-cropper-previews {
     font-size: 0;
     flex-shrink: 0;
@@ -33,6 +40,7 @@
     margin-top: 16px;
     display: inline-block;
     box-sizing: border-box;
+    border-radius: elVar('border-radius', 'base');
     border: 1px solid elVar('border-color', 'light');
     vertical-align: top;
     overflow: hidden;

package/es/ele-data-table/index.d.ts

@@ -9,6 +9,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: null;
     };
+    rowKey: {
+        type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     columns: {
         type: import("vue").PropType<Columns>;
         required: boolean;
@@ -30,11 +34,10 @@ declare const _default: import("vue").DefineComponent<{
     };
     emptyProps: {
         type: import("vue").PropType<import("./types").TableEmptyProps>;
-        default: () => null;
+        default: () => null; /** 表格组件实例 */
     };
     rowClickChecked: import("vue").PropType<import("./types").RowClickChecked>;
-    /** 表格组件实例 */
-    reserveCurrent: BooleanConstructor;
+    reserveCurrent: BooleanConstructor; /** 溢出提示组件全局属性 */
     selectedRowKeys: import("vue").PropType<DataKey[]>;
     cacheData: import("vue").PropType<DataItem[]>;
     size: {
@@ -54,7 +57,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     data: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -64,7 +66,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
         type: NumberConstructor;
@@ -91,7 +93,7 @@ declare const _default: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;
@@ -158,6 +160,7 @@ declare const _default: import("vue").DefineComponent<{
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: Sorter) => boolean;
+    /** 设置多选选中值 */
     filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => boolean;
@@ -173,6 +176,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: null;
     };
+    rowKey: {
+        type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     columns: {
         type: import("vue").PropType<Columns>;
         required: boolean;
@@ -194,11 +201,10 @@ declare const _default: import("vue").DefineComponent<{
     };
     emptyProps: {
         type: import("vue").PropType<import("./types").TableEmptyProps>;
-        default: () => null;
+        default: () => null; /** 表格组件实例 */
     };
     rowClickChecked: import("vue").PropType<import("./types").RowClickChecked>;
-    /** 表格组件实例 */
-    reserveCurrent: BooleanConstructor;
+    reserveCurrent: BooleanConstructor; /** 溢出提示组件全局属性 */
     selectedRowKeys: import("vue").PropType<DataKey[]>;
     cacheData: import("vue").PropType<DataItem[]>;
     size: {
@@ -218,7 +224,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     data: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -228,7 +233,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
         type: NumberConstructor;
@@ -255,7 +260,7 @@ declare const _default: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;

package/es/ele-data-table/index.js

@@ -288,6 +288,7 @@ const index = defineComponent({
           class: [
             "ele-data-table",
             { "is-sticky": props.sticky },
+            { "hide-header": !props.showHeader },
             { "hide-bottom-line": !props.bottomLine }
           ],
           currentRowKey: void 0,

package/es/ele-data-table/props.d.ts

@@ -43,7 +43,7 @@ declare const normalizeProps: Omit<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -90,7 +90,7 @@ declare const normalizeProps: Omit<{
         default: boolean;
     };
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
 }, "style">;
 /**
  * 属性
@@ -104,6 +104,10 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: null;
     };
+    rowKey: {
+        type: PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     /** 列配置 */
     columns: {
         type: PropType<Columns>;
@@ -160,7 +164,6 @@ export declare const dataTableProps: {
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: PropType<string | ((row: any) => string) | undefined>;
     data: {
         type: PropType<any[]>;
         default: () => never[];
@@ -170,7 +173,7 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
         type: NumberConstructor;
@@ -197,7 +200,7 @@ export declare const dataTableProps: {
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;

package/es/ele-data-table/props.js

@@ -11,6 +11,10 @@ const dataTableProps = {
     type: Boolean,
     default: null
   },
+  rowKey: {
+    type: [String, Function],
+    required: true
+  },
   /** 列配置 */
   columns: {
     type: Array,

package/es/ele-data-table/style/css-var.scss

@@ -21,15 +21,33 @@
 
 /* 设置单元格圆角 */
 @mixin data-table-radius($radius) {
-  & > .el-table__inner-wrapper > .el-table__header-wrapper {
+  & > .el-table__inner-wrapper > .el-table__header-wrapper,
+  &.el-table--border > .el-table__inner-wrapper::after,
+  &.el-table--border.hide-header
+    > .el-table__inner-wrapper
+    > .el-table__body-wrapper {
     border-top-left-radius: $radius;
     border-top-right-radius: $radius;
   }
 
-  & > .el-table__inner-wrapper > .el-table__footer-wrapper {
+  & > .el-table__inner-wrapper > .el-table__footer-wrapper,
+  &.el-table--border > .el-table__inner-wrapper::before,
+  &.el-table--border:not(.has-footer)
+    > .el-table__inner-wrapper
+    > .el-table__body-wrapper {
     border-bottom-left-radius: $radius;
     border-bottom-right-radius: $radius;
   }
+
+  &.el-table--border::before {
+    border-bottom-left-radius: $radius;
+    border-top-left-radius: $radius;
+  }
+
+  &.el-table--border::after {
+    border-bottom-right-radius: $radius;
+    border-top-right-radius: $radius;
+  }
 }
 
 /* 空状态样式 */