diff --git a/packages/designer/public/assets/monaco-editor.config.json b/packages/designer/public/assets/monaco-editor.config.json index dde50999239004911e6aeef730f300c77e210b60..eff7f43f629ce17ee255bca0e80a18f983895334 100644 --- a/packages/designer/public/assets/monaco-editor.config.json +++ b/packages/designer/public/assets/monaco-editor.config.json @@ -1,3 +1,3 @@ { - "vsPath": "/platform/common/web/monaco/vs" + "vsPath": "/assets/monaco-editor/min/vs" } \ No newline at end of file diff --git a/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts b/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts index 319f6cdc20079b778025e1d5adb08cb61d529830..24178109ed57be596b0ccd86ec6f44f0c7b0258a 100644 --- a/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts +++ b/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts @@ -1,4 +1,4 @@ -import { getSchemaByType } from "@farris/ui-vue/components"; +import { getSchemaByTypeForDesigner as getSchemaByType } from "@farris/ui-vue/components"; import { FormBindingType, EntityObjectField, EntityObjectFieldTypeName, UseControlCreator } from "../../types"; import { PageMetadataConverter } from "../page-metadata-converter"; diff --git a/packages/designer/src/components/designer.component.tsx b/packages/designer/src/components/designer.component.tsx index 60241424a326ac2495081368d45bf79cb432cd32..1e664ec4a08b4c24dbf91d7cb153f5ccd12f7ba0 100644 --- a/packages/designer/src/components/designer.component.tsx +++ b/packages/designer/src/components/designer.component.tsx @@ -3,7 +3,7 @@ import { DesignerProps, designerProps } from "./designer.props"; import { usePageSchema } from "./composition/use-page-schema"; import { usePageMetadata } from "./composition/use-page-metadata"; import { MetadataPathToken, PageMetadataContent } from "./types"; -import { FModalService, ModalOptions, FNotifyService, FLoadingService, FResponseToolbar, FCapsule, CapsuleItem, DesignerHost } from '@farris/ui-vue/components'; +import { FModalService, ModalOptions, FNotifyService, FLoadingService, FResponseToolbar, FCapsule, CapsuleItem, DesignerHost, F_MODAL_SERVICE_TOKEN } from '@farris/ui-vue/components'; import { ConfigOptions } from "./composition/types"; import { useCommand } from "./composition/command.service"; import { useCommandBuilderService } from "./composition/command-builder.service"; @@ -23,7 +23,7 @@ import FFlowDesigner from '../components/components/flow-designer/flow-designer. import FViewModelDesigner from '../components/components/view-model-designer/view-model-designer.component'; import FPreview from './preview.component'; import './designer.scss'; -import { DesignerMode } from "./types/designer-context"; +import { DesignerMode, UseDesignerContext } from "./types/designer-context"; export default defineComponent({ @@ -47,10 +47,11 @@ export default defineComponent({ const config = useConfig(); // 初始化 Farris Designer 全局配置对象,并记录初始化异步对象,用于监听初始化完成事件 const configInitialized = config.initialize(); - + const modalService = inject(F_MODAL_SERVICE_TOKEN); + const messagerService = inject('FMessageBoxService'); const designerHostService = {} as DesignerHost; provide('designer-host-service', designerHostService); - + const designerContext = inject('designerContext') as UseDesignerContext; // pageSchema服务 const usePageSchemaComposition = usePageSchema(); designerHostService.pageSchema = usePageSchemaComposition; @@ -69,7 +70,7 @@ export default defineComponent({ const useEntitySchemaComposition = useEntitySchema(options, useMetadataComposition, usePageSchemaComposition); designerHostService.entitySchema = useEntitySchemaComposition; // 控件创建服务 - const controlCreatorService = useControlCreator(); + const controlCreatorService = designerContext.useControlCreator(); designerHostService.controlCreator = controlCreatorService; // 操作表单设计时ViewModel的工具类 const useDesignViewModelComposition = useDesignViewModel(usePageSchemaComposition, useEntitySchemaComposition); @@ -89,6 +90,9 @@ export default defineComponent({ // 页面元数据服务 const usePageMetadataComposition = usePageMetadata(props, options, useMetadataComposition, usePageSchemaComposition, useResolveMetadataUrlComposition); designerHostService.usePageMetadataComposition = usePageMetadataComposition; + + designerHostService.modalService = modalService; + designerHostService.messagerService = messagerService; }