Merge pull request 'v0.0.4' (#4) from dev into master

Reviewed-on: #4

.gitea/workflows/ci.yml

@@ -0,0 +1,111 @@
+name: CI/CD
+
+on:
+  pull_request:
+    branches:
+      - master
+    types:
+      - closed
+
+jobs:
+  build-deploy:
+    runs-on: act_runner_java
+    if: ${{ github.event.pull_request.merged == true }}
+    env:
+      JAVA_HOME: /usr/lib/jvm/java-25-openjdk
+    steps:
+      - name: Checkout code
+        run: |
+          git clone ${{ github.server_url }}/${{ github.repository }}.git .
+          git checkout ${{ github.sha }}
+      - name: Set up environment
+        run: |
+          echo "PR #${{ github.event.number }} merged into master"
+          echo "Source branch: ${{ github.event.pull_request.head.ref }}"
+          echo "Target branch: ${{ github.event.pull_request.base.ref }}"
+      - name: Run tests
+        run: |
+          echo "Running test suite..."
+      - name: Build project
+        run: |
+          mvn -B -DskipTests clean package source:jar javadoc:jar
+      - name: Deploy to Nexus
+        if: success()
+        run: |
+          if [ -z "${{ secrets.NEXUS_USERNAME }}" ] || [ -z "${{ secrets.NEXUS_PASSWORD }}" ]; then
+            echo "Missing secrets.NEXUS_USERNAME or secrets.NEXUS_PASSWORD"
+            exit 1
+          fi
+          mkdir -p ~/.m2
+          cat > ~/.m2/settings.xml <<EOF
+          <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+            <servers>
+              <server>
+                <id>timi-nexus</id>
+                <username>${{ secrets.NEXUS_USERNAME }}</username>
+                <password>${{ secrets.NEXUS_PASSWORD }}</password>
+              </server>
+            </servers>
+          </settings>
+          EOF
+          version=$(mvn -q -DforceStdout help:evaluate -Dexpression=project.version)
+          artifact_id=$(mvn -q -DforceStdout help:evaluate -Dexpression=project.artifactId)
+          main_jar="target/${artifact_id}-${version}.jar"
+          sources_jar="target/${artifact_id}-${version}-sources.jar"
+          javadoc_jar="target/${artifact_id}-${version}-javadoc.jar"
+          if [ ! -f "$main_jar" ] || [ ! -f "$sources_jar" ] || [ ! -f "$javadoc_jar" ]; then
+            echo "Missing build artifacts in target"
+            exit 1
+          fi
+          mvn -B deploy:deploy-file \
+            -Dfile="$main_jar" \
+            -Dsources="$sources_jar" \
+            -Djavadoc="$javadoc_jar" \
+            -DpomFile="./pom.xml" \
+            -Durl="https://nexus.imyeyu.com/repository/maven-releases/" \
+            -DrepositoryId="timi-nexus" \
+            -Dhttps.protocols=TLSv1.2 \
+            -Djdk.tls.client.protocols=TLSv1.2
+      - name: Create release
+        if: ${{ success() && startsWith(github.event.pull_request.title, 'v') }}
+        env:
+          GITEA_TOKEN: ${{ secrets.RUNNER_TOKEN }}
+          GITEA_SERVER_URL: ${{ github.server_url }}
+          GITEA_REPOSITORY: ${{ github.repository }}
+          RELEASE_TAG: ${{ github.event.pull_request.title }}
+          RELEASE_TARGET: ${{ github.sha }}
+        run: |
+          if [ -z "$GITEA_TOKEN" ]; then
+            echo "Missing secrets.RUNNER_TOKEN"
+            exit 1
+          fi
+          api_url="$GITEA_SERVER_URL/api/v1/repos/$GITEA_REPOSITORY/releases"
+          payload=$(cat <<EOF
+          {
+            "tag_name": "$RELEASE_TAG",
+            "name": "$RELEASE_TAG",
+            "target_commitish": "$RELEASE_TARGET",
+            "draft": false,
+            "prerelease": false
+          }
+          EOF
+          )
+          response=$(curl -sS -X POST "$api_url" \
+            -H "Authorization: token $GITEA_TOKEN" \
+            -H "Content-Type: application/json" \
+            -d "$payload")
+          release_id=$(echo "$response" | grep -o '"id":[0-9]*' | head -n 1 | grep -o '[0-9]*')
+          if [ -z "$release_id" ] || echo "$response" | grep -q '"message"'; then
+            echo "Create release failed: $response"
+            exit 1
+          fi
+          echo "Release created: id=$release_id"
+          for asset_path in target/*.jar; do
+            asset_name=$(basename "$asset_path")
+            curl -sS -X POST "$api_url/$release_id/assets?name=$asset_name" \
+              -H "Authorization: token $GITEA_TOKEN" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"$asset_path"
+          done

.gitignore

@@ -1,3 +1,7 @@
+/.serena
+/CLAUDE.md
+/AGENTS.md
+
 target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/

.idea/.gitignore

@@ -1,3 +1,4 @@
 # Default ignored files
 /shelf/
 /workspace.xml
+/CopilotChatHistory.xml

.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" project-jdk-name="temurin-25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

pom.xml

@@ -6,16 +6,88 @@
 
 	<groupId>com.imyeyu.fx</groupId>
 	<artifactId>timi-fx</artifactId>
-	<version>0.0.1</version>
+	<version>0.0.4</version>
 
 	<properties>
-		<fx.version>21.0.2</fx.version>
+		<fx.version>25.0.3</fx.version>
 		<maven.test.skip>true</maven.test.skip>
-		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.source>25</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
+		<maven.compiler.target>25</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>3.1.4</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.4.0</version>
+			</plugin>
+			<plugin>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok-maven-plugin</artifactId>
+				<version>1.18.20.0</version>
+				<configuration>
+					<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+					<outputDirectory>${project.build.directory}/delombok</outputDirectory>
+					<addOutputDirectory>false</addOutputDirectory>
+					<encoding>UTF-8</encoding>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>delombok</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.projectlombok</groupId>
+						<artifactId>lombok</artifactId>
+						<version>1.18.46</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.12.0</version>
+				<configuration>
+					<sourcepath>${project.build.directory}/delombok</sourcepath>
+					<encoding>UTF-8</encoding>
+					<charset>UTF-8</charset>
+					<docencoding>UTF-8</docencoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<distributionManagement>
+		<repository>
+			<id>timi_nexus</id>
+			<url>https://nexus.imyeyu.com/repository/maven-releases/</url>
+		</repository>
+	</distributionManagement>
+
+	<repositories>
+		<repository>
+			<id>timi_nexus</id>
+			<url>https://nexus.imyeyu.com/repository/maven-public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.openjfx</groupId>
@@ -25,7 +97,18 @@
 		<dependency>
 			<groupId>com.imyeyu.config</groupId>
 			<artifactId>timi-config</artifactId>
-			<version>0.0.1</version>
+			<version>0.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.imyeyu.inject</groupId>
+			<artifactId>timi-inject</artifactId>
+			<version>0.0.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.46</version>
 		</dependency>
 	</dependencies>
 </project>

src/main/java/com/imyeyu/fx/TimiFX.java

@@ -1,10 +1,18 @@
 package com.imyeyu.fx;
 
+import com.imyeyu.fx.utils.ScreenFX;
+import com.imyeyu.java.bean.Callback;
+import com.imyeyu.java.ref.Ref;
+import com.imyeyu.utils.Calc;
+import com.imyeyu.utils.OS;
 import javafx.application.Application;
 import javafx.application.Platform;
+import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.event.EventHandler;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Node;
@@ -18,10 +26,6 @@ import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
-import com.imyeyu.fx.utils.ScreenFX;
-import com.imyeyu.java.ref.Ref;
-import com.imyeyu.utils.Calc;
-import com.imyeyu.utils.OS;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -281,7 +285,7 @@ public final class TimiFX {
 	 * @param control 控件({@link javafx.scene.control.ListView}, {@link javafx.scene.control.TableView} 等)
 	 * @param index   指定项下标
 	 */
-	public static  void scrollToCenter(Control control, int index) {
+	public static void scrollToCenter(Control control, int index) {
 		try {
 			if (control.getSkin() == null) {
 				return;
@@ -291,6 +295,9 @@ public final class TimiFX {
 			if (flow == null) {
 				throw new UnsupportedOperationException("unsupported this control");
 			}
+			if (flow.getCellCount() == 0 || flow.getCell(0) == null) {
+				return;
+			}
 			int offset = Calc.floor(flow.getHeight() * .5 / flow.getCell(0).getHeight());
 			// 滚动
 			Method method = Ref.getMethod(control.getClass(), "scrollTo", int.class);
@@ -301,7 +308,38 @@ public final class TimiFX {
 		}
 	}
 
+	public static void addScrollFinishedListener(Control control, Callback callback) {
+		BooleanProperty finish = new SimpleBooleanProperty(false);
 
+		control.skinProperty().addListener((obs, o, skin) -> {
+			try {
+				VirtualFlow<?> flow = Ref.getFieldValue(control.getSkin(), "flow", VirtualFlow.class);
+				if (flow == null) {
+					throw new UnsupportedOperationException("unsupported this control");
+				}
+				// 监听总高度和视口高度的变化
+				Observable[] dependencies = {flow.layoutBoundsProperty(), flow.parentProperty()};
+				BooleanBinding binding = Bindings.createBooleanBinding(() -> {
+					double totalHeight = flow.prefHeight(-1);
+					double viewportHeight = flow.getLayoutBounds().getHeight();
+					if (viewportHeight <= 0 || totalHeight <= 0) {
+						return false;
+					}
+					double maxVValue = (totalHeight - viewportHeight) / viewportHeight;
+					double currentVValue = flow.getLayoutY() / viewportHeight;
+					return currentVValue >= (maxVValue - 0.01);
+				}, dependencies);
+				finish.bind(binding);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		finish.addListener((obs, o, isFinished) -> {
+			if (isFinished) {
+				callback.handler();
+			}
+		});
+	}
 
 	/**
 	 * 重启程序，命令需自定

src/main/java/com/imyeyu/fx/bean/Interpolates.java

@@ -1,6 +1,7 @@
 package com.imyeyu.fx.bean;
 
 import com.sun.scenario.animation.SplineInterpolator;
+import lombok.Getter;
 
 /**
  * 贝塞尔曲线，动画运动方式，常用 {@link #EASE_OUT_EXPO}
@@ -8,38 +9,50 @@ import com.sun.scenario.animation.SplineInterpolator;
  * @author 夜雨
  * @since 2022-02-16 22:43
  */
+@Getter
 public enum Interpolates {
 
-	/** EASE              ( .25,   .1,  .25,    1) */ EASE              ( .25,   .1,  .25,    1),
+	/** EASE              ( .25,   .1,  .25,    1) */ EASE(.25, .1, .25, 1),
-	/** LINEAR            (   0,    0,    1,    1) */ LINEAR            (   0,    0,    1,    1),
+	/** LINEAR            (   0,    0,    1,    1) */ LINEAR(0, 0, 1, 1),
-	/** EASE_IN           ( .42,    0,    1,    1) */ EASE_IN           ( .42,    0,    1,    1),
+	/** EASE_IN           ( .42,    0,    1,    1) */ EASE_IN(.42, 0, 1, 1),
-	/** EASE_OUT          (   0,    0,  .58,    1) */ EASE_OUT          (   0,    0,  .58,    1),
+	/** EASE_OUT          (   0,    0,  .58,    1) */ EASE_OUT(0, 0, .58, 1),
-	/** EASE_IN_OUT       ( .42,    0,  .58,    1) */ EASE_IN_OUT       ( .42,    0,  .58,    1),
+	/** EASE_IN_OUT       ( .42,    0,  .58,    1) */ EASE_IN_OUT(.42, 0, .58, 1),
-	/** EASE_IN_SINE      ( .47,    0, .745, .715) */ EASE_IN_SINE      ( .47,    0, .745, .715),
+	/** EASE_IN_SINE      ( .47,    0, .745, .715) */ EASE_IN_SINE(.47, 0, .745, .715),
-	/** EASE_OUT_SINE     ( .39, .575, .565,    1) */ EASE_OUT_SINE     ( .39, .575, .565,    1),
+	/** EASE_OUT_SINE     ( .39, .575, .565,    1) */ EASE_OUT_SINE(.39, .575, .565, 1),
-	/** EASE_IN_OUT_SINE  (.445,  .05,  .55,  .95) */ EASE_IN_OUT_SINE  (.445,  .05,  .55,  .95),
+	/** EASE_IN_OUT_SINE  (.445,  .05,  .55,  .95) */ EASE_IN_OUT_SINE(.445, .05, .55, .95),
-	/** EASE_IN_QUAD      ( .55, .085,  .68,  .53) */ EASE_IN_QUAD      ( .55, .085,  .68,  .53),
+	/** EASE_IN_QUAD      ( .55, .085,  .68,  .53) */ EASE_IN_QUAD(.55, .085, .68, .53),
-	/** EASE_OUT_QUAD     ( .25,  .46,  .45,  .94) */ EASE_OUT_QUAD     ( .25,  .46,  .45,  .94),
+	/** EASE_OUT_QUAD     ( .25,  .46,  .45,  .94) */ EASE_OUT_QUAD(.25, .46, .45, .94),
-	/** EASE_IN_OUT_QUAD  (.455,  .03, .515, .955) */ EASE_IN_OUT_QUAD  (.455,  .03, .515, .955),
+	/** EASE_IN_OUT_QUAD  (.455,  .03, .515, .955) */ EASE_IN_OUT_QUAD(.455, .03, .515, .955),
-	/** EASE_IN_CUBIC     ( .55, .055, .675,  .19) */ EASE_IN_CUBIC     ( .55, .055, .675,  .19),
+	/** EASE_IN_CUBIC     ( .55, .055, .675,  .19) */ EASE_IN_CUBIC(.55, .055, .675, .19),
-	/** EASE_OUT_CUBIC    (.215,  .61, .355,    1) */ EASE_OUT_CUBIC    (.215,  .61, .355,    1),
+	/** EASE_OUT_CUBIC    (.215,  .61, .355,    1) */ EASE_OUT_CUBIC(.215, .61, .355, 1),
-	/** EASE_IN_OUT_CUBIC (.645, .045, .355,    1) */ EASE_IN_OUT_CUBIC (.645, .045, .355,    1),
+	/** EASE_IN_OUT_CUBIC (.645, .045, .355,    1) */ EASE_IN_OUT_CUBIC(.645, .045, .355, 1),
-	/** EASE_IN_QUART     (.895,  .03, .685,  .22) */ EASE_IN_QUART     (.895,  .03, .685,  .22),
+	/** EASE_IN_QUART     (.895,  .03, .685,  .22) */ EASE_IN_QUART(.895, .03, .685, .22),
-	/** EASE_OUT_QUART    (.165,  .84,  .44,    1) */ EASE_OUT_QUART    (.165,  .84,  .44,    1),
+	/** EASE_OUT_QUART    (.165,  .84,  .44,    1) */ EASE_OUT_QUART(.165, .84, .44, 1),
-	/** EASE_IN_OUT_QUART ( .77,    0, .175,    1) */ EASE_IN_OUT_QUART ( .77,    0, .175,    1),
+	/** EASE_IN_OUT_QUART ( .77,    0, .175,    1) */ EASE_IN_OUT_QUART(.77, 0, .175, 1),
-	/** EASE_IN_QUINT     (.755,  .05, .855,  .06) */ EASE_IN_QUINT     (.755,  .05, .855,  .06),
+	/** EASE_IN_QUINT     (.755,  .05, .855,  .06) */ EASE_IN_QUINT(.755, .05, .855, .06),
-	/** EASE_OUT_QUINT    ( .23,    1,  .32,    1) */ EASE_OUT_QUINT    ( .23,    1,  .32,    1),
+	/** EASE_OUT_QUINT    ( .23,    1,  .32,    1) */ EASE_OUT_QUINT(.23, 1, .32, 1),
-	/** EASE_IN_OUT_QUINT ( .86,    0,  .07,    1) */ EASE_IN_OUT_QUINT ( .86,    0,  .07,    1),
+	/** EASE_IN_OUT_QUINT ( .86,    0,  .07,    1) */ EASE_IN_OUT_QUINT(.86, 0, .07, 1),
-	/** EASE_IN_EXPO      ( .95,  .05, .795, .035) */ EASE_IN_EXPO      ( .95,  .05, .795, .035),
+	/** EASE_IN_EXPO      ( .95,  .05, .795, .035) */ EASE_IN_EXPO(.95, .05, .795, .035),
-	/** EASE_OUT_EXPO     ( .19,    1,  .22,    1) */ EASE_OUT_EXPO     ( .19,    1,  .22,    1),
+	/** EASE_OUT_EXPO     ( .19,    1,  .22,    1) */ EASE_OUT_EXPO(.19, 1, .22, 1),
-	/** EASE_IN_OUT_EXPO  (   1,    0,    0,    1) */ EASE_IN_OUT_EXPO  (   1,    0,    0,    1),
+	/** EASE_IN_OUT_EXPO  (   1,    0,    0,    1) */ EASE_IN_OUT_EXPO(1, 0, 0, 1),
-	/** EASE_IN_CIRC      (  .6,  .04,  .98, .335) */ EASE_IN_CIRC      (  .6,  .04,  .98, .335),
+	/** EASE_IN_CIRC      (  .6,  .04,  .98, .335) */ EASE_IN_CIRC(.6, .04, .98, .335),
-	/** EASE_OUT_CIRC     (.075,  .82, .165,    1) */ EASE_OUT_CIRC     (.075,  .82, .165,    1),
+	/** EASE_OUT_CIRC     (.075,  .82, .165,    1) */ EASE_OUT_CIRC(.075, .82, .165, 1),
-	/** EASE_IN_BACK      (  .6,  .28, .735, .045) */ EASE_IN_BACK      (  .6,  .28, .735, .045);
+	/** EASE_IN_BACK      (  .6,  .28, .735, .045) */ EASE_IN_BACK(.6, .28, .735, .045);
 
+	/** 插值器 */
 	final SplineInterpolator value;
 
-	final double x1, y1, x2, y2;
+	/** 控制的 1 的横坐标 */
+	final double x1;
+
+	/** 控制点 1 的纵坐标 */
+	final double y1;
+
+	/** 控制点 2 的横坐标 */
+	final double x2;
+
+	/** 控制点 2 的纵坐标 */
+	final double y2;
 
 	Interpolates(double px1, double py1, double px2, double py2) {
 		x1 = px1;
@@ -55,7 +68,7 @@ public enum Interpolates {
 	 * @param precision 精度，构造数据量，不可小于 4
 	 * @return 贝塞尔点列表，第二维 [0]: x 轴坐标，[1]: y 轴坐标
 	 */
-	public double[][] buildBezierPoint(double precision) {
+	public double[][] buildBezierPoint(long precision) {
 		return buildBezierPoint(1, precision);
 	}
 
@@ -66,11 +79,10 @@ public enum Interpolates {
 	 * @param precision 精度，构造数据量，不可小于 4
 	 * @return 贝塞尔点列表，第二维 [0]: x 轴坐标，[1]: y 轴坐标
 	 */
-	public double[][] buildBezierPoint(double boost, double precision) {
+	public double[][] buildBezierPoint(double boost, long precision) {
 		if (precision < 4) {
-			throw new IllegalArgumentException("precision can not lessthan 4: " + precision);
+			throw new IllegalArgumentException("precision can not less than 4: " + precision);
 		}
-		precision = 1D / precision;
 
 		Double[][] cps = new Double[4][2];
 		cps[0][0] = cps[0][1] = 0D;
@@ -112,7 +124,7 @@ public enum Interpolates {
 	 * @param precision 精度，构造数据量，不可小于 4
 	 * @return 贝塞尔点列表，值为 y 轴坐标
 	 */
-	public double[] buildBezierPointValue(double precision) {
+	public double[] buildBezierPointValue(long precision) {
 		return buildBezierPointValue(1, precision);
 	}
 
@@ -123,7 +135,7 @@ public enum Interpolates {
 	 * @param precision 精度，构造数据量，不可小于 4
 	 * @return 贝塞尔点列表，值为 y 轴坐标
 	 */
-	public double[] buildBezierPointValue(double boost, double precision) {
+	public double[] buildBezierPointValue(double boost, long precision) {
 		double[][] points = buildBezierPoint(boost, precision);
 		double[] result = new double[points.length];
 		for (int i = 0; i < points.length; i++) {
@@ -132,48 +144,4 @@ public enum Interpolates {
 		return result;
 	}
 
-	/**
-	 * 获取控制点 1 的横坐标
-	 *
-	 * @return 控制的 1 的横坐标
-	 */
-	public double getX1() {
-		return x1;
-	}
-
-	/**
-	 * 获取控制点 1 的纵坐标
-	 *
-	 * @return 控制的 1 的纵坐标
-	 */
-	public double getY1() {
-		return y1;
-	}
-
-	/**
-	 * 获取控制点 2 的横坐标
-	 *
-	 * @return 控制的 2 的横坐标
-	 */
-	public double getX2() {
-		return x2;
-	}
-
-	/**
-	 * 获取控制点 2 的纵坐标
-	 *
-	 * @return 控制的 2 的纵坐标
-	 */
-	public double getY2() {
-		return y2;
-	}
-
-	/**
-	 * 获取插值器
-	 *
-	 * @return 插值器
-	 */
-	public SplineInterpolator getValue() {
-		return value;
-	}
 }

src/main/java/com/imyeyu/fx/config/BindingsConfig.java

@@ -155,6 +155,9 @@ public final class BindingsConfig {
 
 		@Override
 		protected String serialize(Field field, ObjectProperty<Color> property) {
+			if (property.getValue() == null) {
+				return null;
+			}
 			return TimiFX.toHexString(property.getValue());
 		}
 
@@ -173,7 +176,14 @@ public final class BindingsConfig {
 
 		@Override
 		protected String serialize(Field field, ObjectProperty<Paint> property) {
-			return TimiFX.toHexString(Color.valueOf(property.toString()));
+			Paint paint = property.getValue();
+			if (paint == null) {
+				return null;
+			}
+			if (paint instanceof Color color) {
+				return TimiFX.toHexString(color);
+			}
+			return paint.toString();
 		}
 
 		@Override
@@ -191,6 +201,9 @@ public final class BindingsConfig {
 
 		@Override
 		protected String serialize(Field field, ObjectProperty<Background> property) {
+			if (property.getValue() == null || property.getValue().getFills().isEmpty()) {
+				return null;
+			}
 			return TimiFX.toHexString(Color.valueOf(property.getValue().getFills().getFirst().getFill().toString()));
 		}
 
@@ -225,7 +238,7 @@ public final class BindingsConfig {
 					throw new RuntimeException(e);
 				}
 			}
-			throw new RuntimeException("not found " + field.getType() + " property converter");
+			throw new RuntimeException("未找到 " + field.getType() + " 属性转换器");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -249,7 +262,7 @@ public final class BindingsConfig {
 					throw new RuntimeException(e);
 				}
 			}
-			throw new RuntimeException("not found " + genericType + " property converter");
+			throw new RuntimeException("未找到 " + genericType + " 属性转换器");
 		}
 	};
 

src/main/java/com/imyeyu/fx/inject/FXTimiInject.java

@@ -0,0 +1,74 @@
+package com.imyeyu.fx.inject;
+
+import com.imyeyu.inject.TimiInject;
+import javafx.application.Application;
+import javafx.stage.Stage;
+
+/**
+ * JavaFX 与 TimiInject 集成支持
+ * <p>
+ * 提供 JavaFX Application 和 Stage 对象到依赖注入容器的集成。
+ * 在 Application.start() 方法中调用 {@link #register} 方法即可完成注册和注入。
+ * <p>
+ * 使用示例：
+ * <pre>
+ * public class Main extends Application {
+ *     &#64;Inject
+ *     private SomeService service;
+ *
+ *     &#64;Override
+ *     public void start(Stage stage) {
+ *         TimiInject inject = FXTimiInject.run(Main.class, this, stage);
+ *         // 现在 service 已经被注入，可以使用了
+ *     }
+ * }
+ * </pre>
+ *
+ * @author 夜雨
+ */
+public final class FXTimiInject {
+
+	private FXTimiInject() {
+		throw new UnsupportedOperationException("工具类不允许实例化");
+	}
+
+	/**
+	 * 启动容器并在初始化前注册 Application 和 Stage
+	 *
+	 * @param applicationClass 启动类
+	 * @param app              JavaFX Application 实例
+	 * @param stage            JavaFX 主舞台（Primary Stage）
+	 * @return TimiInject 容器实例
+	 */
+	public static TimiInject run(Class<?> applicationClass, Application app, Stage stage) {
+		TimiInject inject = TimiInject.run(applicationClass, injector -> registerBeans(injector, app, stage));
+		inject.inject(app);
+		return inject;
+	}
+
+	/**
+	 * 将 JavaFX Application 和 Stage 注册到容器，并对 Application 执行字段注入
+	 * <p>
+	 * 此方法会：
+	 * <ol>
+	 *     <li>将 Application 对象以 "application" 为名称注册到容器</li>
+	 *     <li>将 Stage 对象以 "stage" 和 "primaryStage" 为名称注册到容器</li>
+	 *     <li>对 Application 对象执行字段注入，使其 @Inject 字段生效</li>
+	 * </ol>
+	 *
+	 * @param inject TimiInject 容器实例
+	 * @param app    JavaFX Application 实例
+	 * @param stage  JavaFX 主舞台（Primary Stage）
+	 */
+	public static void register(TimiInject inject, Application app, Stage stage) {
+		registerBeans(inject, app, stage);
+		inject.inject(app);
+	}
+
+	private static void registerBeans(TimiInject inject, Application app, Stage stage) {
+		// 注册 Application 和 Stage 到容器
+		inject.registerBean("application", app);
+		inject.registerBean("stage", stage);
+		inject.registerBean("primaryStage", stage);
+	}
+}

src/main/java/com/imyeyu/fx/listener/NewValueListener.java

@@ -0,0 +1,18 @@
+package com.imyeyu.fx.listener;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+
+/**
+ * @author 夜雨
+ * @since 2025-07-21 23:22
+ */
+public interface NewValueListener<T> extends ChangeListener<T> {
+
+	void newValue(T newValue);
+
+	@Override
+	default void changed(ObservableValue<? extends T> observable, T oldValue, T newValue) {
+		this.newValue(newValue);
+	}
+}

src/main/java/com/imyeyu/fx/listener/OldValueListener.java

@@ -0,0 +1,17 @@
+package com.imyeyu.fx.listener;
+
+import javafx.beans.value.ChangeListener;
+
+/**
+ * @author 夜雨
+ * @since 2025-07-21 23:41
+ */
+public interface OldValueListener<T> extends ChangeListener<T> {
+
+	void oldValue(T oldValue);
+
+	@Override
+	default void changed(javafx.beans.value.ObservableValue<? extends T> observable, T oldValue, T newValue) {
+		this.oldValue(oldValue);
+	}
+}

src/main/java/com/imyeyu/fx/task/PublicTask.java

@@ -8,7 +8,7 @@ import javafx.concurrent.Task;
  * @author 夜雨
  * @since 2022-01-08 16:24
  */
-abstract class PublicTask<T> extends Task<T> {
+public abstract class PublicTask<T> extends Task<T> {
 
 	/**
 	 * 更新数据

src/main/java/com/imyeyu/fx/task/RunAsync.java

@@ -52,12 +52,8 @@ import com.imyeyu.java.bean.CallbackReturn;
  * </pre>
  *
  * @author 夜雨
- * @since
+ * @since 2021-02-13 12:56
- *
  * @param <T> 数据处理返回类型
- *
- * @author 夜雨
- * @version 2021-02-13 12:56
  */
 public abstract class RunAsync<T> extends Service<T> {
 
@@ -192,6 +188,7 @@ public abstract class RunAsync<T> extends Service<T> {
 	/** 中断任务 */
 	public void interrupt() {
 		isInterrupted = true;
+		cancel();
 	}
 
 	// ---------- 静态构造 ----------

src/main/java/com/imyeyu/fx/task/RunAsyncDaemon.java

@@ -1,8 +1,8 @@
 package com.imyeyu.fx.task;
 
-import javafx.concurrent.Task;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
+import javafx.concurrent.Task;
 
 /**
  * 异步守护执行，如果 {@link RunAsync} 超过指定时间没有回调，将触发 onTimeout
@@ -17,6 +17,9 @@ public abstract class RunAsyncDaemon<T> extends RunAsync<T> {
 	/** true 为回调成功 */
 	protected boolean isCallBack;
 
+	/** true 为回调超时 */
+	protected boolean isTimeout;
+
 	/** 默认构造器（执行超时 2 秒） */
 	public RunAsyncDaemon() {
 		this(2000);
@@ -35,21 +38,23 @@ public abstract class RunAsyncDaemon<T> extends RunAsync<T> {
 	protected Task<T> createTask() {
 		super.createTask();
 
+		isTimeout = false;
 		isCallBack = false;
 		task.setOnSucceeded(e -> {
+			isCallBack = true;
 			onFinish();
 			onFinish(lastT);
 			onFinally();
-			isCallBack = true;
 		});
 		task.setOnFailed(e -> {
-			onFinally();
 			isCallBack = true;
+			onFinally();
 		});
 		task.setOnRunning(e -> new Thread(() -> {
 			try {
 				Thread.sleep(timeout);
 				if (!isCallBack) {
+					isTimeout = true;
 					onTimeout();
 				}
 			} catch (InterruptedException ex) {

src/main/java/com/imyeyu/fx/task/RunAsyncScheduled.java

@@ -219,6 +219,7 @@ public abstract class RunAsyncScheduled<T> extends ScheduledService<T> {
 	/** 中断任务 */
 	public void interrupt() {
 		isInterrupted = true;
+		cancel();
 	}
 
 	// ---------- 静态构造 ----------

src/main/java/com/imyeyu/fx/utils/AnimationRenderer.java

@@ -11,6 +11,7 @@ import javafx.util.Duration;
 import com.imyeyu.fx.task.RunAsyncScheduled;
 import com.imyeyu.java.bean.Callback;
 import com.imyeyu.java.bean.CallbackArg;
+import lombok.Getter;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -74,7 +75,8 @@ public class AnimationRenderer {
 	/** 标准帧生成时间（纳秒） */
 	private double NPF;
 
-	/** 预设渲染帧率 */
+	/** 预设 FPS */
+	@Getter
 	private int prefFPS;
 
 	/** 默认构造，60 FPS */
@@ -222,15 +224,6 @@ public class AnimationRenderer {
 		}
 	}
 
-	/**
-	 * 获取预设 FPS
-	 *
-	 * @return 预设 FPS
-	 */
-	public int getPrefFPS() {
-		return prefFPS;
-	}
-
 	/**
 	 * 预设 FPS，渲染器会尽量匹配此帧率渲染，可能会突破少许，系统资源紧张时实际渲染帧率会低于预设
 	 *
@@ -326,7 +319,7 @@ public class AnimationRenderer {
 	 * 一次性动画
 	 *
 	 * @author 夜雨
- * @since 2023-05-16 16:02
+	 * @since 2023-05-16 16:02
 	 */
 	public static class Animation {
 
@@ -341,7 +334,7 @@ public class AnimationRenderer {
 	 * 一次性动画回调
 	 *
 	 * @author 夜雨
- * @since 2023-05-14 10:10
+	 * @since 2023-05-14 10:10
 	 */
 	public interface AnimationCallback {
 

src/main/java/com/imyeyu/fx/utils/BgImage.java

@@ -10,8 +10,6 @@ import javafx.scene.layout.BackgroundRepeat;
 import javafx.scene.layout.BackgroundSize;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 
 /**
  * 背景图片封装。{@link #build()} 作为导出作用，最后执行
@@ -49,10 +47,9 @@ public class BgImage {
 	 * 背景图构造器
 	 *
 	 * @param file 图片文件（程序外资源）
-	 * @throws FileNotFoundException 找不到文件
 	 */
-	public BgImage(File file) throws FileNotFoundException {
+	public BgImage(File file) {
-		this(new Image(new FileInputStream(file)));
+		this(new Image(file.toURI().toString()));
 	}
 
 	/**

src/main/java/com/imyeyu/fx/utils/DirectorySelector.java

@@ -2,6 +2,7 @@ package com.imyeyu.fx.utils;
 
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Window;
+import lombok.Getter;
 
 import java.io.File;
 import java.util.Objects;
@@ -12,6 +13,7 @@ import java.util.Objects;
  * @author 夜雨
  * @version 2022-04-28 17:48
  */
+@Getter
 public class DirectorySelector {
 
 	/** 选择器 */
@@ -60,13 +62,4 @@ public class DirectorySelector {
 	public File show(Window window) {
 		return chooser.showDialog(window);
 	}
-
-	/**
-	 * 获取选择器
-	 *
-	 * @return 选择器
-	 */
-	public DirectoryChooser getChooser() {
-		return chooser;
-	}
 }

src/main/java/com/imyeyu/fx/utils/FileSelector.java

@@ -2,6 +2,7 @@ package com.imyeyu.fx.utils;
 
 import javafx.stage.FileChooser;
 import javafx.stage.Window;
+import lombok.Getter;
 
 import java.io.File;
 import java.util.List;
@@ -13,6 +14,7 @@ import java.util.Objects;
  * @author 夜雨
  * @version 2022-04-14 19:38
  */
+@Getter
 public class FileSelector {
 
 	/** 选择器 */
@@ -91,13 +93,4 @@ public class FileSelector {
 	public File save(Window window) {
 		return chooser.showSaveDialog(window);
 	}
-
-	/**
-	 * 获取选择器
-	 *
-	 * @return 选择器
-	 */
-	public FileChooser getChooser() {
-		return chooser;
-	}
 }

src/main/java/com/imyeyu/fx/utils/SmoothScroll.java

@@ -52,18 +52,6 @@ public class SmoothScroll {
 
 	// ---------- 虚拟面板滚动（列表项需统一高度） ----------
 
-
-	/**
-	 * 平滑滚动 ComboBox 的选项列表
-	 *
-	 * @param comboBox 选择器
-	 * @deprecated 1.3.4 过时，1.6.0 移除，请使用 {@link #comboBox(ComboBox)}
-	 */
-	@Deprecated
-	public static void combobox(ComboBox<?> comboBox) {
-		comboBox(comboBox);
-	}
-
 	/**
 	 * 平滑滚动 ComboBox 的选项列表
 	 *
@@ -323,6 +311,9 @@ public class SmoothScroll {
 	 * @param sizeFunc        高度回调
 	 */
 	public static void scrollPane(ScrollPane scrollPane, DoubleProperty scrollProperty, Function<Bounds, Double> sizeFunc) {
+		if (scrollPane.getContent() == null) {
+			return;
+		}
 		final double[] derivatives = new double[FRICTIONS.length];
 
 		Timeline timeline = new Timeline();
@@ -362,6 +353,9 @@ public class SmoothScroll {
 			}
 			double dy = derivatives[derivatives.length - 1];
 			double size = sizeFunc.apply(scrollPane.getContent().getLayoutBounds());
+			if (size <= 0) {
+				return;
+			}
 			scrollProperty.set(Math.min(Math.max(scrollProperty.get() + dy / size, 0), 1));
 			if (Math.abs(dy) < .001) {
 				timeline.stop();

src/main/java/com/imyeyu/fx/utils/StringConverters.java

@@ -1,8 +1,8 @@
 package com.imyeyu.fx.utils;
 
-import javafx.util.StringConverter;
 import com.imyeyu.java.ref.Ref;
 import com.imyeyu.utils.Time;
+import javafx.util.StringConverter;
 
 import java.text.ParseException;
 import java.time.LocalDate;
@@ -52,11 +52,7 @@ public class StringConverters {
 				if (object == null) {
 					return "";
 				}
-				try {
+				return object.toString();
-					return Ref.getFieldValue(object, "name", String.class);
-				} catch (IllegalAccessException e) {
-					throw new RuntimeException(e);
-				}
 			}
 
 			@Override