更新tailwindcss版本至4.1.11，优化Assistant.vue和BaseDialog.vue组件，移除不必要的Modal参数，调整workerDirectory格式。

update lib
2026-04-14 21:33:39 +00:00 · 2025-07-17 11:58:32 +08:00 · 2025-07-17 09:41:15 +08:00
9 changed files with 41 additions and 31 deletions
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -102,14 +102,14 @@ tasks.jacocoTestReport {
 }

 jacoco {
-    toolVersion = "0.8.12"
+    toolVersion = "0.8.13"
    reportsDirectory.set(layout.buildDirectory.dir("reports/jacoco"))
 }

 pmd {
    sourceSets = listOf(java.sourceSets.findByName("main"))
    isConsoleOutput = true
-    toolVersion = "7.9.0"
+    toolVersion = "7.15.0"
    rulesMinimumPriority.set(5)
    ruleSetFiles = files("pmd-rules.xml")
 }
@@ -125,7 +125,7 @@ spotless {
    }

    java {
-        googleJavaFormat("1.25.2").reflowLongStrings()
+        googleJavaFormat("1.28.0").reflowLongStrings()
        formatAnnotations()
    }

--- a/backend/src/main/java/com/zl/mjga/aspect/LoggingAspect.java
+++ b/backend/src/main/java/com/zl/mjga/aspect/LoggingAspect.java
@@ -48,11 +48,11 @@ public class LoggingAspect {
    return processWithLogging(joinPoint, aopLog);
  }

-//  @Around("execution(* com.zl.mjga.service..*(..))")
-//  public Object logService(ProceedingJoinPoint joinPoint) throws Throwable {
-//    AopLog aopLog = new AopLog();
-//    return processWithLogging(joinPoint, aopLog);
-//  }
+  //  @Around("execution(* com.zl.mjga.service..*(..))")
+  //  public Object logService(ProceedingJoinPoint joinPoint) throws Throwable {
+  //    AopLog aopLog = new AopLog();
+  //    return processWithLogging(joinPoint, aopLog);
+  //  }

  private Object processWithLogging(ProceedingJoinPoint joinPoint, AopLog aopLog) throws Throwable {
    if (shouldSkipLogging(joinPoint) || !isUserAuthenticated()) {
--- a/backend/src/main/java/com/zl/mjga/dto/aoplog/AopLogQueryDto.java
+++ b/backend/src/main/java/com/zl/mjga/dto/aoplog/AopLogQueryDto.java
@@ -1,8 +1,6 @@
 package com.zl.mjga.dto.aoplog;

-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
--- a/backend/src/main/java/com/zl/mjga/repository/AopLogRepository.java
+++ b/backend/src/main/java/com/zl/mjga/repository/AopLogRepository.java
@@ -47,14 +47,16 @@ public class AopLogRepository extends AopLogDao {
        .where(buildConditions(queryDto));
  }

-
  public SelectConditionStep<Record> selectByWithoutReturnValue(AopLogQueryDto queryDto) {
    return ctx()
-            .select(AOP_LOG.asterisk().except(AOP_LOG.RETURN_VALUE, AOP_LOG.METHOD_ARGS), USER.USERNAME, DSL.count().over().as("total_count"))
-            .from(AOP_LOG)
-            .leftJoin(USER)
-            .on(AOP_LOG.USER_ID.eq(USER.ID))
-            .where(buildConditions(queryDto));
+        .select(
+            AOP_LOG.asterisk().except(AOP_LOG.RETURN_VALUE, AOP_LOG.METHOD_ARGS),
+            USER.USERNAME,
+            DSL.count().over().as("total_count"))
+        .from(AOP_LOG)
+        .leftJoin(USER)
+        .on(AOP_LOG.USER_ID.eq(USER.ID))
+        .where(buildConditions(queryDto));
  }

  private Condition buildConditions(AopLogQueryDto queryDto) {
--- a/backend/src/test/java/com/zl/mjga/integration/e2e/SignE2ETest.java
+++ b/backend/src/test/java/com/zl/mjga/integration/e2e/SignE2ETest.java
@@ -53,7 +53,7 @@ public class SignE2ETest {
        .uri("/auth/sign-up")
        .contentType(MediaType.APPLICATION_JSON)
        .bodyValue(
-            """
+"""
 {
  "username": "test_5fab32c22a3e",
  "password": "test_eab28b939ba1"
@@ -75,7 +75,7 @@ public class SignE2ETest {
        .uri("/auth/sign-in")
        .contentType(MediaType.APPLICATION_JSON)
        .bodyValue(
-            """
+"""
 {
  "username": "test_5fab32c22a3e",
  "password": "test_eab28b939ba1"
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 				"marked": "^15.0.12",
 				"openapi-fetch": "^0.13.5",
 				"pinia": "^3.0.1",
-				"tailwindcss": "^4.0.14",
+				"tailwindcss": "^4.1.11",
 				"vue": "^3.5.13",
 				"vue-router": "^4.5.0",
 				"zod": "^3.24.2"
@@ -1832,6 +1832,12 @@
 				"tailwindcss": "4.1.6"
 			}
 		},
+		"node_modules/@tailwindcss/node/node_modules/tailwindcss": {
+			"version": "4.1.6",
+			"resolved": "http://mirrors.tencent.com/npm/tailwindcss/-/tailwindcss-4.1.6.tgz",
+			"integrity": "sha512-j0cGLTreM6u4OWzBeLBpycK0WIh8w7kSwcUsQZoGLHZ7xDTdM69lN64AgoIEEwFi0tnhs4wSykUa5YWxAzgFYg==",
+			"license": "MIT"
+		},
 		"node_modules/@tailwindcss/oxide": {
 			"version": "4.1.6",
 			"resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.6.tgz",
@@ -2079,6 +2085,12 @@
 				"vite": "^5.2.0 || ^6"
 			}
 		},
+		"node_modules/@tailwindcss/vite/node_modules/tailwindcss": {
+			"version": "4.1.6",
+			"resolved": "http://mirrors.tencent.com/npm/tailwindcss/-/tailwindcss-4.1.6.tgz",
+			"integrity": "sha512-j0cGLTreM6u4OWzBeLBpycK0WIh8w7kSwcUsQZoGLHZ7xDTdM69lN64AgoIEEwFi0tnhs4wSykUa5YWxAzgFYg==",
+			"license": "MIT"
+		},
 		"node_modules/@testing-library/dom": {
 			"version": "10.4.0",
 			"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -3655,7 +3667,7 @@
 		},
 		"node_modules/flowbite": {
 			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/flowbite/-/flowbite-3.1.2.tgz",
+			"resolved": "http://mirrors.tencent.com/npm/flowbite/-/flowbite-3.1.2.tgz",
 			"integrity": "sha512-MkwSgbbybCYgMC+go6Da5idEKUFfMqc/AmSjm/2ZbdmvoKf5frLPq/eIhXc9P+rC8t9boZtUXzHDgt5whZ6A/Q==",
 			"license": "MIT",
 			"dependencies": {
@@ -5705,9 +5717,9 @@
 			}
 		},
 		"node_modules/tailwindcss": {
-			"version": "4.1.6",
-			"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.6.tgz",
-			"integrity": "sha512-j0cGLTreM6u4OWzBeLBpycK0WIh8w7kSwcUsQZoGLHZ7xDTdM69lN64AgoIEEwFi0tnhs4wSykUa5YWxAzgFYg==",
+			"version": "4.1.11",
+			"resolved": "http://mirrors.tencent.com/npm/tailwindcss/-/tailwindcss-4.1.11.tgz",
+			"integrity": "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==",
 			"license": "MIT"
 		},
 		"node_modules/tapable": {
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -31,7 +31,7 @@
 		"marked": "^15.0.12",
 		"openapi-fetch": "^0.13.5",
 		"pinia": "^3.0.1",
-		"tailwindcss": "^4.0.14",
+		"tailwindcss": "^4.1.11",
 		"vue": "^3.5.13",
 		"vue-router": "^4.5.0",
 		"zod": "^3.24.2"
@@ -59,6 +59,8 @@
 		"vue-tsc": "^2.2.8"
 	},
 	"msw": {
-		"workerDirectory": ["public"]
+		"workerDirectory": [
+			"public"
+		]
 	}
 }
--- a/frontend/src/components/common/Assistant.vue
+++ b/frontend/src/components/common/Assistant.vue
@@ -445,10 +445,7 @@ onMounted(async () => {
 	if ($userDeleteModalElement) {
 		userDeleteModal.value = new Modal(
 			$userDeleteModalElement,
-			{},
-			{
-				id: "user-delete-modal",
-			},
+			{}
 		);
 	}
 	const $departmentDeleteModalElement: HTMLElement | null =
--- a/frontend/src/components/modals/BaseDialog.vue
+++ b/frontend/src/components/modals/BaseDialog.vue
@@ -26,7 +26,7 @@
 </template>

 <script setup lang="ts">
-import { Modal, initFlowbite } from "flowbite";
+import { initFlowbite } from "flowbite";
 import { computed, onMounted } from "vue";

 export type ModalSize =
@@ -72,7 +72,6 @@ const maxWidthClass = computed(() => {
 	return sizes[props.size || "md"];
 });

-// 确保Flowbite初始化，这对于PopupModal的正常工作至关重要
 onMounted(() => {
 	initFlowbite();
 });
Author	SHA1	Message	Date
Chuck1sn	b759275cf3	更新tailwindcss版本至4.1.11，优化Assistant.vue和BaseDialog.vue组件，移除不必要的Modal参数，调整workerDirectory格式。	2025-07-17 11:58:32 +08:00
Chuck1sn	5f0f0fbd14	update lib	2025-07-17 09:41:15 +08:00