ele-admin-plus 1.1.9-beta.1 → 1.1.9-beta.10

package/lib/lang/zh_CN.d.ts

@@ -1,4 +1,4 @@
-/** 简体中文 */
-import type { EleLocale } from '../ele-config-provider/types';
+import { EleLocale } from '../ele-config-provider/types';
+
 declare const localeValues: EleLocale;
 export default localeValues;

package/lib/lang/zh_TW.cjs

@@ -27,13 +27,16 @@ const localeValues = {
     title: "選擇位置",
     placeholder: "輸入關鍵字蒐索",
     message: "請點擊清單選中位置",
-    ok: "確認"
+    ok: "確認",
+    clickMessage: "請點擊地圖選中位置"
   },
   table: {
     refresh: "重繪",
     sizes: "密度",
     columns: "列設定",
     maximized: "全屏",
+    export: "匯出",
+    print: "打印",
     sizeLarge: "寬鬆",
     sizeDefault: "中等",
     sizeSmall: "緊湊",
@@ -41,7 +44,16 @@ const localeValues = {
     columnReset: "重置",
     columnUntitled: "無標題",
     columnFixedLeft: "固定在左側",
-    columnFixedRight: "固定在右側"
+    columnFixedRight: "固定在右側",
+    exportOk: "確認",
+    exportCancel: "取消",
+    exportFileName: "檔名",
+    exportFileNamePlaceholder: "請輸入檔名",
+    exportSelectData: "選擇數據",
+    exportSelectColumn: "選擇字段",
+    exportDataTypePage: "當前頁數據",
+    exportDataTypeSelected: "選中數據",
+    exportDataTypeAll: "全部數據"
   },
   copyable: {
     copy: "複製",

package/lib/lang/zh_TW.d.ts

@@ -1,4 +1,4 @@
-/** 繁体中文 */
-import type { EleLocale } from '../ele-config-provider/types';
+import { EleLocale } from '../ele-config-provider/types';
+
 declare const localeValues: EleLocale;
 export default localeValues;

package/lib/style/index.scss

@@ -1,44 +1,2 @@
-@use '../ele-alert/style/index.scss' as alert;
 @use '../ele-app/style/index.scss' as app;
-@use '../ele-avatar-group/style/index.scss' as avatarGroup;
-@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-check-card/style/index.scss' as checkCard;
-@use '../ele-cropper/style/index.scss' as cropper;
-@use '../ele-dashboard/style/index.scss' as dashboard;
-@use '../ele-data-table/style/index.scss' as dataTable;
-@use '../ele-dot/style/index.scss' as dot;
-@use '../ele-drawer/style/index.scss' as drawer;
-@use '../ele-dropdown/style/index.scss' as dropdown;
-@use '../ele-edit-tag/style/index.scss' as editTag;
-@use '../ele-ellipsis/style/index.scss' as ellipsis;
-@use '../ele-file-list/style/index.scss' as fileList;
-@use '../ele-icon-select/style/index.scss' as iconSelect;
-@use '../ele-loading/style/index.scss' as loading;
-@use '../ele-map-picker/style/index.scss' as mapPicker;
-@use '../ele-menus/style/index.scss' as menus;
-@use '../ele-modal/style/index.scss' as modal;
-@use '../ele-page/style/index.scss' as page;
-@use '../ele-pagination/style/index.scss' as pagination;
-@use '../ele-popconfirm/style/index.scss' as popconfirm;
-@use '../ele-popover/style/index.scss' as popover;
-@use '../ele-printer/style/index.scss' as printer;
-@use '../ele-pro-layout/style/index.scss' as proLayout;
-@use '../ele-pro-table/style/index.scss' as proTable;
-@use '../ele-segmented/style/index.scss' as segmented;
-@use '../ele-split-panel/style/index.scss' as splitPanel;
-@use '../ele-steps/style/index.scss' as steps;
-@use '../ele-tabs/style/index.scss' as tabs;
-@use '../ele-table/style/index.scss' as table;
-@use '../ele-table-select/style/index.scss' as tableSelect;
-@use '../ele-text/style/index.scss' as text;
-@use '../ele-tool/style/index.scss' as tool;
-@use '../ele-toolbar/style/index.scss' as toolbar;
-@use '../ele-tooltip/style/index.scss' as tooltip;
-@use '../ele-tour/style/index.scss' as tour;
-@use '../ele-tree-select/style/index.scss' as treeSelect;
-@use '../ele-upload-list/style/index.scss' as uploadList;
-@use '../ele-virtual-table/style/index.scss' as virtualTable;
+@use './plus.scss' as *;

package/lib/style/plus.scss

@@ -0,0 +1,43 @@
+@use '../ele-alert/style/index.scss' as alert;
+//@use '../ele-app/style/index.scss' as app;
+@use '../ele-avatar-group/style/index.scss' as avatarGroup;
+@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-check-card/style/index.scss' as checkCard;
+@use '../ele-cropper/style/index.scss' as cropper;
+@use '../ele-dashboard/style/index.scss' as dashboard;
+@use '../ele-data-table/style/index.scss' as dataTable;
+@use '../ele-dot/style/index.scss' as dot;
+@use '../ele-drawer/style/index.scss' as drawer;
+@use '../ele-dropdown/style/index.scss' as dropdown;
+@use '../ele-edit-tag/style/index.scss' as editTag;
+@use '../ele-ellipsis/style/index.scss' as ellipsis;
+@use '../ele-file-list/style/index.scss' as fileList;
+@use '../ele-icon-select/style/index.scss' as iconSelect;
+@use '../ele-loading/style/index.scss' as loading;
+@use '../ele-map-picker/style/index.scss' as mapPicker;
+@use '../ele-menus/style/index.scss' as menus;
+@use '../ele-modal/style/index.scss' as modal;
+@use '../ele-page/style/index.scss' as page;
+@use '../ele-pagination/style/index.scss' as pagination;
+@use '../ele-popconfirm/style/index.scss' as popconfirm;
+@use '../ele-printer/style/index.scss' as printer;
+@use '../ele-pro-layout/style/index.scss' as proLayout;
+@use '../ele-pro-table/style/index.scss' as proTable;
+@use '../ele-segmented/style/index.scss' as segmented;
+@use '../ele-split-panel/style/index.scss' as splitPanel;
+@use '../ele-steps/style/index.scss' as steps;
+@use '../ele-tabs/style/index.scss' as tabs;
+@use '../ele-table/style/index.scss' as table;
+@use '../ele-table-select/style/index.scss' as tableSelect;
+@use '../ele-text/style/index.scss' as text;
+@use '../ele-tool/style/index.scss' as tool;
+@use '../ele-toolbar/style/index.scss' as toolbar;
+@use '../ele-tooltip/style/index.scss' as tooltip;
+@use '../ele-tour/style/index.scss' as tour;
+@use '../ele-tree-select/style/index.scss' as treeSelect;
+@use '../ele-upload-list/style/index.scss' as uploadList;
+@use '../ele-virtual-table/style/index.scss' as virtualTable;

package/lib/style/themes/default.scss

@@ -267,6 +267,9 @@ $ele: map.deep-merge(
     'icon': (
       // 图标选择器
       'header-padding': 0 12px,
+      'search-width': 120px,
+      'search-padding': 8px 0,
+      'search-icon-size': elVar('font-size', 'extra-small'),
       'tab-height': 42px,
       'tab-space': 16px,
       'tab-padding': 0 2px,
@@ -318,7 +321,7 @@ $ele: map.deep-merge(
     ),
     'map': (
       // 地图位置选择
-      'header-padding': 8px 14px
+      'search-padding': 6px 12px
     ),
     'menu': (
       // 菜单
@@ -348,8 +351,8 @@ $ele: map.deep-merge(
     ),
     'menu-popup': (
       // 气泡菜单
-      'min-width': 160px,
-      'max-width': 320px,
+      'min-width': 148px,
+      'max-width': 260px,
       'max-height': calc(100vh - 10px),
       'bg': elVar('bg-color', 'overlay'),
       'radius': elVar('border-radius', 'base'),
@@ -1132,7 +1135,8 @@ $ele: map.deep-merge(
       'year-width': 58px,
       'year-height': 26px,
       'year-radius': 16px,
-      'year-padding': 26px 0,
+      'year-padding': 22px 0,
+      'year-space': 4px 0,
       'month-padding': 22px 0,
       'month-space': 4px 0,
       'end-margin': 3.5px,

package/lib/style/themes/rounded.scss

@@ -62,7 +62,7 @@ $ele-rounded: map.deep-merge(
       'menu-active-line': 0
     ),
     'map': (
-      'header-padding': 4px 14px 12px 14px
+      'search-padding': 0 12px 6px 12px
     ),
     'menu': (
       'arrow-margin': 0 -8px 0 6px,

package/lib/style/themes/theme-util.scss

@@ -16,7 +16,6 @@
 @use '../../ele-page/style/css-var.scss' as *;
 @use '../../ele-pagination/style/css-var.scss' as *;
 @use '../../ele-popconfirm/style/css-var.scss' as *;
-@use '../../ele-popover/style/css-var.scss' as *;
 @use '../../ele-pro-layout/style/css-var.scss' as *;
 @use '../../ele-pro-table/style/css-var.scss' as *;
 @use '../../ele-segmented/style/css-var.scss' as *;
@@ -52,7 +51,6 @@
     @include set-page-var($var);
     @include set-pagination-var($var);
     @include set-popconfirm-var($var);
-    @include set-popover-var($var);
     @include set-layout-var($var);
     @include set-pro-table-var($var);
     @include set-segmented-var($var);

package/lib/utils/core.cjs

@@ -214,9 +214,37 @@ function pick(obj, fields) {
   }
   return result;
 }
+function contentIsEllipsis(el, direction) {
+  if (!el || !el.childNodes.length) {
+    return false;
+  }
+  const range = document.createRange();
+  range.setStart(el, 0);
+  range.setEnd(el, el.childNodes.length);
+  const { width, height } = range.getBoundingClientRect();
+  const floorW = Math.floor(width);
+  const rangeWidth = width - floorW < 1e-3 ? floorW : width;
+  const floorH = Math.floor(height);
+  const rangeHeight = height - floorH < 1e-3 ? floorH : height;
+  const style = getCurrentStyle(el);
+  const top = Number.parseInt(style.paddingTop) || 0;
+  const left = Number.parseInt(style.paddingLeft) || 0;
+  const right = Number.parseInt(style.paddingRight) || 0;
+  const bottom = Number.parseInt(style.paddingBottom) || 0;
+  const horizontalPadding = left + right;
+  const verticalPadding = top + bottom;
+  if (direction === "horizontal") {
+    return rangeWidth + horizontalPadding > el.offsetWidth || el.scrollWidth > el.offsetWidth;
+  }
+  if (direction === "vertical") {
+    return rangeHeight + verticalPadding > el.offsetHeight || el.scrollHeight > el.offsetHeight;
+  }
+  return rangeWidth + horizontalPadding > el.offsetWidth || rangeHeight + verticalPadding > el.offsetHeight || el.scrollWidth > el.offsetWidth;
+}
 exports.assignObject = assignObject;
 exports.bd09ToGcj02 = bd09ToGcj02;
 exports.checkFullscreen = checkFullscreen;
+exports.contentIsEllipsis = contentIsEllipsis;
 exports.debounce = debounce;
 exports.eachTree = eachTree;
 exports.exitFullscreen = exitFullscreen;

package/lib/utils/core.d.ts

@@ -137,3 +137,8 @@ export declare function omit<T extends object, K extends keyof T>(obj: T | null
  * @param fields 摘选的属性
  */
 export declare function pick<T extends object, K extends keyof T>(obj: T, fields: Array<K>): Pick<T, K>;
+/**
+ * 判断元素内容是否溢出省略
+ * @param el 元素节点
+ */
+export declare function contentIsEllipsis(el: HTMLElement, direction?: 'horizontal' | 'vertical'): boolean;

package/lib/utils/menu-util.d.ts

@@ -1,5 +1,6 @@
-import type { RouteRecordRaw, _RouteRecordBase, RouteComponent } from 'vue-router';
-import type { MenuItem } from '../ele-pro-layout/types';
+import { MenuItem } from '../ele-pro-layout/types';
+import { RouteRecordRaw, _RouteRecordBase, RouteComponent } from 'vue-router';
+
 /**
  * 获取路由组件方法
  */

package/lib/utils/message.d.ts

@@ -1,9 +1,10 @@
-import type { AppContext } from 'vue';
-import type { MessageHandler, MessageOptions, MessageParams, MessageFn } from 'element-plus/es/components/message';
+import { MessageHandler, MessageOptions, MessageParams, MessageFn } from 'element-plus/es/components/message';
+import { AppContext } from 'vue';
+
 /**
  * 消息提示对象型参数
  */
-export interface ProMessageOptions extends MessageOptions {
+export interface ProMessageOptions extends Omit<MessageOptions, 'plain'> {
     /** 是否为原始风格 */
     original?: boolean | null;
     /** 是否为简约风格 */

package/lib/utils/resolvers.cjs

@@ -1,34 +1,47 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-function getSideEffects(name, options) {
-  if (!(options == null ? void 0 : options.importStyle)) {
+function getSideEffects(path, options) {
+  const importStyle = options == null ? void 0 : options.importStyle;
+  if (!importStyle) {
     return;
   }
-  const dir = options.path ?? "/es";
-  const packageName = "ele-admin-plus";
-  if (options.importStyle === "css") {
-    return `${packageName}${dir}/${name}/style/css`;
+  if (importStyle === "css") {
+    return `${path}/style/css`;
   }
-  return `${packageName}${dir}/${name}/style/index`;
+  return `${path}/style/index`;
 }
-function kebabCase(value) {
-  return value.replace(/([A-Z])/g, " $1").trim().split(" ").join("-").toLowerCase();
+function getStylePath(namePath, packageName, path) {
+  if (!path) {
+    return `${packageName}/es/${namePath}`;
+  }
+  if (path === "/es/core") {
+    return `${packageName}/es/${namePath}`;
+  }
+  if (path === "/lib/core") {
+    return `${packageName}/lib/${namePath}`;
+  }
+  return `${packageName}${path}/${namePath}`;
 }
-function EleAdminResolver(options = {}) {
+function EleAdminResolver(options) {
   return {
     type: "component",
-    resolve: (key) => {
-      var _a, _b;
-      if (key.match(/^Ele[A-Z]/) && !((_b = (_a = options == null ? void 0 : options.exclude) == null ? void 0 : _a.includes) == null ? void 0 : _b.call(_a, key))) {
+    resolve: (name) => {
+      var _a;
+      const { path, exclude } = options || {};
+      if (name.match(/^Ele[A-Z]/) && !((_a = exclude == null ? void 0 : exclude.includes) == null ? void 0 : _a.call(exclude, name))) {
         const packageName = "ele-admin-plus";
-        const name = kebabCase(key);
-        const dir = options.path ?? "/es";
-        const path = !options.path ? `${packageName}${dir}` : `${packageName}${dir}/${name}`;
-        const importName = options.path ? void 0 : key;
+        const namePath = name.replace(/([A-Z])/g, " $1").trim().split(" ").join("-").toLowerCase();
+        const stylePath = getStylePath(namePath, packageName, path);
+        if (!path || path === "/es/core" || path === "/lib/core") {
+          return {
+            name,
+            from: `${packageName}${path ?? "/es"}`,
+            sideEffects: getSideEffects(stylePath, options)
+          };
+        }
         return {
-          from: path,
-          name: importName,
-          sideEffects: getSideEffects(name, options)
+          from: `${packageName}${path}/${namePath}/index`,
+          sideEffects: getSideEffects(stylePath, options)
         };
       }
     }

package/lib/utils/resolvers.d.ts

@@ -1,11 +1,11 @@
-/** 组件按需加载 */
-import type { ComponentResolver } from 'unplugin-vue-components/types';
+import { ComponentResolver } from 'unplugin-vue-components/types';
+
 /**
  * 参数类型
  */
 export interface EleAdminResolverOptions {
-    /** 可选 '/es'、'/lib'、'', 默认'/es' */
-    path?: string;
+    /** 包路径 */
+    path?: string | '' | '/es' | '/lib' | '/es/core' | '/lib/core';
     /** 排除的组件名称 */
     exclude?: string[];
     /** 是否导入样式 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.9-beta.1",
+  "version": "1.1.9-beta.10",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",
@@ -9,7 +9,8 @@
     "ts2js": "esno scripts/ts2js.ts",
     "lint:eslint": "eslint --cache --max-warnings 0  \"{src,components}/**/*.{vue,js,jsx,ts,tsx}\" --fix",
     "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite/",
-    "clean:lib": "rimraf node_modules"
+    "clean:lib": "rimraf node_modules",
+    "test": "esno scripts/test.ts"
   },
   "peerDependencies": {
     "vue": ">=3.1.0",
@@ -18,20 +19,20 @@
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@ant-design/colors": "^7.0.2",
-    "@babel/types": "^7.23.9",
+    "@babel/types": "^7.24.0",
     "@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.11.20",
+    "@types/node": "^20.12.2",
     "@types/nprogress": "^0.2.3",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vue/compiler-sfc": "^3.4.19",
-    "axios": "^1.6.7",
+    "@vue/compiler-sfc": "^3.4.21",
+    "axios": "^1.6.8",
     "bytemd": "^1.21.0",
     "chalk": "^5.3.0",
     "countup.js": "^2.8.0",
@@ -39,12 +40,12 @@
     "dayjs": "^1.11.10",
     "echarts": "^5.5.0",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "^2.5.6",
+    "element-plus": "^2.6.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.22.0",
-    "esno": "^4.0.0",
+    "eslint-plugin-vue": "^9.24.0",
+    "esno": "^4.7.0",
     "execa": "^8.0.1",
     "github-markdown-css": "^5.5.1",
     "highlight.js": "^11.9.0",
@@ -52,26 +53,26 @@
     "nprogress": "^0.2.0",
     "p-limit": "^5.0.0",
     "pinia": "^2.1.7",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.38",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "sass": "^1.71.1",
+    "sass": "^1.72.0",
     "sortablejs": "^1.15.2",
     "tinymce": "^5.10.9",
-    "typescript": "^5.3.3",
+    "typescript": "5.3.3",
     "unplugin-vue-components": "^0.26.0",
-    "vite": "^5.1.4",
-    "vite-plugin-dts": "^3.7.3",
-    "vue": "^3.4.19",
+    "vite": "^5.2.7",
+    "vite-plugin-dts": "^3.8.1",
+    "vue": "^3.4.21",
     "vue-echarts": "^6.6.9",
     "vue-eslint-parser": "^9.4.2",
-    "vue-i18n": "^9.9.1",
+    "vue-i18n": "^9.10.2",
     "vue-router": "^4.3.0",
-    "vue-tsc": "^1.8.27",
+    "vue-tsc": "^2.0.7",
     "vuedraggable": "^4.1.0",
-    "xgplayer": "^3.0.13",
-    "xgplayer-hls": "^3.0.13",
-    "xgplayer-music": "^3.0.13",
+    "xgplayer": "^3.0.15",
+    "xgplayer-hls": "^3.0.15",
+    "xgplayer-music": "^3.0.15",
     "xlsx": "^0.18.5"
   },
   "main": "lib/index.cjs",
@@ -176,7 +177,7 @@
     "element ui",
     "element plus",
     "admin",
-    "ele-admin"
+    "ele admin"
   ],
   "description": "EleAdminPlus Library",
   "author": "eclouds@foxmail.com",

package/es/ele-popover/style/css-var.scss

@@ -1,8 +0,0 @@
-@use '../../style/util.scss' as *;
-
-/* 气泡卡片主题变量 */
-@mixin set-popover-var($var) {
-  .ele-popover {
-    @include set-ele-var('popover', $var);
-  }
-}

package/es/ele-popover/style/index.scss

@@ -1,27 +0,0 @@
-@use '../../style/themes/default.scss' as *;
-@use '../../style/util.scss' as *;
-@use './css-var.scss' as *;
-
-@include set-popover-var($ele);
-
-.ele-popper.ele-popover {
-  color: eleVar('popover', 'color');
-  font-size: eleVar('popover', 'font-size');
-  line-height: inherit;
-  text-align: left;
-  min-width: 150px;
-  padding: 0;
-}
-
-.ele-popover-content {
-  padding: eleVar('popover', 'padding');
-  box-sizing: border-box;
-}
-
-.ele-popover-title {
-  color: eleVar('popover', 'title-color');
-  font-size: eleVar('popover', 'title-font-size');
-  font-weight: eleVar('popover', 'title-font-weight');
-  padding: eleVar('popover', 'title-padding');
-  border-bottom: eleVar('popover', 'title-border');
-}

package/lib/ele-popover/style/css-var.scss

@@ -1,8 +0,0 @@
-@use '../../style/util.scss' as *;
-
-/* 气泡卡片主题变量 */
-@mixin set-popover-var($var) {
-  .ele-popover {
-    @include set-ele-var('popover', $var);
-  }
-}

package/lib/ele-popover/style/index.scss

@@ -1,27 +0,0 @@
-@use '../../style/themes/default.scss' as *;
-@use '../../style/util.scss' as *;
-@use './css-var.scss' as *;
-
-@include set-popover-var($ele);
-
-.ele-popper.ele-popover {
-  color: eleVar('popover', 'color');
-  font-size: eleVar('popover', 'font-size');
-  line-height: inherit;
-  text-align: left;
-  min-width: 150px;
-  padding: 0;
-}
-
-.ele-popover-content {
-  padding: eleVar('popover', 'padding');
-  box-sizing: border-box;
-}
-
-.ele-popover-title {
-  color: eleVar('popover', 'title-color');
-  font-size: eleVar('popover', 'title-font-size');
-  font-weight: eleVar('popover', 'title-font-weight');
-  padding: eleVar('popover', 'title-padding');
-  border-bottom: eleVar('popover', 'title-border');
-}