yuang-framework-ui-pc 1.1.93 → 1.1.95

package/es/utils/resolvers.d.ts

@@ -12,7 +12,7 @@ export interface EleAdminResolverOptions {
     importStyle?: boolean | 'css' | 'sass';
 }
 /**
- * 按需加载插件：支持所有 Ele/Yu 开头的组件
+ * 按需加载插件，这里控制打包后的组件按需加载，如果匹配不上，会出现：开发环境组件正常显示，但是生产环境无法解析组件的情况
  * @param options 参数
  */
 export declare function EleAdminResolver(options?: EleAdminResolverOptions): ComponentResolver;

package/es/utils/resolvers.js

@@ -1,69 +1,49 @@
 function getSideEffects(path, options) {
-  if (!path) return void 0;
-  const importStyle = (options == null ? void 0 : options.importStyle) ?? true;
+  const importStyle = options == null ? void 0 : options.importStyle;
   if (!importStyle) {
-    return void 0;
+    return;
   }
-  return importStyle === "css" ? `${path}/style/css` : `${path}/style/index`;
-}
-function getStylePath(namePath, packageName, path = "/es") {
-  const safePath = ["", "/es", "/lib", "/es/core", "/lib/core"].includes(path) ? path : "/es";
-  if (safePath === "/lib/core") {
-    return `${packageName}/lib/${namePath}`;
+  if (importStyle === "css") {
+    return `${path}/style/css`;
   }
-  return `${packageName}/es/${namePath}`;
+  return `${path}/style/index`;
 }
-const componentDependencyMap = {
-  YuFrameworkAttachmentUpload: ["EleUploadList"]
-  // 后续有依赖的组件可继续加：EleTable: ['EleTableColumn']
-};
-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(" ").filter(Boolean).join("-").toLowerCase() || name.toLowerCase();
-  const safePath = path || "/es";
-  let fromPath = "";
-  if (["", "/es/core", "/lib/core"].includes(safePath)) {
-    fromPath = `${packageName}/${safePath === "/lib/core" ? "lib" : "es"}`;
-  } else if (safePath === "/lib") {
-    fromPath = `${packageName}/lib/${namePath}/index`;
-  } else {
-    fromPath = `${packageName}/es/${namePath}/index`;
+function getStylePath(namePath, packageName, path) {
+  if (!path) {
+    return `${packageName}/es/${namePath}`;
   }
-  fromPath = fromPath.replace(/undefined/g, "").replace(/\/+/g, "/").replace(/^\/|\/$/g, "");
-  if (!fromPath || fromPath === packageName) {
-    fromPath = `${packageName}/es/${namePath}`;
+  if (path === "/es/core") {
+    return `${packageName}/es/${namePath}`;
   }
-  const stylePath = getStylePath(namePath, packageName, safePath);
-  const config = {
-    name: name.trim(),
-    // 组件名去空格
-    from: fromPath,
-    // 核心路径（绝对合法）
-    sideEffects: getSideEffects(stylePath, options)
-    // 样式路径（允许undefined）
-  };
-  console.log(`[组件解析] ${name} -> 路径: ${config.from}，样式: ${config.sideEffects}`);
-  return config;
+  if (path === "/lib/core") {
+    return `${packageName}/lib/${namePath}`;
+  }
+  return `${packageName}${path}/${namePath}`;
 }
-function EleAdminResolver(options = { path: "/es", exclude: [], importStyle: true }) {
+function EleAdminResolver(options) {
   return {
     type: "component",
     resolve: (name) => {
-      const { exclude = [] } = options;
-      const isMatch = /^(Ele|Yu)/.test(name) && !exclude.includes(name);
-      console.log(`[匹配校验] 组件名: ${name}，是否匹配: ${isMatch}`);
-      if (!isMatch) return void 0;
-      const currentConfig = generateComponentResolveConfig(name, options);
-      const dependencyList = componentDependencyMap[name];
-      if (dependencyList && dependencyList.length) {
-        const dependencyConfigs = dependencyList.filter((depName) => !exclude.includes(depName)).map((depName) => generateComponentResolveConfig(depName, options));
-        return [currentConfig, ...dependencyConfigs].filter(Boolean);
+      var _a;
+      const { path, exclude } = options || {};
+      const isMatch = /^(Ele|Yu)/.test(name) && !((_a = exclude == null ? void 0 : exclude.includes) == null ? void 0 : _a.call(exclude, name));
+      console.log("按需加载插件:" + name + "，是否匹配：" + isMatch);
+      if (isMatch) {
+        const packageName = "yuang-framework-ui-pc";
+        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: `${packageName}${path}/${namePath}/index`,
+          sideEffects: getSideEffects(stylePath, options)
+        };
       }
-      return currentConfig;
     }
   };
 }

package/lib/utils/resolvers.cjs

@@ -1,71 +1,51 @@
 "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) ?? true;
+  const importStyle = options == null ? void 0 : options.importStyle;
   if (!importStyle) {
-    return void 0;
+    return;
   }
-  return importStyle === "css" ? `${path}/style/css` : `${path}/style/index`;
-}
-function getStylePath(namePath, packageName, path = "/es") {
-  const safePath = ["", "/es", "/lib", "/es/core", "/lib/core"].includes(path) ? path : "/es";
-  if (safePath === "/lib/core") {
-    return `${packageName}/lib/${namePath}`;
+  if (importStyle === "css") {
+    return `${path}/style/css`;
   }
-  return `${packageName}/es/${namePath}`;
+  return `${path}/style/index`;
 }
-const componentDependencyMap = {
-  YuFrameworkAttachmentUpload: ["EleUploadList"]
-  // 后续有依赖的组件可继续加：EleTable: ['EleTableColumn']
-};
-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(" ").filter(Boolean).join("-").toLowerCase() || name.toLowerCase();
-  const safePath = path || "/es";
-  let fromPath = "";
-  if (["", "/es/core", "/lib/core"].includes(safePath)) {
-    fromPath = `${packageName}/${safePath === "/lib/core" ? "lib" : "es"}`;
-  } else if (safePath === "/lib") {
-    fromPath = `${packageName}/lib/${namePath}/index`;
-  } else {
-    fromPath = `${packageName}/es/${namePath}/index`;
+function getStylePath(namePath, packageName, path) {
+  if (!path) {
+    return `${packageName}/es/${namePath}`;
   }
-  fromPath = fromPath.replace(/undefined/g, "").replace(/\/+/g, "/").replace(/^\/|\/$/g, "");
-  if (!fromPath || fromPath === packageName) {
-    fromPath = `${packageName}/es/${namePath}`;
+  if (path === "/es/core") {
+    return `${packageName}/es/${namePath}`;
   }
-  const stylePath = getStylePath(namePath, packageName, safePath);
-  const config = {
-    name: name.trim(),
-    // 组件名去空格
-    from: fromPath,
-    // 核心路径（绝对合法）
-    sideEffects: getSideEffects(stylePath, options)
-    // 样式路径（允许undefined）
-  };
-  console.log(`[组件解析] ${name} -> 路径: ${config.from}，样式: ${config.sideEffects}`);
-  return config;
+  if (path === "/lib/core") {
+    return `${packageName}/lib/${namePath}`;
+  }
+  return `${packageName}${path}/${namePath}`;
 }
-function EleAdminResolver(options = { path: "/es", exclude: [], importStyle: true }) {
+function EleAdminResolver(options) {
   return {
     type: "component",
     resolve: (name) => {
-      const { exclude = [] } = options;
-      const isMatch = /^(Ele|Yu)/.test(name) && !exclude.includes(name);
-      console.log(`[匹配校验] 组件名: ${name}，是否匹配: ${isMatch}`);
-      if (!isMatch) return void 0;
-      const currentConfig = generateComponentResolveConfig(name, options);
-      const dependencyList = componentDependencyMap[name];
-      if (dependencyList && dependencyList.length) {
-        const dependencyConfigs = dependencyList.filter((depName) => !exclude.includes(depName)).map((depName) => generateComponentResolveConfig(depName, options));
-        return [currentConfig, ...dependencyConfigs].filter(Boolean);
+      var _a;
+      const { path, exclude } = options || {};
+      const isMatch = /^(Ele|Yu)/.test(name) && !((_a = exclude == null ? void 0 : exclude.includes) == null ? void 0 : _a.call(exclude, name));
+      console.log("按需加载插件:" + name + "，是否匹配：" + isMatch);
+      if (isMatch) {
+        const packageName = "yuang-framework-ui-pc";
+        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: `${packageName}${path}/${namePath}/index`,
+          sideEffects: getSideEffects(stylePath, options)
+        };
       }
-      return currentConfig;
     }
   };
 }

package/lib/utils/resolvers.d.ts

@@ -12,7 +12,7 @@ export interface EleAdminResolverOptions {
     importStyle?: boolean | 'css' | 'sass';
 }
 /**
- * 按需加载插件：支持所有 Ele/Yu 开头的组件
+ * 按需加载插件，这里控制打包后的组件按需加载，如果匹配不上，会出现：开发环境组件正常显示，但是生产环境无法解析组件的情况
  * @param options 参数
  */
 export declare function EleAdminResolver(options?: EleAdminResolverOptions): ComponentResolver;

package/package.json

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