yuang-framework-ui-pc 1.1.90 → 1.1.92

package/es/utils/resolvers.d.ts

@@ -12,7 +12,7 @@ export interface EleAdminResolverOptions {
     importStyle?: boolean | 'css' | 'sass';
 }
 /**
- * 按需加载插件（修复依赖组件解析问题 + 路径undefined问题）
+ * 按需加载插件（彻底修复undefined路径问题）
  * @param options 参数
  */
 export declare function EleAdminResolver(options?: EleAdminResolverOptions): ComponentResolver;

package/es/utils/resolvers.js

@@ -1,7 +1,8 @@
 function getSideEffects(path, options) {
+  if (!path) return void 0;
   const importStyle = options == null ? void 0 : options.importStyle;
   if (!importStyle) {
-    return;
+    return void 0;
   }
   if (importStyle === "css") {
     return `${path}/style/css`;
@@ -9,16 +10,15 @@ function getSideEffects(path, options) {
   return `${path}/style/index`;
 }
 function getStylePath(namePath, packageName, path = "/es") {
-  if (!path || path === "/es/core" || path === "/lib/core") {
+  const safePath = path || "/es";
+  if (["", "/es/core", "/lib/core"].includes(safePath)) {
     return `${packageName}/es/${namePath}`;
   }
-  return `${packageName}${path}/${namePath}`;
+  const finalPath = safePath.startsWith("/") ? safePath : `/${safePath}`;
+  return `${packageName}${finalPath}/${namePath}`;
 }
 const componentDependencyMap = {
   YuFrameworkAttachmentUpload: ["EleUploadList"]
-  // 可继续添加其他依赖：
-  // EleTable: ['EleTableColumn'],
-  // EleForm: ['EleFormItem', 'EleInput']
 };
 const allNeedResolveComponents = /* @__PURE__ */ new Set();
 Object.keys(componentDependencyMap).forEach((parent) => allNeedResolveComponents.add(parent));
@@ -28,23 +28,28 @@ Object.values(componentDependencyMap).forEach((children) => {
 function generateComponentResolveConfig(name, options) {
   const { path = "/es", exclude = [] } = options || {};
   const packageName = "yuang-framework-ui-pc";
-  const namePath = name.replace(/([A-Z])/g, " $1").trim().split(" ").join("-").toLowerCase();
+  const namePath = name.replace(/([A-Z])/g, " $1").trim().split(" ").filter(Boolean).join("-").toLowerCase() || name.toLowerCase();
   const stylePath = getStylePath(namePath, packageName, path);
-  if (!path || path === "/es/core" || path === "/lib/core") {
-    return {
-      name,
-      from: `${packageName}${path}`,
-      // path已有默认值，无需??兜底
-      sideEffects: getSideEffects(stylePath, options)
-    };
+  let fromPath = "";
+  if (["", "/es/core", "/lib/core"].includes(path)) {
+    fromPath = `${packageName}${path || "/es"}`;
   } else {
-    return {
-      name,
-      // 关键修复：补充name字段，符合解析配置规范
-      from: `${packageName}${path}/${namePath}/index`,
-      sideEffects: getSideEffects(stylePath, options)
-    };
+    fromPath = `${packageName}${path.startsWith("/") ? path : "/" + path}/${namePath}/index`;
   }
+  fromPath = fromPath.replace("undefined", "").replace(/\/+/g, "/");
+  if (!fromPath || fromPath === packageName) {
+    fromPath = `${packageName}/es/${namePath}`;
+  }
+  const config = {
+    name: name || "",
+    from: fromPath,
+    sideEffects: getSideEffects(stylePath, options)
+  };
+  if (config.from.includes("undefined") || !config.from) {
+    console.error(`[配置修复] 组件${name}的from路径异常，强制兜底为: ${packageName}/es/${namePath}`);
+    config.from = `${packageName}/es/${namePath}`;
+  }
+  return config;
 }
 function EleAdminResolver(options = { path: "/es", exclude: [], importStyle: true }) {
   return {
@@ -52,16 +57,20 @@ function EleAdminResolver(options = { path: "/es", exclude: [], importStyle: tru
     resolve: (name) => {
       const { exclude = [] } = options;
       const isMatch = /^(Ele|Yu)/.test(name) && !exclude.includes(name) && allNeedResolveComponents.has(name);
-      console.log(`按需加载插件: ${name}，是否匹配：${isMatch}`);
+      console.log(`[匹配校验] 组件名: ${name}，是否匹配: ${isMatch}`);
       if (isMatch) {
         const currentConfig = generateComponentResolveConfig(name, options);
+        if (currentConfig.from.includes("undefined")) {
+          console.error(`[当前组件错误] ${name} 的from路径异常: ${currentConfig.from}`);
+        }
         const dependencyList = componentDependencyMap[name];
         if (dependencyList && dependencyList.length) {
-          const dependencyConfigs = dependencyList.map(
-            (depName) => generateComponentResolveConfig(depName, options)
-          );
-          return [currentConfig, ...dependencyConfigs];
+          const dependencyConfigs = dependencyList.map((depName) => generateComponentResolveConfig(depName, options)).filter((config) => !!config && !!config.from);
+          const allConfigs = [currentConfig, ...dependencyConfigs].filter(Boolean);
+          console.log(`[返回配置] 组件${name}的解析配置:`, JSON.stringify(allConfigs));
+          return allConfigs;
         }
+        console.log(`[返回配置] 组件${name}的解析配置:`, JSON.stringify(currentConfig));
         return currentConfig;
       }
       return void 0;

package/lib/utils/resolvers.cjs

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 function getSideEffects(path, options) {
+  if (!path) return void 0;
   const importStyle = options == null ? void 0 : options.importStyle;
   if (!importStyle) {
-    return;
+    return void 0;
   }
   if (importStyle === "css") {
     return `${path}/style/css`;
@@ -11,16 +12,15 @@ function getSideEffects(path, options) {
   return `${path}/style/index`;
 }
 function getStylePath(namePath, packageName, path = "/es") {
-  if (!path || path === "/es/core" || path === "/lib/core") {
+  const safePath = path || "/es";
+  if (["", "/es/core", "/lib/core"].includes(safePath)) {
     return `${packageName}/es/${namePath}`;
   }
-  return `${packageName}${path}/${namePath}`;
+  const finalPath = safePath.startsWith("/") ? safePath : `/${safePath}`;
+  return `${packageName}${finalPath}/${namePath}`;
 }
 const componentDependencyMap = {
   YuFrameworkAttachmentUpload: ["EleUploadList"]
-  // 可继续添加其他依赖：
-  // EleTable: ['EleTableColumn'],
-  // EleForm: ['EleFormItem', 'EleInput']
 };
 const allNeedResolveComponents = /* @__PURE__ */ new Set();
 Object.keys(componentDependencyMap).forEach((parent) => allNeedResolveComponents.add(parent));
@@ -30,23 +30,28 @@ Object.values(componentDependencyMap).forEach((children) => {
 function generateComponentResolveConfig(name, options) {
   const { path = "/es", exclude = [] } = options || {};
   const packageName = "yuang-framework-ui-pc";
-  const namePath = name.replace(/([A-Z])/g, " $1").trim().split(" ").join("-").toLowerCase();
+  const namePath = name.replace(/([A-Z])/g, " $1").trim().split(" ").filter(Boolean).join("-").toLowerCase() || name.toLowerCase();
   const stylePath = getStylePath(namePath, packageName, path);
-  if (!path || path === "/es/core" || path === "/lib/core") {
-    return {
-      name,
-      from: `${packageName}${path}`,
-      // path已有默认值，无需??兜底
-      sideEffects: getSideEffects(stylePath, options)
-    };
+  let fromPath = "";
+  if (["", "/es/core", "/lib/core"].includes(path)) {
+    fromPath = `${packageName}${path || "/es"}`;
   } else {
-    return {
-      name,
-      // 关键修复：补充name字段，符合解析配置规范
-      from: `${packageName}${path}/${namePath}/index`,
-      sideEffects: getSideEffects(stylePath, options)
-    };
+    fromPath = `${packageName}${path.startsWith("/") ? path : "/" + path}/${namePath}/index`;
   }
+  fromPath = fromPath.replace("undefined", "").replace(/\/+/g, "/");
+  if (!fromPath || fromPath === packageName) {
+    fromPath = `${packageName}/es/${namePath}`;
+  }
+  const config = {
+    name: name || "",
+    from: fromPath,
+    sideEffects: getSideEffects(stylePath, options)
+  };
+  if (config.from.includes("undefined") || !config.from) {
+    console.error(`[配置修复] 组件${name}的from路径异常，强制兜底为: ${packageName}/es/${namePath}`);
+    config.from = `${packageName}/es/${namePath}`;
+  }
+  return config;
 }
 function EleAdminResolver(options = { path: "/es", exclude: [], importStyle: true }) {
   return {
@@ -54,16 +59,20 @@ function EleAdminResolver(options = { path: "/es", exclude: [], importStyle: tru
     resolve: (name) => {
       const { exclude = [] } = options;
       const isMatch = /^(Ele|Yu)/.test(name) && !exclude.includes(name) && allNeedResolveComponents.has(name);
-      console.log(`按需加载插件: ${name}，是否匹配：${isMatch}`);
+      console.log(`[匹配校验] 组件名: ${name}，是否匹配: ${isMatch}`);
       if (isMatch) {
         const currentConfig = generateComponentResolveConfig(name, options);
+        if (currentConfig.from.includes("undefined")) {
+          console.error(`[当前组件错误] ${name} 的from路径异常: ${currentConfig.from}`);
+        }
         const dependencyList = componentDependencyMap[name];
         if (dependencyList && dependencyList.length) {
-          const dependencyConfigs = dependencyList.map(
-            (depName) => generateComponentResolveConfig(depName, options)
-          );
-          return [currentConfig, ...dependencyConfigs];
+          const dependencyConfigs = dependencyList.map((depName) => generateComponentResolveConfig(depName, options)).filter((config) => !!config && !!config.from);
+          const allConfigs = [currentConfig, ...dependencyConfigs].filter(Boolean);
+          console.log(`[返回配置] 组件${name}的解析配置:`, JSON.stringify(allConfigs));
+          return allConfigs;
         }
+        console.log(`[返回配置] 组件${name}的解析配置:`, JSON.stringify(currentConfig));
         return currentConfig;
       }
       return void 0;

package/lib/utils/resolvers.d.ts

@@ -12,7 +12,7 @@ export interface EleAdminResolverOptions {
     importStyle?: boolean | 'css' | 'sass';
 }
 /**
- * 按需加载插件（修复依赖组件解析问题 + 路径undefined问题）
+ * 按需加载插件（彻底修复undefined路径问题）
  * @param options 参数
  */
 export declare function EleAdminResolver(options?: EleAdminResolverOptions): ComponentResolver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-pc",
-  "version": "1.1.90",
+  "version": "1.1.92",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts --mode dev",