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

package/lib/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/lib/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/lib/ele-watermark/index.cjs

@@ -3,7 +3,6 @@ const vue = require("vue");
 const util = require("./util");
 const props = require("./props");
 const SIZE = 2;
-const GAP = 3;
 const _sfc_main = vue.defineComponent({
   name: "EleWatermark",
   props: props.watermarkProps,
@@ -84,10 +83,9 @@ const _sfc_main = vue.defineComponent({
       if (props2.image || !ctx.measureText) {
         return 64;
       }
-      const content = props2.content;
-      const contents = Array.isArray(content) ? content : [content];
+      const lines = Array.isArray(props2.content) ? props2.content.length : 1;
       const { fontSize } = util.getFont(props2.font);
-      return fontSize * contents.length + (contents.length - 1) * GAP;
+      return fontSize * lines + (lines - 1) * props2.lineGap;
     };
     const getMarkSize = (ctx) => {
       const width = props2.width;
@@ -111,7 +109,7 @@ const _sfc_main = vue.defineComponent({
         ctx.fillText(
           item ?? "",
           drawX,
-          drawY + index2 * (mergedFontSize + GAP * ratio)
+          drawY + index2 * (mergedFontSize + props2.lineGap * ratio)
         );
       });
     };

package/lib/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/lib/ele-watermark/props.cjs

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

package/lib/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/lib/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/lib/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.8-beta.1",
+  "version": "1.1.8-beta.3",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",
@@ -17,61 +17,61 @@
   },
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@ant-design/colors": "^7.0.1",
-    "@babel/types": "^7.23.6",
+    "@ant-design/colors": "^7.0.2",
+    "@babel/types": "^7.23.9",
     "@bytemd/plugin-gfm": "^1.21.0",
     "@bytemd/plugin-highlight": "^1.21.0",
     "@element-plus/icons-vue": "^2.3.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.19",
     "@types/nprogress": "^0.2.3",
-    "@types/sortablejs": "^1.15.7",
-    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^6.17.0",
-    "@vitejs/plugin-vue": "^5.0.2",
+    "@types/sortablejs": "^1.15.8",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
+    "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vue/compiler-sfc": "^3.4.3",
-    "axios": "^1.6.3",
+    "@vue/compiler-sfc": "^3.4.19",
+    "axios": "^1.6.7",
     "bytemd": "^1.21.0",
     "chalk": "^5.3.0",
     "countup.js": "^2.8.0",
     "cropperjs": "^1.6.1",
     "dayjs": "^1.11.10",
-    "echarts": "^5.4.3",
+    "echarts": "^5.5.0",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "^2.4.4",
+    "element-plus": "^2.5.6",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.2",
-    "eslint-plugin-vue": "^9.19.2",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.21.1",
     "esno": "^4.0.0",
     "execa": "^8.0.1",
-    "github-markdown-css": "^5.5.0",
+    "github-markdown-css": "^5.5.1",
     "highlight.js": "^11.9.0",
     "jsbarcode": "^3.11.6",
     "nprogress": "^0.2.0",
     "p-limit": "^5.0.0",
     "pinia": "^2.1.7",
-    "postcss": "^8.4.32",
-    "prettier": "^3.1.1",
+    "postcss": "^8.4.35",
+    "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "sass": "^1.69.6",
-    "sortablejs": "^1.15.1",
+    "sass": "^1.71.0",
+    "sortablejs": "^1.15.2",
     "tinymce": "^5.10.9",
     "typescript": "^5.3.3",
     "unplugin-vue-components": "^0.26.0",
-    "vite": "^5.0.10",
-    "vite-plugin-dts": "^3.7.0",
-    "vue": "^3.4.3",
-    "vue-echarts": "^6.6.8",
-    "vue-eslint-parser": "^9.3.2",
-    "vue-i18n": "^9.8.0",
+    "vite": "^5.1.3",
+    "vite-plugin-dts": "^3.7.2",
+    "vue": "^3.4.19",
+    "vue-echarts": "^6.6.9",
+    "vue-eslint-parser": "^9.4.2",
+    "vue-i18n": "^9.9.1",
     "vue-router": "^4.2.5",
     "vue-tsc": "^1.8.27",
     "vuedraggable": "^4.1.0",
-    "xgplayer": "^3.0.11",
-    "xgplayer-hls": "^3.0.11",
-    "xgplayer-music": "^3.0.11",
+    "xgplayer": "^3.0.13",
+    "xgplayer-hls": "^3.0.13",
+    "xgplayer-music": "^3.0.13",
     "xlsx": "^0.18.5"
   },
   "main": "lib/index.cjs",
@@ -164,6 +164,9 @@
       ],
       "require": "./lib/*.cjs"
     },
+    "./typings/*": {
+      "types": "./typings/*.d.ts"
+    },
     "./*": "./*"
   },
   "keywords": [