diff --git a/packages-user/client-modules/src/render/ui/save.tsx b/packages-user/client-modules/src/render/ui/save.tsx index 0e9151a..eab71e0 100644 --- a/packages-user/client-modules/src/render/ui/save.tsx +++ b/packages-user/client-modules/src/render/ui/save.tsx @@ -66,6 +66,7 @@ export const SaveBtn = defineComponent(props => { fillStyle="gray" strokeStyle={strokeStyle.value} lineWidth={lineWidth.value} + lineJoin="miter" /> ( /** 除自动存档外,每一页容纳的存档数量 */ const pageCap = row * column - 1; const font = new Font('normal', 18); + const pageFont = new Font('normal', 14); const isDelete = ref(false); const pageRef = ref(); @@ -198,6 +200,7 @@ export const Save = defineComponent( pages={1000} onWheel={wheel} ref={pageRef} + font={pageFont} > {(page: number) => ( @@ -259,6 +262,7 @@ export const Save = defineComponent( zIndex={10} fillStyle={isDelete.value ? 'red' : 'white'} onClick={toggleDelete} + cursor="pointer" /> ( loc={[450, 450, void 0, void 0, 1, 0]} zIndex={10} onClick={exit} + cursor="pointer" /> ); diff --git a/packages/system-action/src/hotkey.ts b/packages/system-action/src/hotkey.ts index cb2dd89..8334347 100644 --- a/packages/system-action/src/hotkey.ts +++ b/packages/system-action/src/hotkey.ts @@ -232,10 +232,10 @@ export class Hotkey extends EventEmitter { ): boolean { // 检查全局启用情况 if (!this.enabled) return false; - const when = this.conditionMap.get(this.scope)!; + const when = this.conditionMap.get(this.scope); if (type === 'up') this.checkPressEnd(key); else if (type === 'down') this.checkPress(key); - if (!when()) return false; + if (when && !when()) return false; const toEmit = this.keyMap.get(key); if (!toEmit) return false;