From bac08efbea31e1d9cdc82dc5258aa4094cd5015b Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Tue, 31 Mar 2026 10:15:23 +0800
Subject: [PATCH] =?UTF-8?q?refactor(apps/web-antd/package.json):=20?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4echarts=E7=9A=84conflicts=5Fecharts=5Fh5=5F5?=
 =?UTF-8?q?=5F1=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除echarts依赖项中的conflicts_echarts_h5_5_1标签，使其恢复到标准的catalog标签。

catalogs(pnpm-workspace.yaml): 添加conflicts_echarts_catalog配置

在pnpm-workspace.yaml文件中添加conflicts_echarts_catalog配置，用于处理echarts相关的冲突。
---
 apps/web-antd/package.json | 2 +-
 pnpm-workspace.yaml        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
index bf938913f..5bdd89283 100644
--- a/apps/web-antd/package.json
+++ b/apps/web-antd/package.json
@@ -52,7 +52,7 @@
     "axios": "catalog:",
     "cropperjs": "catalog:",
     "dayjs": "catalog:",
-    "echarts": "catalog:conflicts_echarts_h5_5_1",
+    "echarts": "catalog:",
     "lodash-es": "catalog:",
     "motion-v": "catalog:",
     "pinia": "catalog:",
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index c1b4ab2d4..369fe7f13 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -194,3 +194,6 @@ catalog:
   yaml-eslint-parser: ^2.0.0
   zod: ^3.25.76
   zod-defaults: 0.1.3
+catalogs:
+  conflicts_echarts_catalog:
+    echarts: catalog