Merge branch 'main' into pages

Author: xiaoxian521

Diff for: CHANGELOG.en_US.md

@@ -1,3 +1,32 @@
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
+- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
+
+### 🎫 Feat
+
+- Add `Ai` chat component example
+- Add `tagOnClick` tag to switch global public events
+- Add code editor example
+- Add `Markdown` example
+- Add slider example
+
+### 🐞 Bug fixes
+
+- Fix `aria-hidden` error
+- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
+
+### 🍏 Perf
+
+- Fix broken links in the waterfall infinite scrolling example
+- Update `vue-flow`, related compatibility processing
+- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
+- Optimize `src/style/dark.scss` syntax
+- Optimize login parameter transfer
+- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️Refactor

Diff for: CHANGELOG.md

@@ -1,3 +1,32 @@
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
+- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
+
+### 🎫 Feat
+
+- Add `Ai` chat component example
+- Add `tagOnClick` tag to switch global public events
+- Add code editor example
+- Add `Markdown` example
+- Add slider example
+
+### 🐞 Bug fixes
+
+- Fix `aria-hidden` error
+- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
+
+### 🍏 Perf
+
+- Fix broken links in the waterfall infinite scrolling example
+- Update `vue-flow`, related compatibility processing
+- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
+- Optimize `src/style/dark.scss` syntax
+- Optimize login parameter transfer
+- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️Refactor

Diff for: CHANGELOG.zh_CN.md

@@ -1,3 +1,32 @@
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- 重构图标模块，使用`@iconify/json`替换不再维护更新的`@iconify-icons/*`依赖，优化使用体验，确保图标库可持续更新并支持`Tree-shaking`
+- 升级`tailwindcss`至`v4`版本，带来更快的构建速度、更简化的安装和配置、提供专属`vite`插件
+
+### 🎫 Feat
+
+- 添加`Ai`聊天组件示例
+- 添加`tagOnClick`标签切换全局公共事件
+- 添加代码编辑器示例
+- 添加`Markdown`示例
+- 添加滑块示例
+
+### 🐞 Bug fixes
+
+- 修复`aria-hidden`报错
+- 修复使用`this`语法时无法显示代码提示的问题并更新`pinia`相关语法
+
+### 🍏 Perf
+
+- 修复组件-瀑布流无限滚动示例中失效的链接
+- 更新`vue-flow`，相关兼容处理
+- 删除已弃用的依赖包`eslint-define-config`，升级`eslint`至最新版本，相关兼容处理
+- 优化`src/style/dark.scss`语法
+- 优化登录传参
+- 使用`keydown`替换`keypress`，`keypress`事件已弃用
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️ Refactor

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "5.9.0",
+  "version": "6.0.0",
   "private": true,
   "type": "module",
   "scripts": {

Diff for: public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "5.9.0",
+  "Version": "6.0.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,

Diff for: src/views/components/waterfall/index.vue

@@ -115,7 +115,7 @@ onMounted(() => {
               <div class="text-gray-50">$ {{ item.price }}</div>
               <div>
                 <button
-                  class="px-3 h-7 rounded-full bg-red-500 text-sm text-white shadow-lg transition-all duration-300 hover:bg-red-600"
+                  class="px-3! rounded-full bg-red-500 text-sm text-white shadow-lg transition-all duration-300 hover:bg-red-600 border-0"
                   @click.stop="handleDelete(item, index)"
                 >
                   删除
@@ -129,7 +129,7 @@ onMounted(() => {
 
     <!-- <div class="flex justify-center py-10">
         <button
-          class="px-5 py-2 rounded-full bg-gray-700 text-md text-white cursor-pointer hover:bg-gray-800 transition-all duration-300"
+          class="px-5! py-2! rounded-full bg-gray-700 text-md text-white cursor-pointer hover:bg-gray-800 transition-all duration-300 border-0"
           @click="handleLoadMore"
         >
           加载更多

Diff for: src/views/system/user/utils/hook.tsx

@@ -419,7 +419,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
               />
             </ElFormItem>
           </ElForm>
-          <div class="mt-4 flex">
+          <div class="my-4 flex">
             {pwdProgress.map(({ color, text }, idx) => (
               <div
                 class="w-[19vw]"