ele-admin-plus 1.1.8-beta.1 → 1.1.8-beta.3

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

@@ -12,6 +12,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<import("../ele-data-table/types").Columns>;
         required: boolean;
@@ -48,7 +52,7 @@ declare const _default: import("vue").DefineComponent<{
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
-        default: boolean; /** 是否是树形数据 */
+        default: boolean;
     };
     className: {
         type: StringConstructor;
@@ -56,7 +60,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[];
@@ -66,9 +69,10 @@ 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;
         default: number;
     };
@@ -93,7 +97,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;
@@ -203,18 +207,18 @@ declare const _default: import("vue").DefineComponent<{
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
-    rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
+    rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean; /** 根节点 */
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
-    /** 根节点 */
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: import("../ele-data-table/types").Sorter) => boolean;
-    filterChange: (_filter: Filter) => 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;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean; /** 表格宽度 */
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -225,6 +229,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<import("../ele-data-table/types").Columns>;
         required: boolean;
@@ -261,7 +269,7 @@ declare const _default: import("vue").DefineComponent<{
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
-        default: boolean; /** 是否是树形数据 */
+        default: boolean;
     };
     className: {
         type: StringConstructor;
@@ -269,7 +277,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[];
@@ -279,9 +286,10 @@ 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;
         default: number;
     };
@@ -306,7 +314,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-virtual-table/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, computed, onActivated, onDeactivated, watch, resolveComponent, openBlock, createElementBlock, normalizeClass, createBlock, mergeProps, createSlots, withCtx, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode, toDisplayString, createVNode } from "vue";
+import { defineComponent, ref, reactive, computed, onActivated, onDeactivated, watch, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, createBlock, mergeProps, createSlots, withCtx, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode, toDisplayString, createVNode } from "vue";
 import { ElTableV2, ElEmpty, useLocale } from "element-plus";
 import { eachTree } from "../utils/core";
 import EleTooltip from "../ele-tooltip/index";
@@ -893,6 +893,19 @@ const _sfc_main = defineComponent({
       },
       { deep: true }
     );
+    watch(
+      () => props.showHeader,
+      (showHeader) => {
+        if (showHeader) {
+          nextTick(() => {
+            const left = tableScrollLeft.value;
+            if (left) {
+              setScrollLeft(left - 1);
+            }
+          });
+        }
+      }
+    );
     return {
       rootRef,
       tableRef,

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

@@ -13,6 +13,10 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: null;
     };
+    rowKey: {
+        type: import("vue").PropType<string | ((row: import("../ele-data-table/types").DataItem) => string) | undefined>;
+        required: boolean;
+    };
     columns: {
         type: import("vue").PropType<import("../ele-data-table/types").Columns>;
         required: boolean;
@@ -57,7 +61,6 @@ export declare const virtualTableProps: {
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     data: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -67,7 +70,7 @@ export declare const virtualTableProps: {
         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;
@@ -94,7 +97,7 @@ export declare const virtualTableProps: {
     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-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': (
@@ -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);
   }