Merge branch 'main' into perf/tailwindcss-class

eslint.config.js

@@ -5,6 +5,7 @@ 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 eslintPluginBetterTailwindcss from "eslint-plugin-better-tailwindcss";
 
 export default defineConfig([
   globalIgnores([
@@ -172,5 +173,20 @@ export default defineConfig([
         }
       ]
     }
+  },
+  {
+    files: ["**/*.vue", "**/*.tsx"],
+    plugins: {
+      "better-tailwindcss": eslintPluginBetterTailwindcss
+    },
+    rules: {
+      "better-tailwindcss/enforce-consistent-variable-syntax": "warn",
+      "better-tailwindcss/enforce-canonical-classes": "warn"
+    },
+    settings: {
+      "better-tailwindcss": {
+        entryPoint: "src/style/tailwind.css"
+      }
+    }
   }
 ]);

package.json

@@ -141,6 +141,7 @@
     "dagre": "^0.8.5",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-better-tailwindcss": "4.0.0-rc.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-vue": "^10.6.2",
     "gradient-string": "^3.0.0",

src/layout/components/lay-navbar/index.vue

@@ -33,7 +33,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 </script>
 
 <template>
-  <div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
+  <div class="navbar bg-white shadow-xs shadow-[rgba(0,21,41,0.08)]">
     <LaySidebarTopCollapse
       v-if="device === 'mobile'"
       class="hamburger-container"

src/layout/components/lay-notice/components/NoticeItem.vue

@@ -49,7 +49,7 @@ function hoverDescription(event, description) {
 
 <template>
   <div
-    class="notice-container border-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
+    class="notice-container border-0 border-b border-solid border-[#f0f0f0] dark:border-[#303030]"
   >
     <el-avatar
       v-if="noticeItem.avatar"

src/layout/components/lay-setting/index.vue

@@ -416,7 +416,7 @@ onUnmounted(() => removeMatchMedia);
         <button
           v-else
           v-ripple="{ class: 'text-gray-300' }"
-          class="bg-transparent flex-c w-full h-20 rounded-md border border-[var(--pure-border-color)]"
+          class="bg-transparent flex-c w-full h-20 rounded-md border border-(--pure-border-color)"
           @click="setStretch(!settings.stretch)"
         >
           <div

src/views/able/excel.vue

@@ -89,7 +89,7 @@ const exportExcel = () => {
       </el-link>
     </template>
     <el-button type="primary" @click="exportExcel">导出Excel</el-button>
-    <div class="h-[25rem] mt-3">
+    <div class="h-100 mt-3">
       <el-auto-resizer>
         <template #default="{ height, width }">
           <el-table-v2

src/views/account-settings/components/AccountManagement.vue

@@ -38,10 +38,7 @@ function onClick(item) {
 
 <template>
   <div
-    :class="[
+    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
-      'min-w-[180px]',
-      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
-    ]"
   >
     <h3 class="my-8!">账户管理</h3>
     <div v-for="(item, index) in list" :key="index">

src/views/account-settings/components/Preferences.vue

@@ -33,10 +33,7 @@ function onChange(val, item) {
 
 <template>
   <div
-    :class="[
+    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
-      'min-w-[180px]',
-      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
-    ]"
   >
     <h3 class="my-8!">偏好设置</h3>
     <div v-for="(item, index) in list" :key="index">

src/views/account-settings/components/Profile.vue

@@ -105,10 +105,7 @@ getMine().then(res => {
 
 <template>
   <div
-    :class="[
+    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
-      'min-w-[180px]',
-      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
-    ]"
   >
     <h3 class="my-8!">个人信息</h3>
     <el-form

src/views/account-settings/components/SecurityLog.vue

@@ -73,10 +73,7 @@ onMounted(() => {
 
 <template>
   <div
-    :class="[
+    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
-      'min-w-[180px]',
-      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
-    ]"
   >
     <h3 class="my-8!">安全日志</h3>
     <pure-table

src/views/account-settings/index.vue

@@ -70,16 +70,16 @@ getMine().then(res => {
   <el-container class="h-full">
     <el-aside
       v-if="isOpen"
-      class="pure-account-settings overflow-hidden px-2 dark:bg-(--el-bg-color)! border-r-[1px] border-[var(--pure-border-color)]"
+      class="pure-account-settings overflow-hidden px-2 dark:bg-(--el-bg-color)! border-r border-(--pure-border-color)"
       :width="deviceDetection() ? '180px' : '240px'"
     >
       <el-menu :default-active="witchPane" class="pure-account-settings-menu">
         <div
-          class="h-[50px]! text-[var(--pure-theme-menu-text)] cursor-pointer text-sm transition-all duration-300 ease-in-out hover:scale-105 will-change-transform transform-gpu origin-center hover:text-base! hover:text-[var(--pure-theme-menu-title-hover)]!"
+          class="h-[50px]! text-(--pure-theme-menu-text) cursor-pointer text-sm transition-all duration-300 ease-in-out hover:scale-105 will-change-transform transform-gpu origin-center hover:text-base! hover:text-(--pure-theme-menu-title-hover)!"
           @click="router.go(-1)"
         >
           <div
-            class="h-full flex items-center px-[var(--el-menu-base-level-padding)]"
+            class="h-full flex items-center px-(--el-menu-base-level-padding)"
           >
             <IconifyIconOffline :icon="leftLine" />
             <span class="ml-2">返回</span>

src/views/components/cascader.vue

@@ -38,7 +38,7 @@ const handleChange = value => {
     <el-row :gutter="24">
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center">
-          <span class="text-[var(--el-color-primary)]">
+          <span class="text-(--el-color-primary)">
             1. 二级联动（不带“全部”选项）
             <el-cascader
               v-model="selectedOptions1"
@@ -67,7 +67,7 @@ const handleChange = value => {
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center mt-3">
-          <span class="text-[var(--el-color-primary)]">
+          <span class="text-(--el-color-primary)">
             2. 二级联动（带有“全部”选项）
             <el-cascader
               v-model="selectedOptions3"
@@ -96,7 +96,7 @@ const handleChange = value => {
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center mt-3">
-          <span class="text-[var(--el-color-primary)]">
+          <span class="text-(--el-color-primary)">
             3. 三级联动（不带“全部”选项）
             <el-cascader
               v-model="selectedOptions2"
@@ -127,7 +127,7 @@ const handleChange = value => {
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center mt-3">
-          <span class="text-[var(--el-color-primary)]">
+          <span class="text-(--el-color-primary)">
             4. 三级联动（带"全部选项"）
             <el-cascader
               v-model="selectedOptions4"

src/views/components/upload/index.vue

@@ -190,7 +190,7 @@ const onDownload = () => {
               class="el-upload-list__item-delete"
               @click="handleRemove(file)"
             >
-              <span title="移除" class="hover:text-[var(--el-color-danger)]">
+              <span title="移除" class="hover:text-(--el-color-danger)">
                 <IconifyIconOffline
                   :icon="Delete"
                   class="hover:scale-125 duration-100"
@@ -222,7 +222,7 @@ const onDownload = () => {
         type="info"
         class="img-name"
       >
-        <p class="text-[#fff] dark:text-black">
+        <p class="text-white dark:text-black">
           {{ fileList[curOpenImgIndex].name }}
         </p>
       </div>

src/views/login/index.vue

@@ -135,7 +135,7 @@ watch(loginDay, value => {
       <!-- 国际化 -->
       <el-dropdown trigger="click">
         <globalization
-          class="hover:text-primary hover:bg-[transparent]! w-[20px] h-[20px] ml-1.5 cursor-pointer outline-hidden duration-300"
+          class="hover:text-primary hover:bg-transparent! w-[20px] h-[20px] ml-1.5 cursor-pointer outline-hidden duration-300"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">

src/views/monitor/logs/login/index.vue

@@ -103,7 +103,7 @@ const {
         <div
           v-if="selectedNum > 0"
           v-motion-fade
-          class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
+          class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
         >
           <div class="flex-auto">
             <span

src/views/monitor/logs/operation/index.vue

@@ -103,7 +103,7 @@ const {
         <div
           v-if="selectedNum > 0"
           v-motion-fade
-          class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
+          class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
         >
           <div class="flex-auto">
             <span

src/views/monitor/logs/system/index.vue

@@ -95,7 +95,7 @@ const {
         <div
           v-if="selectedNum > 0"
           v-motion-fade
-          class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
+          class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
         >
           <div class="flex-auto">
             <span

src/views/system/user/index.vue

@@ -128,7 +128,7 @@ const {
           <div
             v-if="selectedNum > 0"
             v-motion-fade
-            class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
+            class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
           >
             <div class="flex-auto">
               <span