Merge branch 'main' into refactor/tailwindcss

style: 样式复查
2025-11-09 13:53:38 +08:00 · 2025-04-09 07:32:08 +08:00 · 2025-04-08 15:12:56 +08:00 · 2025-04-08 14:37:20 +08:00 · 2025-03-28 15:06:27 +08:00 · 2025-03-28 11:45:36 +08:00
27 changed files with 87 additions and 170 deletions
--- a/CHANGELOG.en_US.md
+++ b/CHANGELOG.en_US.md
@@ -1,32 +1,3 @@
-# 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,32 +1,3 @@
-# 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
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,32 +1,3 @@
-# 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
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-pure-admin",
-  "version": "6.0.0",
+  "version": "5.9.0",
  "private": true,
  "type": "module",
  "scripts": {
@@ -57,8 +57,8 @@
    "@pureadmin/utils": "^2.6.0",
    "@vue-flow/background": "^1.3.2",
    "@vue-flow/core": "^1.42.5",
-    "@vueuse/core": "^13.1.0",
-    "@vueuse/motion": "^3.0.3",
+    "@vueuse/core": "^12.8.2",
+    "@vueuse/motion": "^2.2.6",
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^5.1.12",
    "@zxcvbn-ts/core": "^3.0.4",
@@ -85,7 +85,7 @@
    "path-browserify": "^1.0.1",
    "pinia": "^3.0.1",
    "pinyin-pro": "^3.26.0",
-    "plus-pro-components": "^0.1.22",
+    "plus-pro-components": "^0.1.21",
    "qrcode": "^1.5.4",
    "qs": "^6.14.0",
    "responsive-storage": "^2.2.0",
@@ -97,12 +97,12 @@
    "vditor": "^3.10.9",
    "version-rocket": "^1.7.4",
    "vue": "^3.5.13",
-    "vue-i18n": "^11.1.3",
+    "vue-i18n": "^11.1.2",
    "vue-json-pretty": "^2.4.0",
    "vue-pdf-embed": "^2.1.2",
    "vue-router": "^4.5.0",
    "vue-tippy": "^6.7.0",
-    "vue-types": "^6.0.0",
+    "vue-types": "^5.1.3",
    "vue-virtual-scroller": "2.0.0-beta.8",
    "vue-waterfall-plugin-next": "^2.6.5",
    "vue3-danmaku": "^1.6.1",
@@ -119,7 +119,7 @@
    "@commitlint/types": "^19.8.0",
    "@eslint/js": "^9.24.0",
    "@faker-js/faker": "^9.6.0",
-    "@iconify/json": "^2.2.324",
+    "@iconify/json": "^2.2.321",
    "@iconify/vue": "4.2.0",
    "@intlify/unplugin-vue-i18n": "^6.0.5",
    "@tailwindcss/vite": "^4.1.3",
@@ -127,7 +127,7 @@
    "@types/dagre": "^0.7.52",
    "@types/intro.js": "^5.1.5",
    "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.17.30",
+    "@types/node": "^20.17.28",
    "@types/nprogress": "^0.2.3",
    "@types/path-browserify": "^1.0.3",
    "@types/qrcode": "^1.5.5",
@@ -153,18 +153,18 @@
    "prettier": "^3.5.3",
    "rimraf": "^6.0.1",
    "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.86.3",
-    "stylelint": "^16.18.0",
+    "sass": "^1.86.0",
+    "stylelint": "^16.17.0",
    "stylelint-config-recess-order": "^6.0.0",
    "stylelint-config-recommended-vue": "^1.6.0",
    "stylelint-config-standard-scss": "^14.0.0",
    "stylelint-prettier": "^5.0.3",
    "svgo": "^3.3.2",
    "tailwindcss": "^4.1.3",
-    "typescript": "^5.8.3",
+    "typescript": "^5.8.2",
    "typescript-eslint": "^8.29.1",
    "unplugin-icons": "^22.1.0",
-    "vite": "^6.2.5",
+    "vite": "^6.2.3",
    "vite-plugin-cdn-import": "^1.0.1",
    "vite-plugin-compression": "^0.5.1",
    "vite-plugin-fake-server": "^2.2.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,11 +39,11 @@ importers:
        specifier: ^1.42.5
        version: 1.42.5(vue@3.5.13(typescript@5.8.3))
      '@vueuse/core':
-        specifier: ^13.1.0
-        version: 13.1.0(vue@3.5.13(typescript@5.8.3))
+        specifier: ^12.8.2
+        version: 12.8.2(typescript@5.8.3)
      '@vueuse/motion':
-        specifier: ^3.0.3
-        version: 3.0.3(vue@3.5.13(typescript@5.8.3))
+        specifier: ^2.2.6
+        version: 2.2.6(vue@3.5.13(typescript@5.8.3))
      '@wangeditor/editor':
        specifier: ^5.1.23
        version: 5.1.23
@@ -123,7 +123,7 @@ importers:
        specifier: ^3.26.0
        version: 3.26.0
      plus-pro-components:
-        specifier: ^0.1.22
+        specifier: ^0.1.21
        version: 0.1.22(element-plus@2.9.7(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3))
      qrcode:
        specifier: ^1.5.4
@@ -159,7 +159,7 @@ importers:
        specifier: ^3.5.13
        version: 3.5.13(typescript@5.8.3)
      vue-i18n:
-        specifier: ^11.1.3
+        specifier: ^11.1.2
        version: 11.1.3(vue@3.5.13(typescript@5.8.3))
      vue-json-pretty:
        specifier: ^2.4.0
@@ -174,8 +174,8 @@ importers:
        specifier: ^6.7.0
        version: 6.7.0(vue@3.5.13(typescript@5.8.3))
      vue-types:
-        specifier: ^6.0.0
-        version: 6.0.0(vue@3.5.13(typescript@5.8.3))
+        specifier: ^5.1.3
+        version: 5.1.3(vue@3.5.13(typescript@5.8.3))
      vue-virtual-scroller:
        specifier: 2.0.0-beta.8
        version: 2.0.0-beta.8(vue@3.5.13(typescript@5.8.3))
@@ -220,7 +220,7 @@ importers:
        specifier: ^9.6.0
        version: 9.6.0
      '@iconify/json':
-        specifier: ^2.2.324
+        specifier: ^2.2.321
        version: 2.2.324
      '@iconify/vue':
        specifier: 4.2.0
@@ -244,7 +244,7 @@ importers:
        specifier: ^3.0.6
        version: 3.0.6
      '@types/node':
-        specifier: ^20.17.30
+        specifier: ^20.17.28
        version: 20.17.30
      '@types/nprogress':
        specifier: ^0.2.3
@@ -322,10 +322,10 @@ importers:
        specifier: ^5.14.0
        version: 5.14.0(rollup@4.39.0)
      sass:
-        specifier: ^1.86.3
+        specifier: ^1.86.0
        version: 1.86.3
      stylelint:
-        specifier: ^16.18.0
+        specifier: ^16.17.0
        version: 16.18.0(typescript@5.8.3)
      stylelint-config-recess-order:
        specifier: ^6.0.0
@@ -346,7 +346,7 @@ importers:
        specifier: ^4.1.3
        version: 4.1.3
      typescript:
-        specifier: ^5.8.3
+        specifier: ^5.8.2
        version: 5.8.3
      typescript-eslint:
        specifier: ^8.29.1
@@ -355,7 +355,7 @@ importers:
        specifier: ^22.1.0
        version: 22.1.0(@vue/compiler-sfc@3.5.13)
      vite:
-        specifier: ^6.2.5
+        specifier: ^6.2.3
        version: 6.2.5(@types/node@20.17.30)(jiti@2.4.2)(lightningcss@1.29.2)(sass@1.86.3)(yaml@2.7.1)
      vite-plugin-cdn-import:
        specifier: ^1.0.1
@@ -1952,10 +1952,8 @@ packages:
  '@vueuse/core@10.11.1':
    resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}

-  '@vueuse/core@13.1.0':
-    resolution: {integrity: sha512-PAauvdRXZvTWXtGLg8cPUFjiZEddTqmogdwYpnn60t08AA5a8Q4hZokBnpTOnVNqySlFlTcRYIC8OqreV4hv3Q==}
-    peerDependencies:
-      vue: ^3.5.0
+  '@vueuse/core@12.8.2':
+    resolution: {integrity: sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==}

  '@vueuse/core@9.13.0':
    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
@@ -1963,24 +1961,22 @@ packages:
  '@vueuse/metadata@10.11.1':
    resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}

-  '@vueuse/metadata@13.1.0':
-    resolution: {integrity: sha512-+TDd7/a78jale5YbHX9KHW3cEDav1lz1JptwDvep2zSG8XjCsVE+9mHIzjTOaPbHUAk5XiE4jXLz51/tS+aKQw==}
+  '@vueuse/metadata@12.8.2':
+    resolution: {integrity: sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==}

  '@vueuse/metadata@9.13.0':
    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}

-  '@vueuse/motion@3.0.3':
-    resolution: {integrity: sha512-4B+ITsxCI9cojikvrpaJcLXyq0spj3sdlzXjzesWdMRd99hhtFI6OJ/1JsqwtF73YooLe0hUn/xDR6qCtmn5GQ==}
+  '@vueuse/motion@2.2.6':
+    resolution: {integrity: sha512-gKFktPtrdypSv44SaW1oBJKLBiP6kE5NcoQ6RsAU3InemESdiAutgQncfPe/rhLSLCtL4jTAhMmFfxoR6gm5LQ==}
    peerDependencies:
      vue: '>=3.0.0'

  '@vueuse/shared@10.11.1':
    resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}

-  '@vueuse/shared@13.1.0':
-    resolution: {integrity: sha512-IVS/qRRjhPTZ6C2/AM3jieqXACGwFZwWTdw5sNTSKk2m/ZpkuuN+ri+WCVUP8TqaKwJYt/KuMwmXspMAw8E6ew==}
-    peerDependencies:
-      vue: ^3.5.0
+  '@vueuse/shared@12.8.2':
+    resolution: {integrity: sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==}

  '@vueuse/shared@9.13.0':
    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
@@ -5373,11 +5369,11 @@ packages:
    peerDependencies:
      typescript: '>=5.0.0'

-  vue-types@6.0.0:
-    resolution: {integrity: sha512-fBgCA4nrBrB8SCU/AN40tFq8HUxLGBvU2ds7a5+SEDse6dYc+TJyvy8mWiwwL8oWIC/aGS/8nTqmhwxApgU5eA==}
+  vue-types@5.1.3:
+    resolution: {integrity: sha512-3Wy6QcZl0VusCCHX3vYrWSILFlrOB2EQDoySnuYmASM5cUp1FivJGfkS5lp1CutDgyRb41g32r/1QCmiBj5i1Q==}
    engines: {node: '>=14.0.0'}
    peerDependencies:
-      vue: ^3.0.0
+      vue: ^2.0.0 || ^3.0.0
    peerDependenciesMeta:
      vue:
        optional: true
@@ -7241,12 +7237,14 @@ snapshots:
      - '@vue/composition-api'
      - vue

-  '@vueuse/core@13.1.0(vue@3.5.13(typescript@5.8.3))':
+  '@vueuse/core@12.8.2(typescript@5.8.3)':
    dependencies:
      '@types/web-bluetooth': 0.0.21
-      '@vueuse/metadata': 13.1.0
-      '@vueuse/shared': 13.1.0(vue@3.5.13(typescript@5.8.3))
+      '@vueuse/metadata': 12.8.2
+      '@vueuse/shared': 12.8.2(typescript@5.8.3)
      vue: 3.5.13(typescript@5.8.3)
+    transitivePeerDependencies:
+      - typescript

  '@vueuse/core@9.13.0(vue@3.5.13(typescript@5.8.3))':
    dependencies:
@@ -7260,15 +7258,15 @@ snapshots:

  '@vueuse/metadata@10.11.1': {}

-  '@vueuse/metadata@13.1.0': {}
+  '@vueuse/metadata@12.8.2': {}

  '@vueuse/metadata@9.13.0': {}

-  '@vueuse/motion@3.0.3(vue@3.5.13(typescript@5.8.3))':
+  '@vueuse/motion@2.2.6(vue@3.5.13(typescript@5.8.3))':
    dependencies:
-      '@vueuse/core': 13.1.0(vue@3.5.13(typescript@5.8.3))
-      '@vueuse/shared': 13.1.0(vue@3.5.13(typescript@5.8.3))
-      defu: 6.1.4
+      '@vueuse/core': 10.11.1(vue@3.5.13(typescript@5.8.3))
+      '@vueuse/shared': 10.11.1(vue@3.5.13(typescript@5.8.3))
+      csstype: 3.1.3
      framesync: 6.1.2
      popmotion: 11.0.5
      style-value-types: 5.1.2
@@ -7276,6 +7274,7 @@ snapshots:
    optionalDependencies:
      '@nuxt/kit': 3.16.2
    transitivePeerDependencies:
+      - '@vue/composition-api'
      - magicast

  '@vueuse/shared@10.11.1(vue@3.5.13(typescript@5.8.3))':
@@ -7285,9 +7284,11 @@ snapshots:
      - '@vue/composition-api'
      - vue

-  '@vueuse/shared@13.1.0(vue@3.5.13(typescript@5.8.3))':
+  '@vueuse/shared@12.8.2(typescript@5.8.3)':
    dependencies:
      vue: 3.5.13(typescript@5.8.3)
+    transitivePeerDependencies:
+      - typescript

  '@vueuse/shared@9.13.0(vue@3.5.13(typescript@5.8.3))':
    dependencies:
@@ -8059,7 +8060,8 @@ snapshots:

  define-lazy-prop@2.0.0: {}

-  defu@6.1.4: {}
+  defu@6.1.4:
+    optional: true

  delayed-stream@1.0.0: {}

@@ -11019,7 +11021,9 @@ snapshots:
      '@vue/language-core': 2.2.8(typescript@5.8.3)
      typescript: 5.8.3

-  vue-types@6.0.0(vue@3.5.13(typescript@5.8.3)):
+  vue-types@5.1.3(vue@3.5.13(typescript@5.8.3)):
+    dependencies:
+      is-plain-object: 5.0.0
    optionalDependencies:
      vue: 3.5.13(typescript@5.8.3)

--- a/public/platform-config.json
+++ b/public/platform-config.json
@@ -1,5 +1,5 @@
 {
-  "Version": "6.0.0",
+  "Version": "5.9.0",
  "Title": "PureAdmin",
  "FixedHeader": true,
  "HiddenSideBar": false,
--- a/src/components/ReAnimateSelector/src/index.vue
+++ b/src/components/ReAnimateSelector/src/index.vue
@@ -95,7 +95,7 @@ function onMouseleave() {
          :view-style="{ overflow: 'hidden' }"
          class="border-t border-[#e5e7eb]"
        >
-          <ul class="flex flex-wrap justify-around mb-1!">
+          <ul class="flex flex-wrap justify-around mb-1">
            <li
              v-for="(animate, index) in animatesList"
              :key="index"
--- a/src/components/ReIcon/src/Select.vue
+++ b/src/components/ReIcon/src/Select.vue
@@ -158,7 +158,7 @@ watch(
              :name="pane.name"
            >
              <el-scrollbar height="220px">
-                <ul class="flex flex-wrap px-2! ml-2!">
+                <ul class="flex flex-wrap px-2 ml-2">
                  <li
                    v-for="(item, key) in pageList"
                    :key="key"
@@ -198,7 +198,7 @@ watch(
              @current-change="onCurrentChange"
            />
            <el-button
-              class="justify-end mx-2!"
+              class="justify-end mr-2 ml-2"
              type="danger"
              size="small"
              text
--- a/src/components/ReIcon/src/hooks.ts
+++ b/src/components/ReIcon/src/hooks.ts
@@ -49,10 +49,8 @@ export function useRenderIcon(icon: any, attrs?: iconType): Component {
    return defineComponent({
      name: "Icon",
      render() {
-        if (!icon) return;
-        const IconifyIcon = icon.includes(":")
-          ? IconifyIconOnline
-          : IconifyIconOffline;
+        const IconifyIcon =
+          icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
        return h(IconifyIcon, {
          icon,
          ...attrs
--- a/src/components/RePureTableBar/src/bar.tsx
+++ b/src/components/RePureTableBar/src/bar.tsx
@@ -260,7 +260,7 @@ export default defineComponent({
            "pb-2",
            "bg-bg_color",
            isFullscreen.value
-              ? ["h-full!", "z-2002", "fixed", "inset-0"]
+              ? ["w-full!", "h-full!", "z-2002", "fixed", "inset-0"]
              : "mt-2"
          ]}
        >
--- a/src/components/ReVxeTableBar/src/bar.tsx
+++ b/src/components/ReVxeTableBar/src/bar.tsx
@@ -253,7 +253,7 @@ export default defineComponent({
            "pb-2",
            "bg-bg_color",
            isFullscreen.value
-              ? ["h-full!", "z-2002", "fixed", "inset-0"]
+              ? ["w-full!", "h-full!", "z-2002", "fixed", "inset-0"]
              : "mt-2"
          ]}
        >
--- a/src/layout/components/lay-panel/index.vue
+++ b/src/layout/components/lay-panel/index.vue
@@ -78,7 +78,7 @@ onBeforeUnmount(() => {
      </el-scrollbar>

      <div
-        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
+        class="flex justify-end p-3 border-0 border-t-[1px]! border-solid border-[var(--pure-border-color)]"
      >
        <el-button
          v-tippy="{
--- a/src/views/components/swiper.vue
+++ b/src/views/components/swiper.vue
@@ -106,7 +106,7 @@ const swiperExample: any[] = [
    </template>
    <el-row :gutter="10">
      <el-col v-for="item in swiperExample" :key="item.id" :span="12">
-        <h6 class="py-[16px]! text-base">{{ item.label }}</h6>
+        <h6 class="py-[16px] text-base">{{ item.label }}</h6>
        <swiper v-bind="item.options">
          <swiper-slide v-for="i in 5" :key="i">
            <div
--- a/src/views/components/tag.vue
+++ b/src/views/components/tag.vue
@@ -107,7 +107,7 @@ const handleInputConfirm = () => {
        v-model="checked1"
        label="可移除"
      />
-      <el-button v-else size="small" text bg class="mr-6!" @click="onReset">
+      <el-button v-else size="small" text bg class="mr-6" @click="onReset">
        重置
      </el-button>
      <el-button
@@ -115,7 +115,7 @@ const handleInputConfirm = () => {
        size="small"
        text
        bg
-        class="mr-6! ml-4!"
+        class="mr-6 ml-4"
        @click="tagList = []"
      >
        移除全部
--- a/src/views/components/upload/index.vue
+++ b/src/views/components/upload/index.vue
@@ -232,7 +232,7 @@ const onDownload = () => {
    </p>
    <el-divider />

-    <p class="my-4!">
+    <p class="mb-4! mt-4">
      结合表单校验进行<span class="text-[red]">手动上传</span>
      <span class="text-[14px]">
        （可先打开浏览器控制台找到Network，然后填写表单内容后点击点提交观察请求变化）
--- a/src/views/components/waterfall/index.vue
+++ b/src/views/components/waterfall/index.vue
@@ -106,7 +106,7 @@ onMounted(() => {
            />
          </div>
          <div class="px-4 pt-2 pb-4 border-t border-t-gray-800">
-            <h4 class="pb-4! text-gray-50 group-hover:text-yellow-300">
+            <h4 class="pb-4 text-gray-50 group-hover:text-yellow-300">
              {{ item.name }}
            </h4>
            <div
@@ -115,7 +115,7 @@ onMounted(() => {
              <div class="text-gray-50">$ {{ item.price }}</div>
              <div>
                <button
-                  class="px-3! rounded-full bg-red-500 text-sm text-white shadow-lg transition-all duration-300 hover:bg-red-600 border-0"
+                  class="px-3 h-7 rounded-full bg-red-500 text-sm text-white shadow-lg transition-all duration-300 hover:bg-red-600"
                  @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 border-0"
+          class="px-5 py-2 rounded-full bg-gray-700 text-md text-white cursor-pointer hover:bg-gray-800 transition-all duration-300"
          @click="handleLoadMore"
        >
          加载更多
--- a/src/views/monitor/logs/login/index.vue
+++ b/src/views/monitor/logs/login/index.vue
@@ -118,7 +118,7 @@ const {
          </div>
          <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
            <template #reference>
-              <el-button type="danger" text class="mr-1!"> 批量删除 </el-button>
+              <el-button type="danger" text class="mr-1"> 批量删除 </el-button>
            </template>
          </el-popconfirm>
        </div>
--- a/src/views/monitor/logs/operation/index.vue
+++ b/src/views/monitor/logs/operation/index.vue
@@ -118,7 +118,7 @@ const {
          </div>
          <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
            <template #reference>
-              <el-button type="danger" text class="mr-1!"> 批量删除 </el-button>
+              <el-button type="danger" text class="mr-1"> 批量删除 </el-button>
            </template>
          </el-popconfirm>
        </div>
--- a/src/views/monitor/logs/system/index.vue
+++ b/src/views/monitor/logs/system/index.vue
@@ -110,7 +110,7 @@ const {
          </div>
          <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
            <template #reference>
-              <el-button type="danger" text class="mr-1!"> 批量删除 </el-button>
+              <el-button type="danger" text class="mr-1"> 批量删除 </el-button>
            </template>
          </el-popconfirm>
        </div>
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -143,7 +143,7 @@ const {
            </div>
            <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
              <template #reference>
-                <el-button type="danger" text class="mr-1!">
+                <el-button type="danger" text class="mr-1">
                  批量删除
                </el-button>
              </template>
--- a/src/views/system/user/tree.vue
+++ b/src/views/system/user/tree.vue
@@ -117,7 +117,7 @@ defineExpose({ onTreeReset });
        </template>
      </el-input>
      <el-dropdown :hide-on-click="false">
-        <More2Fill class="w-[28px] cursor-pointer outline-hidden" />
+        <More2Fill class="w-[28px] cursor-pointer outline-none" />
        <template #dropdown>
          <el-dropdown-menu>
            <el-dropdown-item>
--- a/src/views/system/user/utils/hook.tsx
+++ b/src/views/system/user/utils/hook.tsx
@@ -419,7 +419,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
              />
            </ElFormItem>
          </ElForm>
-          <div class="my-4 flex">
+          <div class="mt-4 flex">
            {pwdProgress.map(({ color, text }, idx) => (
              <div
                class="w-[19vw]"
--- a/src/views/table/base/fluidHeight.vue
+++ b/src/views/table/base/fluidHeight.vue
@@ -77,6 +77,8 @@ const onAddItem = () => {
        </el-button>
      </template>
    </pure-table>
-    <el-button class="w-full mt-4!" @click="onAddItem"> Add Item </el-button>
+    <el-button class="mt-4" style="width: 100%" @click="onAddItem">
+      Add Item
+    </el-button>
  </div>
 </template>
--- a/src/views/table/high/excel/index.vue
+++ b/src/views/table/high/excel/index.vue
@@ -6,7 +6,7 @@ const { columns, dataList, exportExcel } = useColumns();

 <template>
  <div>
-    <el-button type="primary" class="mb-[20px]!" @click="exportExcel">
+    <el-button type="primary" class="mb-[20px]" @click="exportExcel">
      导出
    </el-button>
    <pure-table row-key="id" border :data="dataList" :columns="columns" />
--- a/src/views/table/high/header/index.vue
+++ b/src/views/table/high/header/index.vue
@@ -9,7 +9,7 @@ const { columns, dataList, onChange } = useColumns();

 <template>
  <div>
-    <el-button type="primary" class="mb-[20px]!" @click="onChange">
+    <el-button type="primary" class="mb-[20px]" @click="onChange">
      切换表头
    </el-button>
    <pure-table
--- a/src/views/table/high/prints/index.vue
+++ b/src/views/table/high/prints/index.vue
@@ -9,7 +9,7 @@ const { columns, dataList, print, cellStyle, rowStyle, headerCellStyle } =

 <template>
  <div>
-    <el-button type="primary" class="mb-[20px]!" @click="print">
+    <el-button type="primary" class="mb-[20px]" @click="print">
      打印
    </el-button>
    <!-- rowHoverBgColor="transparent" 鼠标经过行时，去掉行的背景色 -->
--- a/src/views/tabs/index.vue
+++ b/src/views/tabs/index.vue
@@ -62,7 +62,7 @@ function onCloseTags() {
      <el-button
        v-for="index in 6"
        :key="index"
-        class="m-2!"
+        class="m-2"
        @click="toDetail({ id: index }, 'query')"
      >
        打开{{ index }}详情页
@@ -83,7 +83,7 @@ function onCloseTags() {
      <el-button
        v-for="index in 6"
        :key="index"
-        class="m-2!"
+        class="m-2"
        @click="toDetail({ id: index }, 'params')"
      >
        打开{{ index }}详情页
@@ -112,7 +112,7 @@ function onCloseTags() {
        <span>{{ transformI18n(data.meta.title) }}</span>
      </template>
    </el-tree-select>
-    <el-button class="m-2!" @click="onCloseTags">关闭标签</el-button>
+    <el-button class="m-2" @click="onCloseTags">关闭标签</el-button>

    <el-divider />
    <el-button @click="router.push({ name: 'Menu1-2-2' })">
Author	SHA1	Message	Date
xiaoxian521	1daeea0cbb	Merge branch 'main' into refactor/tailwindcss	2025-04-09 07:32:08 +08:00
xiaoxian521	ed2a24f1e3	Merge branch 'main' into refactor/tailwindcss	2025-04-08 15:12:56 +08:00
xiaoxian521	b86d038a18	style: 样式复查	2025-04-08 14:37:20 +08:00
xiaoxian521	e3564eab96	chore: update	2025-03-28 15:06:27 +08:00
xiaoxian521	0a46a04c67	Merge branch 'main' into refactor/tailwindcss	2025-03-28 11:45:36 +08:00
xiaoxian521	b7d3dc1170	Merge branch 'main' into refactor/tailwindcss	2025-03-28 08:50:40 +08:00
xiaoxian521	ab1c7f8bcc	refactor: 升级`tailwindcss`至`v4`版本，带来更快的构建速度、更简化的安装和配置、提供专属`vite`插件	2025-03-16 19:46:35 +08:00