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

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`;
+  }
+  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}`,
+          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.8",
   "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');
-}