ele-admin-plus 1.1.9-beta.7 → 1.1.9-beta.9

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,
@@ -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'),

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/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

@@ -4,8 +4,8 @@ import type { 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.7",
+  "version": "1.1.9-beta.9",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",

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');
-}