From 2e6501e276809672d19d4463f6488f96cf144fc4 Mon Sep 17 00:00:00 2001 From: wang-xh Date: Wed, 2 Jul 2025 19:33:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=97=B6=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/form-designer/form-designer.component.tsx | 3 ++- .../composition/control-creator/use-control-creator.ts | 2 +- packages/designer/src/components/designer.component.tsx | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/designer/src/components/components/form-designer/form-designer.component.tsx b/packages/designer/src/components/components/form-designer/form-designer.component.tsx index ba93c316964..3062b497ccc 100644 --- a/packages/designer/src/components/components/form-designer/form-designer.component.tsx +++ b/packages/designer/src/components/components/form-designer/form-designer.component.tsx @@ -7,6 +7,7 @@ import MonacoEditor from '../monaco-editor/monaco-editor.component'; import FEntityTreeView from '../entity-tree-view/components/entity-tree-view.component'; import FCustomClassEditor from './components/custom-class-editor/custom-class-editor.component'; import modulePropertyConfig from '../../types/form-property-config.json'; +import ToolboxItems from '../../types/toolbox/pc-toolbox.json'; export default defineComponent({ name: 'FFormDesigner', @@ -190,7 +191,7 @@ export default defineComponent({ - + diff --git a/packages/designer/src/components/composition/control-creator/use-control-creator.ts b/packages/designer/src/components/composition/control-creator/use-control-creator.ts index 6deb8db86c9..d8917058f92 100644 --- a/packages/designer/src/components/composition/control-creator/use-control-creator.ts +++ b/packages/designer/src/components/composition/control-creator/use-control-creator.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 60241424a32..f69b7e41623 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"; @@ -47,7 +47,8 @@ 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); @@ -89,6 +90,9 @@ export default defineComponent({ // 页面元数据服务 const usePageMetadataComposition = usePageMetadata(props, options, useMetadataComposition, usePageSchemaComposition, useResolveMetadataUrlComposition); designerHostService.usePageMetadataComposition = usePageMetadataComposition; + + designerHostService.modalService = modalService; + designerHostService.messagerService = messagerService; } -- Gitee From c7fa6103efed71a6a5929b2beaa702251a8f628f Mon Sep 17 00:00:00 2001 From: wang-xh Date: Wed, 2 Jul 2025 20:08:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=8C=BA=E5=88=86=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?pc=E7=9A=84=E6=8E=A7=E4=BB=B6=E5=88=9B=E5=BB=BA=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/public/assets/monaco-editor.config.json | 2 +- .../components/form-designer/form-designer.component.tsx | 3 +-- .../composition/control-creator/use-control-creator.ts | 2 +- .../control-creator/use-pc-control-creator.service.ts | 2 +- packages/designer/src/components/designer.component.tsx | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/designer/public/assets/monaco-editor.config.json b/packages/designer/public/assets/monaco-editor.config.json index dde50999239..eff7f43f629 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/components/form-designer/form-designer.component.tsx b/packages/designer/src/components/components/form-designer/form-designer.component.tsx index 3062b497ccc..ba93c316964 100644 --- a/packages/designer/src/components/components/form-designer/form-designer.component.tsx +++ b/packages/designer/src/components/components/form-designer/form-designer.component.tsx @@ -7,7 +7,6 @@ import MonacoEditor from '../monaco-editor/monaco-editor.component'; import FEntityTreeView from '../entity-tree-view/components/entity-tree-view.component'; import FCustomClassEditor from './components/custom-class-editor/custom-class-editor.component'; import modulePropertyConfig from '../../types/form-property-config.json'; -import ToolboxItems from '../../types/toolbox/pc-toolbox.json'; export default defineComponent({ name: 'FFormDesigner', @@ -191,7 +190,7 @@ export default defineComponent({ - + diff --git a/packages/designer/src/components/composition/control-creator/use-control-creator.ts b/packages/designer/src/components/composition/control-creator/use-control-creator.ts index d8917058f92..6deb8db86c9 100644 --- a/packages/designer/src/components/composition/control-creator/use-control-creator.ts +++ b/packages/designer/src/components/composition/control-creator/use-control-creator.ts @@ -1,4 +1,4 @@ -import { getSchemaByTypeForDesigner as getSchemaByType } from "@farris/ui-vue/components"; +import { 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/composition/control-creator/use-pc-control-creator.service.ts b/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts index 319f6cdc200..24178109ed5 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 f69b7e41623..1e664ec4a08 100644 --- a/packages/designer/src/components/designer.component.tsx +++ b/packages/designer/src/components/designer.component.tsx @@ -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({ @@ -51,7 +51,7 @@ export default defineComponent({ 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; @@ -70,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); -- Gitee