merge: resolve conflicts with main branch and integrate icons functionality

- Merged main branch changes including new icons functionality
- Preserved Composition API conversions in all affected files
- Integrated icons tab in source pages (English and Chinese)
- Maintained all existing site component modernizations
- Added support for /icons and /icons-en routes in App.vue header handling

Author: Copilot

pnpm-lock.yaml

@@ -1,29 +1,39 @@
 {
   "all": {},
-  "site": {},
+  "site": {
+    "title": "🎨 新图标资源发布，支持可变粗细和多色填充，欢迎使用体验",
+    "type": "primary",
+    "actionUrl": "https://tdesign.tencent.com/icons",
+    "closeable": true
+  },
   "vue": {
-    "title": "🗓 新增单组件的更新日志，进入任意组件页后，点击更新日志按钮即可查看",
+    "title": "🎨 图标新版本 0.4.0 发布，支持可变粗细和多色填充的图标资源，欢迎使用体验",
     "type": "primary",
+    "actionUrl": "https://tdesign.tencent.com/icons",
     "closeable": true
   },
   "react": {
-    "title": "🗓 新增单组件的更新日志，进入任意组件页后，点击更新日志按钮即可查看",
+    "title": "🎨 图标新版本 0.6.0 发布，支持可变粗细和多色填充的图标资源，欢迎使用体验",
     "type": "primary",
+    "actionUrl": "https://tdesign.tencent.com/icons",
     "closeable": true
   },
   "vue-next": {
-    "title": "🗓 新增单组件的更新日志，进入任意组件页后，点击更新日志按钮即可查看",
+    "title": "🎨 图标新版本 0.4.0 发布，支持可变粗细和多色填充的图标资源，欢迎使用体验",
     "type": "primary",
+    "actionUrl": "https://tdesign.tencent.com/icons",
     "closeable": true
   },
   "vue-mobile": {
-    "title": "🗓 新增单组件的更新日志，进入任意组件页后，点击更新日志按钮即可查看",
+    "title": "🎨 图标新版本 0.4.0 发布，支持可变粗细和多色填充的图标资源，欢迎使用体验",
     "type": "primary",
+    "actionUrl": "https://tdesign.tencent.com/icons",
     "closeable": true
   },
   "react-mobile": {
-    "title": "📢 站点接入主题生成器，支持自定义CSS 变量",
+    "title": "🎨 图标新版本 0.6.0 发布，支持可变粗细和多色填充的图标资源，欢迎使用体验",
     "type": "primary",
+    "actionUrl": "https://tdesign.tencent.com/icons",
     "closeable": true
   },
   "miniprogram": {

services/notice.json

@@ -17,7 +17,7 @@
     "markdown-it": "^12.3.2",
     "markdown-it-link-attributes": "^4.0.0",
     "prismjs": "^1.29.0",
-    "tdesign-icons-view": "^0.3.5",
+    "tdesign-icons-view": "~0.4.0",
     "tdesign-icons-vue": "^0.1.4",
     "tdesign-vue": "1.9.8-naruto",
     "three": "0.127.0",

site/package.json

@@ -14,7 +14,7 @@ const route = computed(() => proxy.$route);
 // Computed
 const headerStyle = computed(() => {
   const { name } = route.value;
-  const fixedHeaderList = ['home', 'home-en', 'source', 'source-en', 'trade'];
+  const fixedHeaderList = ['home', 'home-en', 'source', 'source-en', 'trade', 'icons', 'icons-en'];
   if (fixedHeaderList.includes(name)) {
     return {
       position: 'fixed',

site/src/App.vue

@@ -259,14 +259,26 @@
       </div>
     </div>
 
-    <h3>Download Icon</h3>
-    <all-icons />
+    <h3>All Icons</h3>
+    <div
+      style="
+        background: #ecf2fe;
+        display: flex;
+        align-items: center;
+        line-height: 20px;
+        padding: 14px 24px;
+        border-radius: 3px;
+        color: #555a65;
+        margin: 16px 0;
+      "
+    >
+      Visit <a href="/icons-en"> TDesign Icons </a> to view and experience all supported icons.
+    </div>
   </div>
 </template>
 
 <script setup>
 import { ref, onMounted } from 'vue';
-import AllIcons from '@/components/all-icons.vue';
 import { genAnchor } from './utils';
 
 // Template refs

site/src/components/all-icons.vue

@@ -218,14 +218,26 @@
       </div>
     </div>
 
-    <h3>下载 Icon</h3>
-    <all-icons />
+    <h3>全部图标</h3>
+    <div
+      style="
+        background: #ecf2fe;
+        display: flex;
+        align-items: center;
+        line-height: 20px;
+        padding: 14px 24px;
+        border-radius: 3px;
+        color: #555a65;
+        margin: 16px 0;
+      "
+    >
+      打开 <a href="/icons"> TDesign 图标独立站点 </a> 查看全部支持的图标。
+    </div>
   </div>
 </template>
 
 <script setup>
 import { ref, onMounted } from 'vue';
-import AllIcons from '@/components/all-icons.vue';
 import { genAnchor } from './utils';
 
 // Template refs

site/src/pages/design/icon.vue

@@ -196,8 +196,12 @@ onMounted(() => {
     { tab: 'web', name: 'Desktop' },
     { tab: 'mobile', name: 'Mobile' },
     { tab: 'web-chart', name: 'Desktop Chart' },
+    { tab: 'icons', name: 'Icons' },
   ];
-  tabsRef.value.onchange = ({ detail: currentTab }) => (tab.value = currentTab);
+  tabsRef.value.onchange = ({ detail: currentTab }) => {
+    if (currentTab !== 'icons') tab.value = currentTab;
+    else window.open('/icons-en', '_blank');
+  };
   fetch(sourceDownloadUrl)
     .then((res) => res.json())
     .then((res) => {

site/src/pages/design/icon_zh-CN.vue

@@ -194,8 +194,13 @@ onMounted(() => {
     { tab: 'web', name: '桌面端组件库' },
     { tab: 'mobile', name: '移动端组件库' },
     { tab: 'web-chart', name: '桌面端图表库' },
+    { tab: 'icons', name: '图标资源' },
   ];
-  tabsRef.value.onchange = ({ detail: currentTab }) => (tab.value = currentTab);
+  tabsRef.value.onchange = ({ detail: currentTab }) => {
+    if (currentTab !== 'icons') tab.value = currentTab;
+    else window.open('/icons', '_blank');
+  };
+
   fetch(sourceDownloadUrl)
     .then((res) => res.json())
     .then((res) => {

site/src/pages/design/source.vue

@@ -0,0 +1,3 @@
+<template>
+  <td-icons-view />
+</template>