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

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': (
@@ -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/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.7",
+  "version": "1.1.8-beta.2",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",
@@ -17,21 +17,21 @@
   },
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@ant-design/colors": "^7.0.1",
+    "@ant-design/colors": "^7.0.2",
     "@babel/types": "^7.23.6",
     "@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.6",
     "@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",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
+    "@vitejs/plugin-vue": "^5.0.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vue/compiler-sfc": "^3.4.3",
-    "axios": "^1.6.3",
+    "@vue/compiler-sfc": "^3.4.15",
+    "axios": "^1.6.6",
     "bytemd": "^1.21.0",
     "chalk": "^5.3.0",
     "countup.js": "^2.8.0",
@@ -39,11 +39,11 @@
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "^2.4.4",
+    "element-plus": "^2.5.3",
     "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.20.1",
     "esno": "^4.0.0",
     "execa": "^8.0.1",
     "github-markdown-css": "^5.5.0",
@@ -52,20 +52,20 @@
     "nprogress": "^0.2.0",
     "p-limit": "^5.0.0",
     "pinia": "^2.1.7",
-    "postcss": "^8.4.32",
-    "prettier": "^3.1.1",
+    "postcss": "^8.4.33",
+    "prettier": "^3.2.4",
     "rimraf": "^5.0.5",
-    "sass": "^1.69.6",
-    "sortablejs": "^1.15.1",
+    "sass": "^1.70.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",
+    "vite": "^5.0.12",
+    "vite-plugin-dts": "^3.7.2",
+    "vue": "^3.4.15",
     "vue-echarts": "^6.6.8",
-    "vue-eslint-parser": "^9.3.2",
-    "vue-i18n": "^9.8.0",
+    "vue-eslint-parser": "^9.4.2",
+    "vue-i18n": "^9.9.0",
     "vue-router": "^4.2.5",
     "vue-tsc": "^1.8.27",
     "vuedraggable": "^4.1.0",