Merge fb3e6ea8d2a83e3d32dedc3791060220631a9359 into 583feae7b7c117f9e08eda956e8fc3095c3af8d1

package.json

@@ -57,8 +57,8 @@
     "@pureadmin/utils": "^2.6.0",
     "@vue-flow/background": "^1.3.2",
     "@vue-flow/core": "^1.42.5",
-    "@vueuse/core": "^12.8.2",
-    "@vueuse/motion": "^2.2.6",
+    "@vueuse/core": "^13.1.0",
+    "@vueuse/motion": "^3.0.3",
     "@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.21",
+    "plus-pro-components": "^0.1.22",
     "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.2",
+    "vue-i18n": "^11.1.3",
     "vue-json-pretty": "^2.4.0",
     "vue-pdf-embed": "^2.1.2",
     "vue-router": "^4.5.0",
     "vue-tippy": "^6.7.0",
-    "vue-types": "^5.1.3",
+    "vue-types": "^6.0.0",
     "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.321",
+    "@iconify/json": "^2.2.324",
     "@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.28",
+    "@types/node": "^20.17.30",
     "@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.0",
-    "stylelint": "^16.17.0",
+    "sass": "^1.86.3",
+    "stylelint": "^16.18.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.2",
+    "typescript": "^5.8.3",
     "typescript-eslint": "^8.29.1",
     "unplugin-icons": "^22.1.0",
-    "vite": "^6.2.3",
+    "vite": "^6.2.5",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "^2.2.0",

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: ^12.8.2
-        version: 12.8.2(typescript@5.8.3)
+        specifier: ^13.1.0
+        version: 13.1.0(vue@3.5.13(typescript@5.8.3))
       '@vueuse/motion':
-        specifier: ^2.2.6
-        version: 2.2.6(vue@3.5.13(typescript@5.8.3))
+        specifier: ^3.0.3
+        version: 3.0.3(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.21
+        specifier: ^0.1.22
         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.2
+        specifier: ^11.1.3
         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: ^5.1.3
-        version: 5.1.3(vue@3.5.13(typescript@5.8.3))
+        specifier: ^6.0.0
+        version: 6.0.0(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.321
+        specifier: ^2.2.324
         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.28
+        specifier: ^20.17.30
         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.0
+        specifier: ^1.86.3
         version: 1.86.3
       stylelint:
-        specifier: ^16.17.0
+        specifier: ^16.18.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.2
+        specifier: ^5.8.3
         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.3
+        specifier: ^6.2.5
         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,8 +1952,10 @@ packages:
   '@vueuse/core@10.11.1':
     resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
 
-  '@vueuse/core@12.8.2':
-    resolution: {integrity: sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==}
+  '@vueuse/core@13.1.0':
+    resolution: {integrity: sha512-PAauvdRXZvTWXtGLg8cPUFjiZEddTqmogdwYpnn60t08AA5a8Q4hZokBnpTOnVNqySlFlTcRYIC8OqreV4hv3Q==}
+    peerDependencies:
+      vue: ^3.5.0
 
   '@vueuse/core@9.13.0':
     resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
@@ -1961,22 +1963,24 @@ packages:
   '@vueuse/metadata@10.11.1':
     resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}
 
-  '@vueuse/metadata@12.8.2':
-    resolution: {integrity: sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==}
+  '@vueuse/metadata@13.1.0':
+    resolution: {integrity: sha512-+TDd7/a78jale5YbHX9KHW3cEDav1lz1JptwDvep2zSG8XjCsVE+9mHIzjTOaPbHUAk5XiE4jXLz51/tS+aKQw==}
 
   '@vueuse/metadata@9.13.0':
     resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
 
-  '@vueuse/motion@2.2.6':
-    resolution: {integrity: sha512-gKFktPtrdypSv44SaW1oBJKLBiP6kE5NcoQ6RsAU3InemESdiAutgQncfPe/rhLSLCtL4jTAhMmFfxoR6gm5LQ==}
+  '@vueuse/motion@3.0.3':
+    resolution: {integrity: sha512-4B+ITsxCI9cojikvrpaJcLXyq0spj3sdlzXjzesWdMRd99hhtFI6OJ/1JsqwtF73YooLe0hUn/xDR6qCtmn5GQ==}
     peerDependencies:
       vue: '>=3.0.0'
 
   '@vueuse/shared@10.11.1':
     resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
 
-  '@vueuse/shared@12.8.2':
-    resolution: {integrity: sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==}
+  '@vueuse/shared@13.1.0':
+    resolution: {integrity: sha512-IVS/qRRjhPTZ6C2/AM3jieqXACGwFZwWTdw5sNTSKk2m/ZpkuuN+ri+WCVUP8TqaKwJYt/KuMwmXspMAw8E6ew==}
+    peerDependencies:
+      vue: ^3.5.0
 
   '@vueuse/shared@9.13.0':
     resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
@@ -5369,11 +5373,11 @@ packages:
     peerDependencies:
       typescript: '>=5.0.0'
 
-  vue-types@5.1.3:
-    resolution: {integrity: sha512-3Wy6QcZl0VusCCHX3vYrWSILFlrOB2EQDoySnuYmASM5cUp1FivJGfkS5lp1CutDgyRb41g32r/1QCmiBj5i1Q==}
+  vue-types@6.0.0:
+    resolution: {integrity: sha512-fBgCA4nrBrB8SCU/AN40tFq8HUxLGBvU2ds7a5+SEDse6dYc+TJyvy8mWiwwL8oWIC/aGS/8nTqmhwxApgU5eA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
-      vue: ^2.0.0 || ^3.0.0
+      vue: ^3.0.0
     peerDependenciesMeta:
       vue:
         optional: true
@@ -7237,14 +7241,12 @@ snapshots:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@12.8.2(typescript@5.8.3)':
+  '@vueuse/core@13.1.0(vue@3.5.13(typescript@5.8.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.21
-      '@vueuse/metadata': 12.8.2
-      '@vueuse/shared': 12.8.2(typescript@5.8.3)
+      '@vueuse/metadata': 13.1.0
+      '@vueuse/shared': 13.1.0(vue@3.5.13(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:
@@ -7258,15 +7260,15 @@ snapshots:
 
   '@vueuse/metadata@10.11.1': {}
 
-  '@vueuse/metadata@12.8.2': {}
+  '@vueuse/metadata@13.1.0': {}
 
   '@vueuse/metadata@9.13.0': {}
 
-  '@vueuse/motion@2.2.6(vue@3.5.13(typescript@5.8.3))':
+  '@vueuse/motion@3.0.3(vue@3.5.13(typescript@5.8.3))':
     dependencies:
-      '@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
+      '@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
       framesync: 6.1.2
       popmotion: 11.0.5
       style-value-types: 5.1.2
@@ -7274,7 +7276,6 @@ 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))':
@@ -7284,11 +7285,9 @@ snapshots:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/shared@12.8.2(typescript@5.8.3)':
+  '@vueuse/shared@13.1.0(vue@3.5.13(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:
@@ -8060,8 +8059,7 @@ snapshots:
 
   define-lazy-prop@2.0.0: {}
 
-  defu@6.1.4:
-    optional: true
+  defu@6.1.4: {}
 
   delayed-stream@1.0.0: {}
 
@@ -11021,9 +11019,7 @@ snapshots:
       '@vue/language-core': 2.2.8(typescript@5.8.3)
       typescript: 5.8.3
 
-  vue-types@5.1.3(vue@3.5.13(typescript@5.8.3)):
-    dependencies:
-      is-plain-object: 5.0.0
+  vue-types@6.0.0(vue@3.5.13(typescript@5.8.3)):
     optionalDependencies:
       vue: 3.5.13(typescript@5.8.3)
 

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"

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 mr-2 ml-2"
+              class="justify-end mx-2!"
               type="danger"
               size="small"
               text

src/components/ReIcon/src/hooks.ts

@@ -49,8 +49,10 @@ export function useRenderIcon(icon: any, attrs?: iconType): Component {
     return defineComponent({
       name: "Icon",
       render() {
-        const IconifyIcon =
-          icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
+        if (!icon) return;
+        const IconifyIcon = icon.includes(":")
+          ? IconifyIconOnline
+          : IconifyIconOffline;
         return h(IconifyIcon, {
           icon,
           ...attrs

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 = []"
       >
         移除全部

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>

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-2!"> 批量删除 </el-button>
             </template>
           </el-popconfirm>
         </div>

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>

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>

src/views/table/base/fluidHeight.vue

@@ -77,8 +77,6 @@ const onAddItem = () => {
         </el-button>
       </template>
     </pure-table>
-    <el-button class="mt-4" style="width: 100%" @click="onAddItem">
-      Add Item
-    </el-button>
+    <el-button class="w-full mt-4!" @click="onAddItem"> Add Item </el-button>
   </div>
 </template>

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" />

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

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" 鼠标经过行时，去掉行的背景色 -->

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' })">