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

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

@@ -41,7 +41,7 @@
   }
 }
 
-/* 虚拟表格单元格 */
+/* 虚拟表格全部行单元格 */
 @mixin virtual-table-td {
   @include virtual-table-tr {
     & > .ele-table-td {
@@ -50,31 +50,53 @@
   }
 }
 
-/* 虚拟表格圆角样式 */
+/* 虚拟表格单元格间距 */
+@mixin virtual-table-padding($padding) {
+  @include virtual-table-td {
+    padding: $padding;
+    padding-right: 0;
+    padding-left: 0;
+
+    & > .ele-table-cell {
+      padding: $padding;
+      padding-bottom: 0;
+      padding-top: 0;
+    }
+  }
+}
+
+/* 虚拟表格圆角 */
 @mixin virtual-table-radius($radius) {
-  & > .el-table-v2 > .el-table-v2__main > .el-table-v2__header-wrapper {
+  & > .el-table-v2 > .el-table-v2__main > .el-table-v2__header-wrapper,
+  &.is-border > .el-table-v2::after,
+  &.is-border.hide-header
+    > .el-table-v2
+    > .el-table-v2__main
+    > .el-table-v2__body
+    > div:not(.el-virtual-scrollbar) {
     border-top-left-radius: $radius;
     border-top-right-radius: $radius;
   }
 
-  & > .el-table-v2 > .el-table-v2__footer {
+  & > .el-table-v2 > .el-table-v2__footer,
+  &.is-border > .el-table-v2::before,
+  &.is-border:not(.has-footer)
+    > .el-table-v2
+    > .el-table-v2__main
+    > .el-table-v2__body
+    > div:not(.el-virtual-scrollbar) {
     border-bottom-left-radius: $radius;
     border-bottom-right-radius: $radius;
   }
-}
 
-/* 设置单元格间距 */
-@mixin virtual-table-padding($padding) {
-  @include virtual-table-td {
-    padding: $padding;
-    padding-left: 0;
-    padding-right: 0;
+  &.is-border::before {
+    border-bottom-left-radius: $radius;
+    border-top-left-radius: $radius;
+  }
 
-    & > .ele-table-cell {
-      padding: $padding;
-      padding-top: 0;
-      padding-bottom: 0;
-    }
+  &.is-border::after {
+    border-bottom-right-radius: $radius;
+    border-top-right-radius: $radius;
   }
 }
 

package/es/ele-virtual-table/style/index.scss

@@ -22,8 +22,9 @@
   }
 
   & > .el-table-v2 {
-    position: static;
+    font-size: eleVar('table', 'font-size');
     box-sizing: border-box;
+    position: static;
 
     & > .el-table-v2__main,
     & > .el-table-v2__footer {
@@ -345,23 +346,38 @@
     &::before,
     &::after {
       position: absolute;
+      box-sizing: border-box;
+      pointer-events: none;
       z-index: 5;
     }
   }
 
-  & > .el-table-v2 {
+  & > .el-table-v2::before,
+  & > .el-table-v2::after {
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: calc(1px + #{eleVar('table', 'radius')});
+  }
+
+  & > .el-table-v2::before {
+    content: '';
+    bottom: 0;
+    border-bottom: 1px solid eleVar('table', 'border-color');
+  }
+
+  &.is-border > .el-table-v2::after,
+  &.hide-header > .el-table-v2::after {
+    content: '';
+    top: 0;
+    border-top: 1px solid eleVar('table', 'border-color');
+  }
+
+  &.is-border > .el-table-v2 {
     &::before,
     &::after {
-      left: 0;
-      right: 0;
-      height: 0;
-      width: 100%;
-      border-top: 1px solid eleVar('table', 'border-color');
-    }
-
-    &::before {
-      content: '';
-      bottom: 0;
+      border-right: 1px solid transparent;
+      border-left: 1px solid transparent;
     }
   }
 
@@ -370,12 +386,6 @@
     display: none;
   }
 
-  &.hide-header > .el-table-v2::after,
-  &.is-border > .el-table-v2::after {
-    content: '';
-    top: 0;
-  }
-
   /* 全边框 */
   &.is-border {
     &::before,
@@ -383,17 +393,20 @@
       content: '';
       top: 0;
       bottom: 0;
-      width: 0;
       height: 100%;
-      border-left: 1px solid eleVar('table', 'border-color');
+      width: calc(1px + #{eleVar('table', 'radius')});
+      border-bottom: 1px solid transparent;
+      border-top: 1px solid transparent;
     }
 
     &::before {
       left: 0;
+      border-left: 1px solid eleVar('table', 'border-color');
     }
 
     &::after {
       right: 0;
+      border-right: 1px solid eleVar('table', 'border-color');
     }
 
     @include virtual-table-td {
@@ -407,30 +420,28 @@
 
   /* 隐藏表头 */
   &.hide-header > .el-table-v2 {
-    & > .el-table-v2__table > .el-table-v2__header-wrapper {
+    & > .el-table-v2__main > .el-table-v2__header-wrapper {
       display: none;
     }
   }
 
   /* 粘性表头 */
-  &.is-sticky > .el-table-v2 > .el-table-v2__main {
-    & > .el-table-v2__header-wrapper {
+  &.is-sticky > .el-table-v2 {
+    & > .el-table-v2__main > .el-table-v2__header-wrapper {
       position: sticky;
       top: eleVar('table', 'sticky-top');
     }
   }
 
   /* 圆角 */
-  &:not(.is-border) {
-    @include virtual-table-radius(eleVar('table', 'radius'));
+  @include virtual-table-radius(eleVar('table', 'radius'));
 
-    &.is-large {
-      @include virtual-table-radius(eleVar('table', 'lg-radius'));
-    }
+  &.is-large {
+    @include virtual-table-radius(eleVar('table', 'lg-radius'));
+  }
 
-    &.is-small {
-      @include virtual-table-radius(eleVar('table', 'sm-radius'));
-    }
+  &.is-small {
+    @include virtual-table-radius(eleVar('table', 'sm-radius'));
   }
 
   /* 大型尺寸 */

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

@@ -9,6 +9,10 @@ declare const _default: import("vue").DefineComponent<{
     font: import("vue").PropType<import("./types").WatermarkFont>;
     gap: import("vue").PropType<import("./types").WatermarkGap>;
     offset: import("vue").PropType<import("./types").WatermarkOffset>;
+    lineGap: {
+        type: NumberConstructor;
+        default: number;
+    };
     customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     fixed: BooleanConstructor;
     disabled: BooleanConstructor;
@@ -27,10 +31,15 @@ declare const _default: import("vue").DefineComponent<{
     font: import("vue").PropType<import("./types").WatermarkFont>;
     gap: import("vue").PropType<import("./types").WatermarkGap>;
     offset: import("vue").PropType<import("./types").WatermarkOffset>;
+    lineGap: {
+        type: NumberConstructor;
+        default: number;
+    };
     customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     fixed: BooleanConstructor;
     disabled: BooleanConstructor;
 }>>, {
+    lineGap: number;
     fixed: boolean;
     disabled: boolean;
 }, {}>;

package/es/ele-watermark/index.js

@@ -2,7 +2,6 @@ import { defineComponent, nextTick, ref, onMounted, watch, openBlock, createElem
 import { useMutation, getFont, getPixelRatio, getGap, rotateWatermark, joinStyle } from "./util";
 import { watermarkProps } from "./props";
 const SIZE = 2;
-const GAP = 3;
 const _sfc_main = defineComponent({
   name: "EleWatermark",
   props: watermarkProps,
@@ -83,10 +82,9 @@ const _sfc_main = defineComponent({
       if (props.image || !ctx.measureText) {
         return 64;
       }
-      const content = props.content;
-      const contents = Array.isArray(content) ? content : [content];
+      const lines = Array.isArray(props.content) ? props.content.length : 1;
       const { fontSize } = getFont(props.font);
-      return fontSize * contents.length + (contents.length - 1) * GAP;
+      return fontSize * lines + (lines - 1) * props.lineGap;
     };
     const getMarkSize = (ctx) => {
       const width = props.width;
@@ -110,7 +108,7 @@ const _sfc_main = defineComponent({
         ctx.fillText(
           item ?? "",
           drawX,
-          drawY + index2 * (mergedFontSize + GAP * ratio)
+          drawY + index2 * (mergedFontSize + props.lineGap * ratio)
         );
       });
     };

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

@@ -19,6 +19,11 @@ export declare const watermarkProps: {
     gap: PropType<WatermarkGap>;
     /** 距离左上角的偏移量 */
     offset: PropType<WatermarkOffset>;
+    /** 多行水印的行间距 */
+    lineGap: {
+        type: NumberConstructor;
+        default: number;
+    };
     /** 自定义样式 */
     customStyle: PropType<Partial<import("vue").CSSProperties>>;
     /** 是否使用固定定位 */

package/es/ele-watermark/props.js

@@ -17,6 +17,11 @@ const watermarkProps = {
   gap: Array,
   /** 距离左上角的偏移量 */
   offset: Array,
+  /** 多行水印的行间距 */
+  lineGap: {
+    type: Number,
+    default: 3
+  },
   /** 自定义样式 */
   customStyle: Object,
   /** 是否使用固定定位 */

package/es/style/themes/default.scss

@@ -154,7 +154,9 @@ $ele: map.deep-merge(
     ),
     'card': (
       // 卡片标题
+      'padding': 18px,
       'bg': elVar('bg-color'),
+      'border': 1px solid elVar('border-color', 'light'),
       'radius': elVar('border-radius', 'base'),
       'shadow': elVar('box-shadow', 'lighter'),
       'hover-shadow': (
@@ -162,13 +164,13 @@ $ele: map.deep-merge(
         0 3px 6px 0 rgba(0, 0, 0, 0.12),
         0 5px 12px 4px rgba(0, 0, 0, 0.09)
       ),
-      'header-padding': 14px 24px,
+      'header-padding': 14px 22px,
       'header-color': elVar('text-color', 'primary'),
       'header-font-size': elVar('font-size', 'medium'),
       'header-line-height': 24px,
       'header-font-weight': normal,
       'header-border': 1px solid elVar('border-color', 'light'),
-      'footer-padding': 14px 24px,
+      'footer-padding': 14px 22px,
       'footer-border': 1px solid elVar('border-color', 'light')
     ),
     'check-card': (
@@ -640,7 +642,7 @@ $ele: map.deep-merge(
       'radius': 0,
       'color': elVar('text-color', 'regular'),
       'border-color': elVar('border-color', 'light'),
-      'font-szie': elVar('font-size', 'base'),
+      'font-size': elVar('font-size', 'base'),
       'line-height': 24px,
       'padding': 9px 12px,
       'th-color': elVar('text-color', 'primary'),
@@ -1182,7 +1184,8 @@ $ele: map.deep-merge(
     ),
     'input': (
       // 输入框
-      'padding': 0 10px,
+      'padding-left': 10px,
+      'padding-right': 10px,
       'bg': transparent,
       'border': 1px solid elVar('border-color'),
       'radius': elVar('border-radius', 'base'),
@@ -1231,15 +1234,18 @@ $ele: map.deep-merge(
     ),
     'input-sm': (
       // 输入框小尺寸
-      'padding': 0 8px
+      'padding-left': 8px,
+      'padding-right': 8px
     ),
     'input-lg': (
       // 输入框大尺寸
-      'padding': 0 12px
+      'padding-left': 12px,
+      'padding-right': 12px
     ),
     'textarea': (
       // 文本域
-      'padding': 4px 10px,
+      'padding-top': 4px,
+      'padding-bottom': 4px,
       'count-bg': elVar('bg-color'),
       'count-padding': 0,
       'count-right': 12px,
@@ -1247,11 +1253,13 @@ $ele: map.deep-merge(
     ),
     'textarea-sm': (
       // 文本域小尺寸
-      'padding': 2px 8px
+      'padding-top': 2px,
+      'padding-bottom': 2px
     ),
     'textarea-lg': (
       // 文本域大尺寸
-      'padding': 8px 12px
+      'padding-top': 8px,
+      'padding-bottom': 8px
     )
   ),
   $ele

package/es/style/util.scss

@@ -41,6 +41,11 @@
   @return getCssVar($args...);
 }
 
+/* 获取 element 的 css 变量值带默认值 */
+@function elVarDefault($args, $default) {
+  @return getCssVarWithDefault($args, $default);
+}
+
 /* 获取 element 的 css 变量名 */
 @function elVarName($args...) {
   @return getCssVarName($args...);

package/lib/ele-app/el.d.ts

@@ -20,6 +20,7 @@ import type {
   MenuItemProps,
   SubMenuProps,
   MenuItemGroupProps,
+  FormItemProps,
   BadgeProps,
   LinkProps,
   DialogProps,
@@ -43,7 +44,8 @@ import type {
   ElTabs,
   ElImage,
   ElScrollbar,
-  ElTreeV2
+  ElTreeV2,
+  ElFormItem
 } from 'element-plus';
 import type { dropdownProps } from 'element-plus';
 import type { dropdownItemProps } from 'element-plus';
@@ -102,6 +104,8 @@ export type ElSubMenuProps = ComponentProps<SubMenuProps>;
 
 export type ElMenuItemGroupProps = ComponentProps<MenuItemGroupProps>;
 
+export type ElFormItemProps = ComponentProps<FormItemProps>;
+
 export type ElBadgeProps = ComponentProps<BadgeProps>;
 
 export type ElLinkProps = ComponentProps<LinkProps>;
@@ -156,3 +160,5 @@ export type ElImageInstance = InstanceType<typeof ElImage> | null;
 export type ElScrollbarInstance = InstanceType<typeof ElScrollbar> | null;
 
 export type ElTreeV2Instance = InstanceType<typeof ElTreeV2> | null;
+
+export type ElFormItemInstance = InstanceType<typeof ElFormItem> | null;

package/lib/ele-app/style/overwrite/cascader/index.scss

@@ -23,7 +23,8 @@
     border-radius: eleVar('cascader', 'item-radius');
     transition: (color $ele-transition, background-color $ele-transition);
 
-    & > .el-checkbox {
+    & > .el-checkbox,
+    & > .el-radio {
       margin-right: 8px;
     }
 

package/lib/ele-app/style/overwrite/input/css-var.scss

@@ -4,16 +4,19 @@
 @mixin set-el-input-var($var) {
   .el-input,
   .el-textarea,
+  .el-select,
   .el-range-editor {
     @include set-ele-var('input', $var);
     @include set-ele-var('input-error', $var);
   }
 
-  .el-input--small {
+  .el-input--small,
+  .el-select--small {
     @include set-ele-var('input-sm', $var);
   }
 
-  .el-input--large {
+  .el-input--large,
+  .el-select--large {
     @include set-ele-var('input-lg', $var);
   }