diff --git a/packages/core/src/Node.ts b/packages/core/src/Node.ts index 9814a868..0c91ab7a 100644 --- a/packages/core/src/Node.ts +++ b/packages/core/src/Node.ts @@ -20,8 +20,7 @@ import { EventEmitter } from 'events'; import { isEmpty } from 'lodash-es'; -import type { EventItemConfig, MComponent, MContainer, MPage } from '@tmagic/schema'; -import { HookType } from '@tmagic/schema'; +import { EventItemConfig, HookType, MComponent, MContainer, MPage } from '@tmagic/schema'; import type App from './App'; import type Page from './Page'; @@ -87,7 +86,7 @@ class Node extends EventEmitter { private async runCodeBlock(hook: string) { if (this.data[hook]?.hookType !== HookType.CODE || !this.app.codeDsl || isEmpty(this.app?.codeDsl)) return; - for (const item of this.data[hook].data) { + for (const item of this.data[hook].hookData) { const { codeId, params = {} } = item; if (this.app.codeDsl[codeId] && typeof this.app?.codeDsl[codeId]?.content === 'function') { await this.app.codeDsl[codeId].content(this, params); diff --git a/packages/editor/src/fields/CodeSelect.vue b/packages/editor/src/fields/CodeSelect.vue index 50765498..51683399 100644 --- a/packages/editor/src/fields/CodeSelect.vue +++ b/packages/editor/src/fields/CodeSelect.vue @@ -1,30 +1,26 @@ diff --git a/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue b/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue index de905ccc..0ba19f41 100644 --- a/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue +++ b/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue @@ -65,7 +65,7 @@ import { CodeBlockContent } from '@tmagic/schema'; import FunctionEditor from '../../../components/FunctionEditor.vue'; import Layout from '../../../components/Layout.vue'; -import type { CodeDslList, ListState, Services } from '../../../type'; +import type { CodeDslItem, ListState, Services } from '../../../type'; import { CodeEditorMode } from '../../../type'; import { serializeConfig } from '../../../utils/editor'; @@ -87,8 +87,6 @@ const editable = computed(() => services?.codeBlockService.getEditStatus()); // 当前选中组件绑定的代码块id数组 const selectedIds = computed(() => services?.codeBlockService.getCombineIds() || []); -services?.codeBlockService.getCombineInfo(); - watchEffect(async () => { codeConfig.value = cloneDeep(await services?.codeBlockService.getCodeContentById(id.value)) || null; if (!codeConfig.value) return; @@ -108,7 +106,7 @@ watchEffect(async () => { currentTitle.value = state.codeList[0]?.name || ''; }); -const selectHandler = (data: CodeDslList) => { +const selectHandler = (data: CodeDslItem) => { services?.codeBlockService.setId(data.id); currentTitle.value = data.name; }; diff --git a/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue b/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue index d6887d42..b7dd377c 100644 --- a/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue +++ b/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue @@ -40,7 +40,7 @@ effect="dark" content="查看绑定关系" placement="bottom" - v-if="state.bindComps[data.id] && state.bindComps[data.id].length > 0" + v-if="data.combineInfo && data.combineInfo.length > 0" > @@ -53,7 +53,7 @@
- - {{ comp.name }}{{ comp.compName }}
@@ -96,65 +87,65 @@