Merge branch 'main' into refactor/tailwindcss

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

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

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

eslint.config.js

@@ -1,10 +1,11 @@
 import js from "@eslint/js";
-import tseslint from "typescript-eslint";
 import pluginVue from "eslint-plugin-vue";
 import * as parserVue from "vue-eslint-parser";
 import configPrettier from "eslint-config-prettier";
 import pluginPrettier from "eslint-plugin-prettier";
 import { defineConfig, globalIgnores } from "eslint/config";
+import * as parserTypeScript from "@typescript-eslint/parser";
+import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 
 export default defineConfig([
   globalIgnores([
@@ -19,7 +20,7 @@ export default defineConfig([
     ...js.configs.recommended,
     languageOptions: {
       globals: {
-        // types/index.d.ts
+        // index.d.ts
         RefType: "readonly",
         EmitType: "readonly",
         TargetContext: "readonly",
@@ -72,10 +73,21 @@ export default defineConfig([
       ]
     }
   },
-  ...tseslint.config({
+  {
-    extends: [...tseslint.configs.recommended],
     files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
+    languageOptions: {
+      parser: parserTypeScript,
+      parserOptions: {
+        sourceType: "module",
+        warnOnUnsupportedTypeScriptVersion: false
+      }
+    },
+    plugins: {
+      "@typescript-eslint": pluginTypeScript
+    },
     rules: {
+      ...pluginTypeScript.configs.strict.rules,
+      "@typescript-eslint/ban-types": "off",
       "@typescript-eslint/no-redeclare": "error",
       "@typescript-eslint/ban-ts-comment": "off",
       "@typescript-eslint/no-explicit-any": "off",
@@ -102,20 +114,20 @@ export default defineConfig([
         }
       ]
     }
-  }),
+  },
   {
     files: ["**/*.d.ts"],
     rules: {
       "eslint-comments/no-unlimited-disable": "off",
       "import/no-duplicates": "off",
-      "no-restricted-syntax": "off",
       "unused-imports/no-unused-vars": "off"
     }
   },
   {
     files: ["**/*.?([cm])js"],
     rules: {
-      "@typescript-eslint/no-require-imports": "off"
+      "@typescript-eslint/no-require-imports": "off",
+      "@typescript-eslint/no-var-requires": "off"
     }
   },
   {
@@ -136,19 +148,18 @@ export default defineConfig([
           jsx: true
         },
         extraFileExtensions: [".vue"],
-        parser: tseslint.parser,
+        parser: "@typescript-eslint/parser",
         sourceType: "module"
       }
     },
     plugins: {
-      "@typescript-eslint": tseslint.plugin,
       vue: pluginVue
     },
     processor: pluginVue.processors[".vue"],
     rules: {
       ...pluginVue.configs.base.rules,
-      ...pluginVue.configs.essential.rules,
+      ...pluginVue.configs["vue3-essential"].rules,
-      ...pluginVue.configs.recommended.rules,
+      ...pluginVue.configs["vue3-recommended"].rules,
       "no-undef": "off",
       "no-unused-vars": "off",
       "vue/no-v-html": "off",

mock/mine.ts

@@ -25,7 +25,7 @@ export default defineFakeRoute([
     url: "/mine-logs",
     method: "get",
     response: () => {
-      const list = [
+      let list = [
         {
           id: 1,
           ip: faker.internet.ipv4(),

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/core": "^12.8.2",
-    "@vueuse/motion": "^3.0.3",
+    "@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",
@@ -117,9 +117,9 @@
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-conventional": "^19.8.0",
     "@commitlint/types": "^19.8.0",
-    "@eslint/js": "^9.24.0",
+    "@eslint/js": "^9.23.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,22 +127,24 @@
     "@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",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
+    "@typescript-eslint/eslint-plugin": "^8.28.0",
+    "@typescript-eslint/parser": "^8.28.0",
     "@vitejs/plugin-vue": "^5.2.3",
     "@vitejs/plugin-vue-jsx": "^4.1.2",
     "boxen": "^8.0.1",
     "code-inspector-plugin": "^0.20.7",
     "cssnano": "^7.0.6",
     "dagre": "^0.8.5",
-    "eslint": "^9.24.0",
+    "eslint": "^9.23.0",
     "eslint-config-prettier": "^10.1.1",
-    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-prettier": "^5.2.5",
-    "eslint-plugin-vue": "^10.0.0",
+    "eslint-plugin-vue": "^9.33.0",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.0",
@@ -153,25 +155,24 @@
     "prettier": "^3.5.3",
     "rimraf": "^6.0.1",
     "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.86.3",
+    "sass": "^1.86.0",
-    "stylelint": "^16.18.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",
     "vite-plugin-remove-console": "^2.2.0",
     "vite-plugin-router-warn": "^1.0.0",
     "vite-svg-loader": "^5.1.0",
-    "vue-eslint-parser": "^10.1.3",
+    "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.2.8"
   },
   "engines": {
@@ -193,6 +194,11 @@
       "abab": "*",
       "glob": "*"
     },
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "eslint": "9"
+      }
+    },
     "onlyBuiltDependencies": [
       "@parcel/watcher",
       "core-js",

public/platform-config.json

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

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/ReFlowChart/src/Control.vue

@@ -3,7 +3,7 @@ import { ref, unref, onMounted } from "vue";
 import { LogicFlow } from "@logicflow/core";
 
 interface Props {
-  lf?: LogicFlow;
+  lf: LogicFlow;
   catTurboData?: boolean;
 }
 

src/components/ReFlowChart/src/NodePanel.vue

@@ -9,8 +9,8 @@ type nodeListType = {
 };
 
 interface Props {
-  lf?: LogicFlow;
+  lf: LogicFlow;
-  nodeList?: Array<nodeListType>;
+  nodeList: Array<nodeListType>;
 }
 
 const props = withDefaults(defineProps<Props>(), {

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

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 =
-        const IconifyIcon = icon.includes(":")
+          icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
-          ? IconifyIconOnline
-          : IconifyIconOffline;
         return h(IconifyIcon, {
           icon,
           ...attrs

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"
           ]}
         >

src/components/ReSeamlessScroll/src/utils.ts

@@ -60,15 +60,12 @@ export function copyObj() {
     copyIsArray,
     clone,
     i = 1,
-    // eslint-disable-next-line prefer-rest-params
     target = arguments[0] || {}, // 使用||运算符，排除隐式强制类型转换为false的数据类型
     deep = false,
-    // eslint-disable-next-line prefer-const
     len = arguments.length;
   if (typeof target === "boolean") {
     deep = target;
 
-    // eslint-disable-next-line prefer-rest-params
     target = arguments[1] || {};
     i++;
   }
@@ -82,7 +79,6 @@ export function copyObj() {
   for (; i < len; i++) {
     //所以如果源对象中数据类型为Undefined或Null那么就会跳过本次循环，接着循环下一个源对象
 
-    // eslint-disable-next-line prefer-rest-params
     if ((options = arguments[i]) != null) {
       // 如果遇到源对象的数据类型为Boolean, Number for in循环会被跳过，不执行for in循环// src用于判断target对象是否存在name属性
       for (name in options) {

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"
           ]}
         >

src/directives/ripple/index.ts

@@ -32,8 +32,8 @@ const calculate = (
   const offset = el.getBoundingClientRect();
 
   // 获取点击位置距离 el 的垂直和水平距离
-  const localX = e.clientX - offset.left;
+  let localX = e.clientX - offset.left;
-  const localY = e.clientY - offset.top;
+  let localY = e.clientY - offset.top;
 
   let radius = 0;
   let scale = 0.3;

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="{

src/layout/components/lay-search/components/SearchFooter.vue

@@ -6,7 +6,7 @@ import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
 import ArrowUpLine from "~icons/ri/arrow-up-line";
 import ArrowDownLine from "~icons/ri/arrow-down-line";
 
-withDefaults(defineProps<{ total?: number }>(), {
+withDefaults(defineProps<{ total: number }>(), {
   total: 0
 });
 

src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue

@@ -7,7 +7,7 @@ import { useNav } from "@/layout/hooks/useNav";
 import ArrowLeft from "~icons/ri/arrow-left-double-fill";
 
 interface Props {
-  isActive?: boolean;
+  isActive: boolean;
 }
 
 withDefaults(defineProps<Props>(), {

src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue

@@ -7,7 +7,7 @@ import { useNav } from "@/layout/hooks/useNav";
 import MenuFold from "~icons/ri/menu-fold-fill";
 
 interface Props {
-  isActive?: boolean;
+  isActive: boolean;
 }
 
 withDefaults(defineProps<Props>(), {

src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue

@@ -4,7 +4,7 @@ import MenuFold from "~icons/ri/menu-fold-fill";
 import MenuUnfold from "~icons/ri/menu-unfold-fill";
 
 interface Props {
-  isActive?: boolean;
+  isActive: boolean;
 }
 
 withDefaults(defineProps<Props>(), {

src/plugins/i18n.ts

@@ -10,7 +10,7 @@ import zhLocale from "element-plus/es/locale/lang/zh-cn";
 
 const siphonI18n = (function () {
   // 仅初始化一次国际化配置
-  const cache = Object.fromEntries(
+  let cache = Object.fromEntries(
     Object.entries(
       import.meta.glob("../../locales/*.y(a)?ml", { eager: true })
     ).map(([key, value]: any) => {

src/utils/print.ts

@@ -140,10 +140,8 @@ Print.prototype = {
       "position:absolute;width:0;height:0;top:-10px;left:-10px;"
     );
 
-    // eslint-disable-next-line prefer-const
     w = f.contentWindow || f.contentDocument;
 
-    // eslint-disable-next-line prefer-const
     doc = f.contentDocument || f.contentWindow.document;
     doc.open();
     doc.write(content);

src/views/components/dialog/form.vue

@@ -3,7 +3,7 @@ import { ref } from "vue";
 
 // 声明 props 类型
 export interface FormProps {
-  formInline?: {
+  formInline: {
     user: string;
     region: string;
   };

src/views/components/dialog/formPrimitive.vue

@@ -3,7 +3,7 @@ import { useVModel } from "@vueuse/core";
 
 // 声明 props 类型
 export interface FormProps {
-  data?: string;
+  data: string;
 }
 
 // 声明 props 默认值

src/views/components/drawer/form.vue

@@ -3,7 +3,7 @@ import { ref } from "vue";
 
 // 声明 props 类型
 export interface FormProps {
-  formInline?: {
+  formInline: {
     user: string;
     region: string;
   };

src/views/components/drawer/formPrimitive.vue

@@ -3,7 +3,7 @@ import { useVModel } from "@vueuse/core";
 
 // 声明 props 类型
 export interface FormProps {
-  data?: string;
+  data: string;
 }
 
 // 声明 props 默认值

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

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/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，然后填写表单内容后点击点提交观察请求变化）

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"
         >
           加载更多

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-1"> 批量删除 </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/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>

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

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>

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/table/high/table-select/multiple/columns.tsx

@@ -73,7 +73,7 @@ export function useColumns(selectRef: Ref, formRef: Ref, tableRef: Ref) {
   const onSearch = () => {
     tableData.value = cloneTableData;
     if (!isAllEmpty(searchForm.sexValue)) {
-      const sex = sexOptions
+      let sex = sexOptions
         .map(sex => sex.value === Number(searchForm.sexValue) && sex.label)
         .filter(Boolean)[0];
       tableData.value = tableData.value.filter(data => data.sex === sex);

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

types/index.d.ts

@@ -75,6 +75,8 @@ interface ComponentElRef<T extends HTMLElement = HTMLDivElement> {
   $el: T;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function parseInt(s: string | number, radix?: number): number;
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function parseFloat(string: string | number): number;

types/router.d.ts

@@ -104,6 +104,6 @@ declare global {
 
 // https://router.vuejs.org/zh/guide/advanced/meta.html#typescript
 declare module "vue-router" {
-  // eslint-disable-next-line
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   interface RouteMeta extends CustomizeRouteMeta {}
 }

types/shims-tsx.d.ts

@@ -1,4 +1,4 @@
-import type Vue, { type VNode } from "vue";
+import Vue, { VNode } from "vue";
 
 declare module "*.tsx" {
   import Vue from "compatible-vue";
@@ -7,9 +7,7 @@ declare module "*.tsx" {
 
 declare global {
   namespace JSX {
-    // eslint-disable-next-line
     interface Element extends VNode {}
-    // eslint-disable-next-line
     interface ElementClass extends Vue {}
     interface ElementAttributesProperty {
       $props: any;

types/shims-vue.d.ts

@@ -1,6 +1,5 @@
 declare module "*.vue" {
   import type { DefineComponent } from "vue";
-  // eslint-disable-next-line
   const component: DefineComponent<{}, {}, any>;
   export default component;
 }