+
@@ -73,10 +73,12 @@
diff --git a/src/component/Canvas/CanvasEditor/fabric-canvas-events.md b/src/component/Canvas/CanvasEditor/fabric-canvas-events.md
new file mode 100644
index 00000000..0ea45747
--- /dev/null
+++ b/src/component/Canvas/CanvasEditor/fabric-canvas-events.md
@@ -0,0 +1,31 @@
+### 鼠标事件
+
+- `mouse:down`:鼠标按下时触发
+- `mouse:up`:鼠标释放时触发
+- `mouse:move`:鼠标移动时触发
+- `mouse:over`:鼠标移入画布时触发
+- `mouse:out`:鼠标移出画布时触发
+
+### 对象交互事件
+
+- `object:selected`:对象被选中时触发
+- `object:modified`:对象属性(如位置、大小)修改后触发
+- `object:rotating`:对象旋转过程中触发
+- `object:scaling`:对象缩放过程中触发
+- `object:skewing`:对象倾斜过程中触发
+
+### 画布操作事件
+
+- `before:render`:画布即将重绘前触发
+- `after:render`:画布重绘完成后触发
+- `selection:created`:选中对象集合创建时触发
+- `selection:updated`:选中对象集合更新时触发
+- `selection:cleared`:选中对象集合清除时触发
+
+### 其他事件
+
+- `object:added`:对象添加到画布时触发
+- `object:removed`:对象从画布移除时触发
+- `object:rotated`:对象旋转完成时触发
+- `object:scaled`:对象缩放完成时触发
+- `object:skewed`:对象倾斜完成时触发
\ No newline at end of file
diff --git a/src/component/Canvas/CanvasEditor/fabric-canvas-events.text b/src/component/Canvas/CanvasEditor/fabric-canvas-events.text
deleted file mode 100644
index 9d2692c9..00000000
--- a/src/component/Canvas/CanvasEditor/fabric-canvas-events.text
+++ /dev/null
@@ -1,23 +0,0 @@
-1. 初始化事件
-object:added:当新对象被添加到画布上时触发。
-object:removed:当对象从画布上移除时触发。
-selection:created:当选择对象时触发。
-selection:updated:当选择的对象被更新时触发。
-selection:cleared:当所有对象都被取消选择时触发。
-
-2. 鼠标事件
-mouse:down:鼠标按下时触发。
-mouse:move:鼠标移动时触发。
-mouse:up:鼠标释放时触发。
-mouse:over:鼠标移到画布上时触发。
-mouse:out:鼠标移出画布时触发。
-mouse:wheel:鼠标滚轮滚动时触发。
-
-3. 触摸事件(在触摸屏设备上)
-touch:start:触摸开始时触发。
-touch:move:触摸移动时触发。
-touch:end:触摸结束时触发。
-
-4. 键盘事件
-key:down:键盘按键按下时触发。
-key:up:键盘按键释放时触发。
\ No newline at end of file
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 1f44abc7..c1ca84c9 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -1185,7 +1185,7 @@ defineExpose({
/>
-
+ />
{{ t("Canvas.Scale") }}: {{ currentZoom }}%
diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue
index 1537edd5..4b30f338 100644
--- a/src/views/HomeView/history.vue
+++ b/src/views/HomeView/history.vue
@@ -280,7 +280,8 @@ export default defineComponent({
setPageSize(rem) {
const historyTable = this.$refs.historyTable
const height = historyTable.offsetHeight
- const size = Math.trunc((height - 110) / 54)
+ const itemHeight = historyTable.getElementsByClassName("ant-table-thead")[0]?.offsetHeight || 54;
+ const size = Math.trunc((height - 60 - itemHeight) / itemHeight)
this.pageSize = Math.max(1, size)
if (rem) {
this.currentPage = 1