diff --git a/__test__/Winerack/winerack.test.ts b/__test__/Winerack/winerack.test.ts
index 5e6880344..92e2baa65 100644
--- a/__test__/Winerack/winerack.test.ts
+++ b/__test__/Winerack/winerack.test.ts
@@ -36,6 +36,7 @@ const option: IWineRackOption = {
     isDrawLy: false,
     isDrawVer: false,
     brThick2: 18,
+    isExtendsBH2: false,
     followNarrow: false,
 };
 
diff --git a/package.json b/package.json
index a2f50a768..abdc2c159 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
         "@types/node": "^17.0.23",
         "@types/pako": "^1.0.3",
         "@types/polylabel": "^1.0.5",
-        "@types/react": "^17.0.44",
+        "@types/react": "17.0.44",
         "@types/react-color": "^3.0.6",
         "@types/react-dom": "^17.0.15",
         "@types/request-promise-native": "^1.0.18",
@@ -121,10 +121,11 @@
         "react-window": "^1.8.6",
         "stats.js": "^0.17.0",
         "three": "^0.122.0",
-        "xaop": "^1.3.3"
+        "xaop": "^2.0.0"
     },
     "resolutions": {
-        "acorn": "8.7.0"
+        "acorn": "8.7.0",
+        "@types/react": "17.0.44"
     },
     "jest": {
         "transform": {
diff --git a/src/Editor/BoardMoveTool.ts b/src/Editor/BoardMoveTool.ts
index cfba27fed..fae4088d2 100644
--- a/src/Editor/BoardMoveTool.ts
+++ b/src/Editor/BoardMoveTool.ts
@@ -24,7 +24,7 @@ export class BoardMoveTool
     constructor()
     {
         let selectCtrl = app.Editor.SelectCtrl;
-        end(selectCtrl, selectCtrl.UpdateSelectEvent, async () =>
+        end(selectCtrl, selectCtrl.UpdateSelectEvent, () =>
         {
             if (app.Viewer.isLayout) return;
             if (!CommandState.CommandIng)
diff --git a/src/Editor/GetPointServices.ts b/src/Editor/GetPointServices.ts
index 2df1b506c..85e71f214 100644
--- a/src/Editor/GetPointServices.ts
+++ b/src/Editor/GetPointServices.ts
@@ -221,7 +221,7 @@ export class GetPointServices implements EditorService
     {
         if (prompt.Callback)
         {
-            this.removeCalls.push(xaop.end(this, this.UpdateCurPointEvent, () =>
+            this.removeCalls.push(xaop.end(this as GetPointServices, this.UpdateCurPointEvent, () =>
             {
                 try
                 {
@@ -267,7 +267,7 @@ export class GetPointServices implements EditorService
                     preView.Scene.remove(line);
                     DisposeThreeObj(line);
                 },
-                xaop.end(this, this.UpdateCurPointEvent, UpdatePreLine),
+                xaop.end(this as GetPointServices, this.UpdateCurPointEvent, UpdatePreLine),
                 xaop.end(app.Viewer.CameraCtrl, app.Viewer.CameraCtrl.Zoom, UpdatePreLine)
             );
         }
@@ -363,7 +363,7 @@ export class GetPointServices implements EditorService
         {
             dynPrompt.Destroy();
         });
-        this.removeCalls.push(xaop.end(this, this.UpdateCurPointEvent, () =>
+        this.removeCalls.push(xaop.end(this as GetPointServices, this.UpdateCurPointEvent, () =>
         {
             //当存在轴线捕捉的时,并且不存在基点时,切换成轴线输入模式.
             if (!prompt.BasePoint)
diff --git a/src/Editor/MaterialEditor.ts b/src/Editor/MaterialEditor.ts
index 82d1bbd09..2d02bd1b1 100644
--- a/src/Editor/MaterialEditor.ts
+++ b/src/Editor/MaterialEditor.ts
@@ -89,7 +89,7 @@ export class MaterialEditor extends Singleton
                 this.Viewer.UpdateRender();
             }
         });
-        end(this, this.dispose, remove);
+        end(this as MaterialEditor, this.dispose, remove);
 
         //环境光
         let ambient = new AmbientLight();
diff --git a/src/Editor/RegisterGesture.ts b/src/Editor/RegisterGesture.ts
index d0aaf64f8..f0c31ce37 100644
--- a/src/Editor/RegisterGesture.ts
+++ b/src/Editor/RegisterGesture.ts
@@ -5,14 +5,19 @@ import { Gesture } from "./Gesture";
 export function RegisterGesture(gt: Gesture)
 {
     let gs: any[] = [Gesture_DrawLayerBoard];
-    end(gt, gt.OnGestureEndEvent, async (dirs, paths) =>
+    end(gt, gt.OnGestureEndEvent, (dirs, paths) =>
     {
-        for (let g of gs)
+        let exec = async () =>
         {
-            if (await g(dirs, paths))
-                return true;
-        }
 
-        Log("未注册的手势!");
+            for (let g of gs)
+            {
+                if (await g(dirs, paths))
+                    return true;
+            }
+
+            Log("未注册的手势!");
+        };
+        exec();
     });
 }
diff --git a/src/GraphicsSystem/Viewer.ts b/src/GraphicsSystem/Viewer.ts
index 231c45bfd..9a12f945b 100644
--- a/src/GraphicsSystem/Viewer.ts
+++ b/src/GraphicsSystem/Viewer.ts
@@ -138,12 +138,10 @@ export class Viewer
             this.UpdateRender();
         });
 
-        end(this.CameraCtrl, this.CameraCtrl.ZoomEvent, async () =>
+        end(this.CameraCtrl, this.CameraCtrl.ZoomEvent, () =>
         {
             if (this.isLayout)
-            {
                 this.ViewPorts.forEach(vp => vp.NeedUpdateTexture = true);
-            }
         });
     }
 
diff --git a/src/UI/Components/Asset.tsx b/src/UI/Components/Asset.tsx
index 911000edc..bd8b44134 100644
--- a/src/UI/Components/Asset.tsx
+++ b/src/UI/Components/Asset.tsx
@@ -123,7 +123,7 @@ export class Asset extends React.Component<{
     };
     componentDidMount()
     {
-        this.removeCall.push(end(this.props.material, this.props.material.Update, this.UpdateRenderPreview));
+        this.removeCall.push(end(this.props.material, this.props.material.Update, () => { this.UpdateRenderPreview(); }));
         this.UpdateRenderPreview();
     }
 
diff --git a/src/UI/Components/BBS/BoardInfosList.tsx b/src/UI/Components/BBS/BoardInfosList.tsx
index 0309662cd..679c4504a 100644
--- a/src/UI/Components/BBS/BoardInfosList.tsx
+++ b/src/UI/Components/BBS/BoardInfosList.tsx
@@ -71,7 +71,7 @@ export class BoardInfoList extends React.Component<IBoardInfoListProps, {}>
         let topPanelStore = TopPanelStore.GetInstance();
         this.ToggleBgColor();
         this.removeFuncs.push(
-            end(ListItemSelectEventEmitter, ListItemSelectEventEmitter.SingerSelectItemEvent, (msg: boolean) => this.isSelected = false),
+            end(ListItemSelectEventEmitter, ListItemSelectEventEmitter.SingerSelectItemEvent, () => this.isSelected = false),
             end(topPanelStore, topPanelStore.onToggleTheme, () => { this.ToggleBgColor(); })
         );
     }
diff --git a/src/UI/Components/ColorPanel.tsx b/src/UI/Components/ColorPanel.tsx
index ca653522c..4e2bd551c 100644
--- a/src/UI/Components/ColorPanel.tsx
+++ b/src/UI/Components/ColorPanel.tsx
@@ -31,7 +31,7 @@ export class ColorPanel extends React.Component<IColorProps, IColorState>
     };
     componentDidMount()
     {
-        this.event = end(app.Editor.MaskManage, app.Editor.MaskManage.OnFocusEvent, (e: KeyboardEvent) =>
+        this.event = end(app.Editor.MaskManage, app.Editor.MaskManage.OnFocusEvent, () =>
         {
             this.setState({ isFocus: false });
         });
diff --git a/src/UI/Components/Modal/ModalsManage.ts b/src/UI/Components/Modal/ModalsManage.ts
index 41d7dbfa9..ff2e56551 100644
--- a/src/UI/Components/Modal/ModalsManage.ts
+++ b/src/UI/Components/Modal/ModalsManage.ts
@@ -92,7 +92,7 @@ export class ModalManage
             this.IsCtrlDown = false;
         });
 
-        xaop.begin(this.ed.MaskManage, this.ed.MaskManage.OnFocusEvent, (e: KeyboardEvent) =>
+        xaop.begin(this.ed.MaskManage, this.ed.MaskManage.OnFocusEvent, () =>
         {
             if (this.IsModal)
                 this.CurrentModal?.Focus();
diff --git a/src/UI/Components/RightPanel/RightPanel.tsx b/src/UI/Components/RightPanel/RightPanel.tsx
index 12ec5819a..87e7e9b07 100644
--- a/src/UI/Components/RightPanel/RightPanel.tsx
+++ b/src/UI/Components/RightPanel/RightPanel.tsx
@@ -57,7 +57,7 @@ export class RightPanel extends React.Component<{ store?: RightPanelStore; }>
     {
         if (this.m_Container.current)
             this.m_Container.current.addEventListener('wheel', e => e.stopPropagation());
-        end(app.Editor.MaskManage, app.Editor.MaskManage.OnFocusEvent, (e: KeyboardEvent) =>
+        end(app.Editor.MaskManage, app.Editor.MaskManage.OnFocusEvent, () =>
         {
             if (!app.Editor.ModalManage.IsModal)
                 app.Editor.MaskManage.Clear();
diff --git a/src/UI/Components/ToolBar/ModifyModel/ModifyModelStore.ts b/src/UI/Components/ToolBar/ModifyModel/ModifyModelStore.ts
index 6530311ac..0ca350851 100644
--- a/src/UI/Components/ToolBar/ModifyModel/ModifyModelStore.ts
+++ b/src/UI/Components/ToolBar/ModifyModel/ModifyModelStore.ts
@@ -11,7 +11,6 @@ import { Entity } from "../../../../DatabaseServices/Entity/Entity";
 import { EntityRef } from "../../../../DatabaseServices/Entity/EntityRef";
 import { commandMachine } from "../../../../Editor/CommandMachine";
 import { CommandState } from "../../../../Editor/CommandState";
-import { SelectSetBase } from "../../../../Editor/SelectBase";
 import { AppToaster } from "../../Toaster";
 
 export default class ModifyModelStore
@@ -35,7 +34,7 @@ export default class ModifyModelStore
     private constructor()
     {
         let selectCtrl = app.Editor.SelectCtrl;
-        end(selectCtrl, selectCtrl.UpdateSelectEvent, (ss: SelectSetBase) =>
+        end(selectCtrl, selectCtrl.UpdateSelectEvent, () =>
         {
             if (selectCtrl.SelectSet.SelectObjectCount > 50)
                 observable(this._EntityIds).replace([]);
diff --git a/src/UI/Store/MaterialStore.ts b/src/UI/Store/MaterialStore.ts
index 228c95ecd..e63c9e1d3 100644
--- a/src/UI/Store/MaterialStore.ts
+++ b/src/UI/Store/MaterialStore.ts
@@ -75,9 +75,9 @@ export class MaterialStore extends Singleton
     constructor()
     {
         super();
-        end(this.textureMaping, this.textureMaping.UpdateEvent, this.UpdateMaterial);
-        end(this.roughnessMaping, this.roughnessMaping.UpdateEvent, this.UpdateMaterial);
-        end(this.bumpMaping, this.bumpMaping.UpdateEvent, this.UpdateMaterial);
+        end(this.textureMaping, this.textureMaping.UpdateEvent, () => { this.UpdateMaterial(); });
+        end(this.roughnessMaping, this.roughnessMaping.UpdateEvent, () => { this.UpdateMaterial; });
+        end(this.bumpMaping, this.bumpMaping.UpdateEvent, () => { this.UpdateMaterial; });
 
     }
     get Textures()