From 7bfd542da94e3d9811d76495f77846bebb58aeae Mon Sep 17 00:00:00 2001 From: ximena Date: Tue, 23 Sep 2025 11:29:53 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20pageheader=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=A8=A1=E7=89=88=EF=BC=9B=E5=91=BD=E4=BB=A4=E6=9E=84=E4=BB=B6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../method-selector/use-web-command-selector.ts | 2 +- .../controller/controller-selector.service.ts | 2 +- .../src/designer/page-header.design.component.tsx | 4 ++-- .../page-header/src/designer/use-designer-rules.ts | 2 +- .../page-header/src/page-header.component.tsx | 4 ++-- .../src/property-config/page-header.property-config.ts | 8 ++++---- .../page-header/src/schema/page-header.schema.json | 2 +- .../src/components/nav-list-view.component.tsx | 10 ++++++++++ 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts b/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts index 9f12b16aec..8695d07616 100644 --- a/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts +++ b/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts @@ -140,7 +140,7 @@ export function useWebCommandSelector() { } // 如果是自定义构件 if (item.data.nameSpace.includes('.Front')) { - return true; + return item.data.properties?.framework==='Vue'; } return supportedControllers[item.data.id]; }) diff --git a/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts b/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts index 4932f15e9f..549597a75f 100644 --- a/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts +++ b/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts @@ -26,7 +26,7 @@ export class ControllerSelectorSchemaService { return metadata.filter((metadataItem) => { // 支持自定义构件 if (metadataItem.nameSpace.includes('.Front')) { - return true; + return metadataItem.properties?.framework==='Vue'; } // 移除暂不支持的内置控制器 if (!supportedControllers[metadataItem.id]) { diff --git a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx index 2deddb2765..cb0b84c576 100644 --- a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx +++ b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx @@ -1,8 +1,8 @@ import { computed, defineComponent, inject, onMounted, ref, watch } from 'vue'; -import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar/designer'; import { PageHeaderDesignerProps, pageHeaderDesignerProps } from '../page-header.props'; import { useDesignerComponent, FDesignerInnerItem, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas'; -import { useDesignerRules } from './use-designer-rules'; +import { useDesignerRules } from './use-designer-rules'; +import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar/designer'; import { getCustomClass } from "@farris/ui-vue/components/common"; export default defineComponent({ diff --git a/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts b/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts index 3cee9ecc68..204184fecc 100644 --- a/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts +++ b/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts @@ -1,4 +1,4 @@ -import { DraggingResolveContext, UseDesignerRules, ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; +import { DraggingResolveContext, UseDesignerRules,ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PageHeaderProperty } from '../property-config/page-header.property-config'; export function useDesignerRules(schema: ComponentSchema, designerHostService): UseDesignerRules { diff --git a/packages/ui-vue/components/page-header/src/page-header.component.tsx b/packages/ui-vue/components/page-header/src/page-header.component.tsx index c1d6ee1d91..80d3070547 100644 --- a/packages/ui-vue/components/page-header/src/page-header.component.tsx +++ b/packages/ui-vue/components/page-header/src/page-header.component.tsx @@ -82,8 +82,8 @@ export default defineComponent({ return
{context.slots.titleContent()}
; } // 模板HTML - if (props.titleContentRenderFunction) { - return
{props.headerContentRenderFunction()}
; + if (props.titleRenderFunction) { + return
{props.titleRenderFunction()}
; } return
{props.showIcon && props.icon ? : ''} diff --git a/packages/ui-vue/components/page-header/src/property-config/page-header.property-config.ts b/packages/ui-vue/components/page-header/src/property-config/page-header.property-config.ts index 88f1070974..9aeea9d64b 100644 --- a/packages/ui-vue/components/page-header/src/property-config/page-header.property-config.ts +++ b/packages/ui-vue/components/page-header/src/property-config/page-header.property-config.ts @@ -12,7 +12,7 @@ export class PageHeaderProperty extends BaseControlProperty { // 外观 this.propertyConfig.categories['appearance'] = this.getAppearanceProperties(propertyData); // 模板配置 - // this.propertyConfig.categories['template'] = this.getTemplateConfig(propertyData); + this.propertyConfig.categories['template'] = this.getTemplateConfig(propertyData); // 行为 this.propertyConfig.categories['behavior'] = this.getBehaviorConfig(propertyData); @@ -60,7 +60,7 @@ export class PageHeaderProperty extends BaseControlProperty { description: '', properties: { titleContentClass: { - title: '标题模板样式', + title: '标题模板class', type: 'string', description: '标题模板外层容器的自定义样式' }, @@ -75,7 +75,7 @@ export class PageHeaderProperty extends BaseControlProperty { }, }, contentClass: { - title: '内容模板样式', + title: '内容模板class', type: 'string', description: '内容模板外层容器的自定义样式' }, @@ -90,7 +90,7 @@ export class PageHeaderProperty extends BaseControlProperty { }, }, downContentClass: { - title: '扩展模板样式', + title: '扩展模板class', type: 'string', description: '扩展模板外层容器的自定义样式' }, diff --git a/packages/ui-vue/components/page-header/src/schema/page-header.schema.json b/packages/ui-vue/components/page-header/src/schema/page-header.schema.json index 6c8c8f8226..00d2f6fca4 100644 --- a/packages/ui-vue/components/page-header/src/schema/page-header.schema.json +++ b/packages/ui-vue/components/page-header/src/schema/page-header.schema.json @@ -147,7 +147,7 @@ "type": "string", "default": "" }, - "titleContentRenderFunction": { + "titleRenderFunction": { "description": "", "type": "function", "default": null diff --git a/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx b/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx index f98d648a0e..abe9c6a5ce 100644 --- a/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx +++ b/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx @@ -145,6 +145,16 @@ export default defineComponent({
+
+
+
+
+
+
未能展示的自定义控制器，需要在设计器代码编辑器里打开控制器代码，重新保存后再发布。
+
+
+
+
selectionChangeEventHandler(event)}> {{ -- Gitee