diff --git a/package.json b/package.json index 0bd016c2..66048cc6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "tmagic", "private": true, "type": "module", - "packageManager": "pnpm@9.6.0", + "packageManager": "pnpm@9.7.1", "scripts": { "bootstrap": "pnpm i && pnpm build", "clean:top": "rimraf */**/dist */**/types */dist coverage dwt* temp", diff --git a/packages/editor/src/Editor.vue b/packages/editor/src/Editor.vue index 47fa237c..1d947317 100644 --- a/packages/editor/src/Editor.vue +++ b/packages/editor/src/Editor.vue @@ -141,7 +141,15 @@ import uiService from './services/ui'; import keybindingConfig from './utils/keybinding-config'; import { defaultEditorProps, EditorProps } from './editorProps'; import { initServiceEvents, initServiceState } from './initService'; -import type { EventBus, FrameworkSlots, PropsPanelSlots, Services, SidebarSlots, WorkspaceSlots } from './type'; +import type { + EventBus, + FrameworkSlots, + PropsPanelSlots, + Services, + SidebarSlots, + StageOptions, + WorkspaceSlots, +} from './type'; defineSlots< FrameworkSlots & @@ -186,7 +194,7 @@ initServiceState(props, services); keybindingService.register(keybindingConfig); keybindingService.registerEl('global'); -const stageOptions = { +const stageOptions: StageOptions = { runtimeUrl: props.runtimeUrl, autoScrollIntoView: props.autoScrollIntoView, render: props.render, diff --git a/packages/editor/src/type.ts b/packages/editor/src/type.ts index 8587356e..a24c714b 100644 --- a/packages/editor/src/type.ts +++ b/packages/editor/src/type.ts @@ -145,7 +145,7 @@ export interface StageOptions { containerHighlightDuration?: number; containerHighlightType?: ContainerHighlightType; disabledDragStart?: boolean; - render?: (stage: StageCore) => HTMLDivElement | Promise; + render?: (stage: StageCore) => HTMLDivElement | void | Promise; moveableOptions?: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions); canSelect?: (el: HTMLElement) => boolean | Promise; isContainer?: (el: HTMLElement) => boolean | Promise; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 55eb4287..f284e37a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1167,19 +1167,19 @@ importers: runtime/react-runtime-help: dependencies: '@tmagic/core': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/core '@tmagic/data-source': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/data-source '@tmagic/schema': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/schema '@tmagic/stage': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/stage '@tmagic/utils': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/utils lodash-es: specifier: ^4.17.21 @@ -1207,22 +1207,22 @@ importers: runtime/tmagic-form: dependencies: '@tmagic/core': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/core '@tmagic/editor': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/editor '@tmagic/form': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/form '@tmagic/schema': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/schema '@tmagic/stage': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/stage '@tmagic/utils': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/utils element-plus: specifier: '>=2.8.0' @@ -1256,19 +1256,19 @@ importers: runtime/vue-runtime-help: dependencies: '@tmagic/core': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/core '@tmagic/data-source': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/data-source '@tmagic/schema': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/schema '@tmagic/stage': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/stage '@tmagic/utils': - specifier: workspace:* + specifier: workspace:^ version: link:../../packages/utils '@vue/composition-api': specifier: '>=1.7.2'