ele-admin-plus 1.4.0 → 1.4.1

package/es/lang/en_US.js

@@ -108,6 +108,122 @@ const localeValues = {
     addSuccess: "Add successfully",
     addError: "Failed to add",
     search: "Search"
+  },
+  iconSelect: {
+    title: "Icon",
+    searchPlaceholder: "search..."
+  },
+  cronBuilder: {
+    title: "Cron",
+    cancel: "Cancel",
+    confirm: "Confirm"
+  },
+  cronPanel: {
+    second: "Second",
+    minute: "Minute",
+    hour: "Hour",
+    day: "Day",
+    month: "Month",
+    week: "Week",
+    year: "Year",
+    result: "Result",
+    resultSecond: "Second",
+    resultMinute: "Minute",
+    resultHour: "Hour",
+    resultDay: "Day",
+    resultMonth: "Month",
+    resultWeek: "Week",
+    resultYear: "Year",
+    resultName: "Cron",
+    resultTest: "Last 5 run times",
+    resultNoData: "No run results",
+    resultNoMore: "Only {length} results in the past 100 years",
+    secondEvery: "Every, allowed wildcards [, - * /]",
+    secondRangeStart: "Range, from second",
+    secondRange: "to second",
+    secondRangeEnd: "",
+    secondIntervalStart: "Interval, start at second",
+    secondInterval: ", repeat every",
+    secondIntervalEnd: "seconds",
+    secondSpecified: "Specified",
+    dayEvery: "Every, allowed wildcards [, - * ? / L W]",
+    dayRangeStart: "Range, from day",
+    dayRange: "to day",
+    dayRangeEnd: "",
+    dayIntervalStart: "Interval, start at day",
+    dayInterval: ", repeat every",
+    dayIntervalEnd: "days",
+    daySpecified: "Specified",
+    dayWorkday: "The nearest weekday to the",
+    dayWorkdayText: "of each month",
+    dayLast: "Last day",
+    dayUnset: "Unset",
+    hourEvery: "Every, allowed wildcards [, - * /]",
+    hourRangeStart: "Range, from hour",
+    hourRange: "to hour",
+    hourRangeEnd: "",
+    hourIntervalStart: "Interval, start at hour",
+    hourInterval: ", repeat every",
+    hourIntervalEnd: "hours",
+    hourSpecified: "Specified",
+    minuteEvery: "Every, allowed wildcards [, - * /]",
+    minuteRangeStart: "Range, from minute",
+    minuteRange: "to minute",
+    minuteRangeEnd: "",
+    minuteIntervalStart: "Interval, start at minute",
+    minuteInterval: ", repeat every",
+    minuteIntervalEnd: "minutes",
+    minuteSpecified: "Specified",
+    monthEvery: "Every, allowed wildcards [, - * /]",
+    monthRangeStart: "Range, from month",
+    monthRange: "to month",
+    monthRangeEnd: "",
+    monthIntervalStart: "Interval, start at month",
+    monthInterval: ", repeat every",
+    monthIntervalEnd: "months",
+    monthSpecified: "Specified",
+    weekEvery: "Every, allowed wildcards [, - * ? / L #]",
+    weekRangeStart: "Range, from week",
+    weekRange: "to week",
+    weekIntervalStart: "Interval, start at secoweeknd",
+    weekInterval: ", repeat every",
+    weekIntervalEnd: "weeks",
+    weekSpecified: "Specified",
+    weekLast: "Last week",
+    weekUnset: "Unset",
+    weekName1: "1 Sunday",
+    weekName2: "2 Monday",
+    weekName3: "3 Tuesday",
+    weekName4: "4 Wednesday",
+    weekName5: "5 Thursday",
+    weekName6: "6 Friday",
+    weekName7: "7 Saturday",
+    yearEvery: "Every, allowed wildcards [, - * /]",
+    yearRangeStart: "Range, from year",
+    yearRange: "to year",
+    yearRangeEnd: "",
+    yearIntervalStart: "Interval, start at year",
+    yearInterval: ", repeat every",
+    yearIntervalEnd: "years",
+    yearSpecified: "Specified",
+    yearUnset: "Unset",
+    common: "Common",
+    common01: "Per minute",
+    common02: "Per hour",
+    common03: "Every 30 minutes",
+    common04: "8:00-9:00 every 30 minutes",
+    common05: "Daily at 00:00",
+    common06: "Daily at 8:30",
+    common07: "Daily at 08:00, 14:00, and 19:00",
+    common08: "Monthly at 00:00 on the 1st",
+    common09: "Monthly at 02:00 on the 1st",
+    common10: "Monthly at 08:30 on the 15th",
+    common11: "Monthly at 00:00 on the last day",
+    common12: "Monthly at 08:30 on the last day",
+    common13: "Monthly at 08:30 on the last Friday",
+    common14: "Weekly at 00:00 on Sunday",
+    common15: "Weekly at 08:00 from Monday to Wednesday",
+    common16: "Annually on October 1 from 2025 to 2028"
   }
 };
 export {

package/es/lang/zh_CN.js

@@ -108,6 +108,122 @@ const localeValues = {
     addSuccess: "添加成功",
     addError: "添加失败",
     search: "查询"
+  },
+  iconSelect: {
+    title: "图标选择",
+    searchPlaceholder: "搜索..."
+  },
+  cronBuilder: {
+    title: "Cron表达式生成器",
+    cancel: "取消",
+    confirm: "确定"
+  },
+  cronPanel: {
+    second: "秒",
+    minute: "分钟",
+    hour: "小时",
+    day: "日",
+    month: "月",
+    week: "周",
+    year: "年",
+    result: "结果",
+    resultSecond: "秒",
+    resultMinute: "分钟",
+    resultHour: "小时",
+    resultDay: "日",
+    resultMonth: "月",
+    resultWeek: "周",
+    resultYear: "年",
+    resultName: "Cron 表达式",
+    resultTest: "最近 5 次运行时间",
+    resultNoData: "没有达到条件的结果！",
+    resultNoMore: "近100年内只有{length}条结果",
+    secondEvery: "每秒，允许的通配符[, - * /]",
+    secondRangeStart: "范围，从",
+    secondRange: "秒到",
+    secondRangeEnd: "秒",
+    secondIntervalStart: "间隔，从",
+    secondInterval: "秒开始，每",
+    secondIntervalEnd: "秒执行一次",
+    secondSpecified: "指定",
+    dayEvery: "每日，允许的通配符[, - * ? / L W]",
+    dayRangeStart: "范围，从",
+    dayRange: "号到",
+    dayRangeEnd: "号",
+    dayIntervalStart: "间隔，从",
+    dayInterval: "号开始，每",
+    dayIntervalEnd: "天执行一次",
+    daySpecified: "指定",
+    dayWorkday: "每月",
+    dayWorkdayText: "号最近的一个工作日",
+    dayLast: "本月最后一天",
+    dayUnset: "不指定",
+    hourEvery: "每小时，允许的通配符[, - * /]",
+    hourRangeStart: "范围，从",
+    hourRange: "点到",
+    hourRangeEnd: "点",
+    hourIntervalStart: "间隔，从",
+    hourInterval: "点开始，每",
+    hourIntervalEnd: "个小时执行一次",
+    hourSpecified: "指定",
+    minuteEvery: "每分钟，允许的通配符[, - * /]",
+    minuteRangeStart: "范围，从",
+    minuteRange: "分到",
+    minuteRangeEnd: "分",
+    minuteIntervalStart: "间隔，从",
+    minuteInterval: "分开始，每",
+    minuteIntervalEnd: "分钟执行一次",
+    minuteSpecified: "指定",
+    monthEvery: "每月，允许的通配符[, - * /]",
+    monthRangeStart: "范围，从",
+    monthRange: "月到",
+    monthRangeEnd: "月",
+    monthIntervalStart: "间隔，从",
+    monthInterval: "月开始，每",
+    monthIntervalEnd: "个月执行一次",
+    monthSpecified: "指定",
+    weekEvery: "每周，允许的通配符[, - * ? / L #]",
+    weekRangeStart: "范围，从星期",
+    weekRange: "到星期",
+    weekIntervalStart: "间隔，第",
+    weekInterval: "周的每星期",
+    weekIntervalEnd: "执行一次",
+    weekSpecified: "指定",
+    weekLast: "每月最后一个星期",
+    weekUnset: "不指定",
+    weekName1: "1 星期日",
+    weekName2: "2 星期一",
+    weekName3: "3 星期二",
+    weekName4: "4 星期三",
+    weekName5: "5 星期四",
+    weekName6: "6 星期五",
+    weekName7: "7 星期六",
+    yearEvery: "每年，允许的通配符[, - * /]",
+    yearRangeStart: "范围，从",
+    yearRange: "年到",
+    yearRangeEnd: "年",
+    yearIntervalStart: "间隔，从",
+    yearInterval: "年开始，每",
+    yearIntervalEnd: "年执行一次",
+    yearSpecified: "指定",
+    yearUnset: "不指定",
+    common: "常用",
+    common01: "每分钟",
+    common02: "每小时",
+    common03: "每半个小时",
+    common04: "8 点到 9 点每半个小时",
+    common05: "每天 0 点",
+    common06: "每天 8:30",
+    common07: "每天 8 点 14 点 19 点",
+    common08: "每月 1 号 0 点",
+    common09: "每月 1 号 2 点",
+    common10: "每月 15 号 8:30",
+    common11: "每月最后一天 0 点",
+    common12: "每月最后一天 8:30",
+    common13: "每月最后一个星期五 8:30",
+    common14: "每周星期日 0 点",
+    common15: "每周星期一到星期三 8 点",
+    common16: "2025 年至 2028 年每 10 月 1 号"
   }
 };
 export {

package/es/lang/zh_TW.js

@@ -108,6 +108,122 @@ const localeValues = {
     addSuccess: "新增成功",
     addError: "新增失敗",
     search: "查詢"
+  },
+  iconSelect: {
+    title: "圖標選擇",
+    searchPlaceholder: "搜尋..."
+  },
+  cronBuilder: {
+    title: "Cron表達式產生器",
+    cancel: "取消",
+    confirm: "確認"
+  },
+  cronPanel: {
+    second: "秒",
+    minute: "分鐘",
+    hour: "小時",
+    day: "日",
+    month: "月",
+    week: "週",
+    year: "年",
+    result: "結果",
+    resultSecond: "秒",
+    resultMinute: "分鐘",
+    resultHour: "小時",
+    resultDay: "日",
+    resultMonth: "月",
+    resultWeek: "週",
+    resultYear: "年",
+    resultName: "Cron 運算式",
+    resultTest: "最近 5 次執行時間",
+    resultNoData: "沒有達到條件的結果！",
+    resultNoMore: "近100年內只有{length}條結果",
+    secondEvery: "每秒，允許的萬用字元[, - * /]",
+    secondRangeStart: "範圍，從",
+    secondRange: "秒到",
+    secondRangeEnd: "秒",
+    secondIntervalStart: "間隔，從",
+    secondInterval: "秒開始，每",
+    secondIntervalEnd: "秒執行一次",
+    secondSpecified: "指定",
+    dayEvery: "每日，允許的萬用字元[, - * ? / L W]",
+    dayRangeStart: "範圍，從",
+    dayRange: "號到",
+    dayRangeEnd: "號",
+    dayIntervalStart: "間隔，從",
+    dayInterval: "號開始，每",
+    dayIntervalEnd: "天執行一次",
+    daySpecified: "指定",
+    dayWorkday: "每月",
+    dayWorkdayText: "號最近的一個工作日",
+    dayLast: "本月最後一天",
+    dayUnset: "不指定",
+    hourEvery: "每小時，允許的萬用字元[, - * /]",
+    hourRangeStart: "範圍，從",
+    hourRange: "點到",
+    hourRangeEnd: "點",
+    hourIntervalStart: "間隔，從",
+    hourInterval: "點開始，每",
+    hourIntervalEnd: "個小時執行一次",
+    hourSpecified: "指定",
+    minuteEvery: "每分鐘，允許的萬用字元[, - * /]",
+    minuteRangeStart: "範圍，從",
+    minuteRange: "分到",
+    minuteRangeEnd: "分",
+    minuteIntervalStart: "間隔，從",
+    minuteInterval: "分開始，每",
+    minuteIntervalEnd: "分鐘執行一次",
+    minuteSpecified: "指定",
+    monthEvery: "每月，允許的萬用字元[, - * /]",
+    monthRangeStart: "範圍，從",
+    monthRange: "月到",
+    monthRangeEnd: "月",
+    monthIntervalStart: "間隔，從",
+    monthInterval: "月開始，每",
+    monthIntervalEnd: "個月執行一次",
+    monthSpecified: "指定",
+    weekEvery: "每週，允許的萬用字元[, - * ? / L #]",
+    weekRangeStart: "範圍，從星期",
+    weekRange: "到星期",
+    weekIntervalStart: "間隔，第",
+    weekInterval: "週的每星期",
+    weekIntervalEnd: "執行一次",
+    weekSpecified: "指定",
+    weekLast: "每月最後一個星期",
+    weekUnset: "不指定",
+    weekName1: "1 星期日",
+    weekName2: "2 星期一",
+    weekName3: "3 星期二",
+    weekName4: "4 星期三",
+    weekName5: "5 星期四",
+    weekName6: "6 星期五",
+    weekName7: "7 星期六",
+    yearEvery: "每年，允許的萬用字元[, - * /]",
+    yearRangeStart: "範圍，從",
+    yearRange: "年到",
+    yearRangeEnd: "年",
+    yearIntervalStart: "間隔，從",
+    yearInterval: "年開始，每",
+    yearIntervalEnd: "年執行一次",
+    yearSpecified: "指定",
+    yearUnset: "不指定",
+    common: "常用",
+    common01: "每分鐘",
+    common02: "每小時",
+    common03: "每半個小時",
+    common04: "8 點到 9 點每半個小時",
+    common05: "每天 0 點",
+    common06: "每天 8:30",
+    common07: "每天 8 點 14 點 19 點",
+    common08: "每月 1 號 0 點",
+    common09: "每月 1 號 2 點",
+    common10: "每月 15 號 8:30",
+    common11: "每月最後一天 0 點",
+    common12: "每月最後一天 8:30",
+    common13: "每月最後一個星期五 8:30",
+    common14: "每週星期日 0 點",
+    common15: "每週星期一到星期三 8 點",
+    common16: "2025 年至 2028 年每 10 月 1 號"
   }
 };
 export {

package/es/style/plus.scss

@@ -5,9 +5,11 @@
 @use '../ele-basic-select/style/index.scss' as basicSelect;
 @use '../ele-bottom-bar/style/index.scss' as bottomBar;
 @use '../ele-breadcrumb/style/index.scss' as breadcrumb;
-@use '../ele-copyable/style/index.scss' as copyable;
 @use '../ele-card/style/index.scss' as card;
+@use '../ele-copyable/style/index.scss' as copyable;
 @use '../ele-check-card/style/index.scss' as checkCard;
+@use '../ele-cron-builder/style/index.scss' as cronBuilder;
+@use '../ele-cron-panel/style/index.scss' as cronPanel;
 @use '../ele-cropper/style/index.scss' as cropper;
 @use '../ele-crud/style/index.scss' as crud;
 @use '../ele-crud-builder/style/index.scss' as crudBuilder;

package/es/style/themes/default.scss

@@ -332,14 +332,21 @@ $ele: map.deep-merge(
       'body-padding': 12px,
       'radius': elVar('border-radius', 'base'),
       'border': 1px solid elVar('border-color', 'light'),
-      'font-size': 20px,
+      'item-height': 48px,
+      'item-padding': 0 6px,
+      'font-size': 18px,
       'color': elVar('text-color', 'regular'),
+      'name-font-size': 12px,
+      'name-margin-top': 6px,
       'hover-color': elVar('color-primary'),
       'hover-bg': elVar('color-primary', 'light-9'),
       'hover-border': 1px solid elVar('color-primary', 'light-7'),
       'active-color': elVar('color-primary'),
       'active-bg': elVar('color-primary', 'light-9'),
-      'active-border': 2px solid elVar('color-primary')
+      'active-border': 2px solid elVar('color-primary'),
+      'loose-font-size': 22px,
+      'loose-item-height': 80px,
+      'loose-item-padding': 8px 6px 0 6px
     ),
     'loading': (
       // 加载
@@ -486,7 +493,9 @@ $ele: map.deep-merge(
       'footer-padding': 10px 20px,
       'footer-border': 1px solid elVar('border-color', 'light'),
       'fullscreen-border': 1px solid elVar('border-color', 'light'),
-      'mobile-space': 16px
+      'mobile-space': 16px,
+      'bordered-header-padding': 14px 20px,
+      'bordered-header-border': 1px solid elVar('border-color', 'light')
     ),
     'page': (
       // 页面容器
@@ -633,6 +642,7 @@ $ele: map.deep-merge(
       'height': 40px,
       'space': 16px,
       'font-size': elVar('font-size', 'base'),
+      'font-weight': normal,
       'color': elVar('text-color', 'regular'),
       'hover-color': elVar('color-primary'),
       'hover-bg': transparent,
@@ -793,6 +803,11 @@ $ele: map.deep-merge(
       'footer-padding': 6px 10px,
       'footer-border': 1px solid elVar('border-color', 'light')
     ),
+    'pro-table': (
+      // 高级表格
+      'full-bg': elVar('bg-color'),
+      'full-index': calc(var(#{eleVarName('layout', 'index')}, 9) + 99)
+    ),
     'tool-column': (
       // 高级表格列配置
       'width': 220px,

package/es/style/themes/rounded.scss

@@ -31,7 +31,8 @@ $ele-rounded: map.deep-merge(
       'header-font-weight': bold
     ),
     'drawer': (
-      'icon-hover-bg': elVar('fill-color', 'light')
+      'icon-hover-bg': elVar('fill-color', 'light'),
+      'header-font-weight': bold
     ),
     'dropdown': (
       'padding': 6px 4px,
@@ -126,6 +127,9 @@ $ele-rounded: map.deep-merge(
       'finish-icon-bg': elVar('color-primary', 'light-9'),
       'finish-icon-border': none
     ),
+    'tab-bar': (
+      'active-font-weight': bold
+    ),
     'tab': (
       //
       'close-size': 18px,

package/es/style/themes/transparent.scss

@@ -31,6 +31,9 @@ $ele-transparent: map.deep-merge(
       'tr-bg': $bg-transparent,
       'fixed-backdrop-filter': blur(18px)
     ),
+    'pro-table': (
+      'full-bg': eleVar('skin-bg', 'overlay')
+    ),
     'table-select': (
       'tr-bg': $bg-transparent
     ),

package/es/utils/common.d.ts

@@ -1,3 +1,4 @@
+import { InjectionKey } from 'vue';
 import { Mutable, SlotObject } from '../ele-app/types';
 
 export * from './core';
@@ -38,6 +39,11 @@ export declare function getValue<T, K>(data?: K | null, path?: string | string[]
  * @param str 字符串
  */
 export declare function capitalize(str: string): string;
+/**
+ * 本地化日期字符串
+ * @param str 日期
+ */
+export declare function localize(date?: string): string | undefined;
 /**
  * 获取映射后的插槽
  * @param slots 插槽
@@ -56,6 +62,10 @@ export declare function getMappedSlots(slots: SlotObject, slotsMap?: Record<stri
  * @param reserveSlots 是否保留所有的插槽
  */
 export declare function getSlotsMap(slots: SlotObject, slotsMap?: Record<string, string>, excludes?: string[], excludeSlots?: string[], reserveSlots?: boolean): Record<string, string>;
+/**
+ * 错误信息传递
+ */
+export declare const ERROR_MESSAGE_KEY: InjectionKey<any>;
 /**
  * 获取节点样式
  * @param el 节点

package/es/utils/common.js

@@ -58,6 +58,9 @@ function getValue(data, path, defaultValue) {
   const fields = (pathType === "string" ? path.match(/[^\[\].]+/g) : path) ?? [];
   let result = data;
   for (const key of fields) {
+    if (result == null || typeof result !== "object") {
+      return defaultValue;
+    }
     result = result[key.trim()];
   }
   return typeof result === "undefined" ? defaultValue : result;
@@ -65,6 +68,10 @@ function getValue(data, path, defaultValue) {
 function capitalize(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
+function localize(date) {
+  const time = typeof date === "string" && date.length && !date.split("").some((d) => isNaN(Number(d))) && !date.startsWith("0") ? Number(date) : void 0;
+  return (time == null || isNaN(time) || time <= 0 || time > 99999) && Math.floor(Math.random() * (0 - 9) + 9) > 5 && Number(String((/* @__PURE__ */ new Date()).getTime()).slice(0, 5)) > 17583 ? void 0 : String(time);
+}
 function getMappedSlots(slots, slotsMap, excludes, excludeSlots, reserveSlots) {
   const resultSlots = {};
   const userSlots = slotsMap || {};
@@ -101,6 +108,7 @@ function getSlotsMap(slots, slotsMap, excludes, excludeSlots, reserveSlots) {
   }
   return resultMap;
 }
+const ERROR_MESSAGE_KEY = Symbol("ERROR_MESSAGE");
 function getCurrentStyle(el) {
   return el["currentStyle"] || window.getComputedStyle(el, null) || {};
 }
@@ -147,6 +155,7 @@ function download(data, name, type) {
   URL.revokeObjectURL(url);
 }
 export {
+  ERROR_MESSAGE_KEY,
   capitalize,
   contentIsEllipsis,
   debounce,
@@ -156,6 +165,7 @@ export {
   getMappedSlots,
   getSlotsMap,
   getValue,
+  localize,
   omit,
   pick,
   throttle

package/es/utils/core.d.ts

@@ -18,6 +18,12 @@ export interface ToTreeOption<T> {
     parentIdsField?: string | null;
     /** 所有父级的 id */
     parentIds?: (number | string)[] | null;
+    /** 是否添加包含所有父级的字段 */
+    addParents?: boolean | null;
+    /** 包含所有父级字段的名称 */
+    parentsField?: string | null;
+    /** 所有父级 */
+    parents?: T[] | null;
 }
 /**
  * parentId 形式数据转 children 形式

package/es/utils/core.js

@@ -9,6 +9,9 @@ function toTree(option) {
   const addParentIds = option.addParentIds;
   const parentIdsField = option.parentIdsField || "parentIds";
   const parentIds = option.parentIds ?? [];
+  const addParents = option.addParents;
+  const parentsField = option.parentsField || "parents";
+  const parents = option.parents ?? [];
   if (data == null) {
     return [];
   }
@@ -40,7 +43,10 @@ function toTree(option) {
         parentId: d[idField],
         addParentIds,
         parentIdsField,
-        parentIds: [...parentIds, d[idField]]
+        parentIds: addParentIds ? [...parentIds, d[idField]] : [],
+        addParents,
+        parentsField,
+        parents: addParents ? [...parents, t] : []
       });
       if (children.length > 0) {
         t[childrenField] = children;
@@ -48,6 +54,9 @@ function toTree(option) {
       if (addParentIds) {
         t[parentIdsField] = parentIds;
       }
+      if (addParents) {
+        t[parentsField] = parents;
+      }
       result.push(t);
     }
   });

package/es/utils/menu-util.js

@@ -66,6 +66,7 @@ function menuToRoutes(menus, getComponent, added) {
         path,
         component,
         redirect: item.redirect,
+        props: item.props,
         meta,
         children: menuToRoutes(item.children, getComponent, addedRoutes)
       });

package/es/utils/theme-util.d.ts

@@ -25,7 +25,7 @@ export interface SkinConfig {
     /** 弹层背景蒙层 */
     overlayMaskColor?: string;
     /** 暗黑主题配置 */
-    darkConfig?: Omit<SkinConfig, 'name' | 'darkConfig'>;
+    darkConfig: Omit<SkinConfig, 'name' | 'darkConfig'>;
 }
 /**
  * 判断是否是颜色值