From f236934877aaa74054c764368cbe6039a1c0452f Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Mon, 22 Sep 2025 18:57:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E8=A1=8C=E5=88=87=E6=8D=A2=E5=9C=BA=E6=99=AF=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E8=A1=8C=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E8=A7=A6=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui-binding/lib/compositions/use-data-grid-binding.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ui-binding/lib/compositions/use-data-grid-binding.ts b/packages/ui-binding/lib/compositions/use-data-grid-binding.ts index 020ae136df..475f35359a 100644 --- a/packages/ui-binding/lib/compositions/use-data-grid-binding.ts +++ b/packages/ui-binding/lib/compositions/use-data-grid-binding.ts @@ -83,7 +83,8 @@ export function useDataGridBinding(elementRef: ElementRef, options: BindingOptio const entityList = viewModel.entityStore?.getEntityListByPath(options.entityPath); dataSourceCurrentId = entityList?.getCurrentEntity().idValue; } - selectItemById(dataSourceCurrentId); + // selectItemById(dataSourceCurrentId); + componentRef.value.activeRowById(dataSourceCurrentId); updateIdsState(dataSourceCurrentId); } else if (change.type === EntityChangeType.Remove) { const removeChange = change as RemoveEntityChange; -- Gitee From a0aec0396977efeb150225bc6725d986a49c3555 Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Mon, 22 Sep 2025 15:31:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feature:=20=E9=9B=86=E6=88=90=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8F=98=E6=9B=B4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # packages/renderer/src/composition/use-module-config.ts # pnpm-lock.yaml --- packages/renderer/package.json | 3 ++- packages/renderer/src/composition/use-module-config.ts | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/renderer/package.json b/packages/renderer/package.json index e03dfc3e08..febc6c7826 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -46,7 +46,8 @@ "@gsp-wf/wf-task-handler-vue": "0.0.1", "@gsp-dip/data-imp-exp-vue": "0.0.1", "@gsp-svc/formdoc-upload-vue":"1.0.1", - "@gsp-svc/file-viewer-vue":"1.0.1" + "@gsp-svc/file-viewer-vue":"1.0.1", + "@gsp-cmp/chgdr-vue": "0.0.1" }, "devDependencies": { "vite-plugin-dts": "^2.1.0", diff --git a/packages/renderer/src/composition/use-module-config.ts b/packages/renderer/src/composition/use-module-config.ts index 2388f951a4..6ea11c137d 100644 --- a/packages/renderer/src/composition/use-module-config.ts +++ b/packages/renderer/src/composition/use-module-config.ts @@ -27,6 +27,7 @@ import { BifDevkitRootProviders, BifDevkitProviders } from "@edp-bif/runtime-api import { UploadDevkitProviders, UploadDevkitRootProviders } from '@gsp-svc/formdoc-upload-vue'; import { FileViewerServiceProviders, FileViewerDevkitProviders, FileViewerDevkitRootProviders } from '@gsp-svc/file-viewer-vue'; import { i18nModuleProviders } from "../i18n"; +import { ChgdrProviders } from '@gsp-cmp/chgdr-vue'; export function useModuleConfig(metadata: Ref, uiProviders: StaticProvider[], render: Ref, parentContainerId: string): ModuleConfig { const moduleMetaContext: any = { @@ -72,7 +73,8 @@ export function useModuleConfig(metadata: Ref, uiProviders: StaticProvider[], re ...BifDevkitProviders, ...DataIECommandProviders, ...UploadDevkitProviders, - ...FileViewerDevkitProviders + ...FileViewerDevkitProviders, + ...ChgdrProviders ] }; const moduleConfigBuilder = new ModuleConfigBuilder(moduleMetaContext); -- Gitee From 6ea965a2e2d570ace3bf9cc85f96f83771e8c728 Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Tue, 23 Sep 2025 10:51:36 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feature:=20=E9=A1=B5=E5=A4=B4=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/template-transformer/index.ts | 1 + .../page-header-template-transformer.ts | 36 +++++++++++++++++++ .../template-transformer.ts | 11 ++++++ 3 files changed, 48 insertions(+) create mode 100644 packages/renderer/src/template-transformer/page-header-template-transformer.ts diff --git a/packages/renderer/src/template-transformer/index.ts b/packages/renderer/src/template-transformer/index.ts index 15350151bd..d7988f26a7 100644 --- a/packages/renderer/src/template-transformer/index.ts +++ b/packages/renderer/src/template-transformer/index.ts @@ -3,4 +3,5 @@ export * from './template-transformer'; export * from './data-grid-column-template-transformer'; export * from './template-transformer-registry'; export * from './template-transform-service'; +export * from './page-header-template-transformer'; export * from './providers'; diff --git a/packages/renderer/src/template-transformer/page-header-template-transformer.ts b/packages/renderer/src/template-transformer/page-header-template-transformer.ts new file mode 100644 index 0000000000..8632ac3bd8 --- /dev/null +++ b/packages/renderer/src/template-transformer/page-header-template-transformer.ts @@ -0,0 +1,36 @@ + +import { TemplateTransformer } from "./template-transformer"; +import { FormMetadataService } from "../service"; +import { Injector, ViewModel, ViewModelState } from "@farris/devkit-vue"; + +export class PageHeaderTemplateTransformer extends TemplateTransformer { + constructor(protected formMetadataService: FormMetadataService, protected viewModel: ViewModel, private injector: Injector) { + super(formMetadataService, viewModel); + } + public transform(schema: Record): void { + const { id, type, titleContentHtml, contentHtml, downContentHtml } = schema; + if (type !== 'page-header') { + return; + } + const viewModel = this.getRelatedViewModel(id); + if (!viewModel) { + return; + } + // 标题模板 + if (titleContentHtml) { + const render = this.buildTemplateRender(titleContentHtml, viewModel); + schema.titleRenderFunction = render; + } + // 内容模板 + if (contentHtml) { + const render = this.buildTemplateRender(contentHtml, viewModel); + schema.contentRenderFunction = render; + } + // 扩展模板 + if (downContentHtml) { + const render = this.buildTemplateRender(downContentHtml, viewModel); + schema.downContentRenderFunction = render; + } + } + +} diff --git a/packages/renderer/src/template-transformer/template-transformer.ts b/packages/renderer/src/template-transformer/template-transformer.ts index e83e115f5b..e34d5e9595 100644 --- a/packages/renderer/src/template-transformer/template-transformer.ts +++ b/packages/renderer/src/template-transformer/template-transformer.ts @@ -1,5 +1,7 @@ import { ViewModel, ViewModelState } from "@farris/devkit-vue"; import { FormMetadataService } from "../service"; +import { compile, createVNode } from "vue"; +import { TranslateService } from "@farris/command-services-vue"; export abstract class TemplateTransformer { @@ -38,4 +40,13 @@ export abstract class TemplateTransformer { current: viewModel }; } + protected buildTemplateRender(template: string, viewModel: ViewModel) { + const compiledTemplate = compile(template); + const templateContext = this.buildTempalteContext(viewModel); + const translateService = this.viewModel.getInjector().get(TranslateService); + const render = () => { + return createVNode({ render: compiledTemplate, props: ['viewModel', 't'] }, { viewModel: templateContext, t: translateService.transform.bind(translateService) }); + }; + return render; + } } -- Gitee From a78c428377ee8d19fd0c00a7742cca4db984c721 Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Wed, 17 Sep 2025 10:29:10 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feature:=20=E9=9B=86=E6=88=90=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E3=80=81=E4=B8=9A=E5=8A=A1=E5=8F=98=E6=9B=B4=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # packages/command-services/lib/providers.ts # packages/renderer/package.json # packages/renderer/src/composition/use-module-config.ts # pnpm-lock.yaml --- .../command-services/lib/print.service.ts | 164 +++++++++++++++++- packages/command-services/lib/providers.ts | 9 +- .../pc-supported-controller.json | 14 ++ packages/renderer/package.json | 5 +- .../src/composition/use-module-config.ts | 2 + 5 files changed, 182 insertions(+), 12 deletions(-) diff --git a/packages/command-services/lib/print.service.ts b/packages/command-services/lib/print.service.ts index 03a2afd337..5e0a19fbd5 100644 --- a/packages/command-services/lib/print.service.ts +++ b/packages/command-services/lib/print.service.ts @@ -1,8 +1,14 @@ +import { LocaleService } from './locale'; +import { CloudPrintService, OutputOptions, SourceOptions, OutputType, FileType, SourceFilterOptions, PrintType } from '@gsp-svc/cloudprint-vue'; +import { FormNotifyService } from './form-notify.service'; + class PrintService { /** * 构造函数 */ constructor( + private printService: CloudPrintService, + private formNotifyService: FormNotifyService, ) { } @@ -12,7 +18,11 @@ class PrintService { * @param bizBillId 业务单据标识 */ public printSingle(beMetaId: string, bizBillId: string) { - + if (!bizBillId) { + this.showWarning(LocaleService.translate('unallowEmptyBizBillId')); + return Promise.reject(); + } + return this.printArray(beMetaId, [bizBillId]); } /** * 打印单据（通过id或ids） @@ -20,7 +30,15 @@ class PrintService { * @param ids 单据id或ids */ public printByIds(beMetaId: string, ids: string | string[]) { - + if (!ids) { + this.showWarning(LocaleService.translate('unallowEmptyBizBillId')); + return Promise.reject(); + } + if (typeof ids === 'string') { + ids = ids.split(',').filter(item => item); + } + const dataIds: Array = ids; + return this.printArray(beMetaId, dataIds); } /** * 打印单据（带维度） @@ -31,7 +49,12 @@ class PrintService { * @param billCategoryId 单据类型Id */ public printByIdsWithDimension(beMetaId: string, ids: string, dim1: string, dim2: string, billCategoryId?: string) { - + if (!ids) { + this.showWarning(LocaleService.translate('unallowEmptyBizBillId')); + return Promise.reject(); + } + const dataIds: Array = ids.split(',').filter(item => item); + return this.printArray(beMetaId, dataIds, dim1, dim2, billCategoryId); } /** * 打印多个单据 @@ -42,7 +65,27 @@ class PrintService { * @param billCategoryId 业务单据类型Id */ public printArray(beMetaId: string, dataIds: string[], dim1?: any, dim2?: any, billCategoryId?: string) { - + if (!dataIds || dataIds.length === 0) { + this.showWarning(LocaleService.translate('unallowEmptyBizBillId')); + return Promise.reject(); + } + const sourceOptions: SourceOptions = this.buildSourceOptions({ + dataIds: dataIds, + sourceId: beMetaId + }); + + const outputOptions: OutputOptions = this.buildOutputOptions(); + + if (typeof dim1 !== 'undefined') { + sourceOptions.FirstDimensionVal = dim1; + } + if (typeof dim2 !== 'undefined') { + sourceOptions.SecondDimensionVal = dim2; + } + if (typeof billCategoryId !== 'undefined') { + sourceOptions.billCategoryId = billCategoryId; + } + return this.printService.outputBEData(sourceOptions, outputOptions, 'tab'); } /** @@ -53,7 +96,23 @@ class PrintService { * @param includeChildData 包含子表数据 */ public printMulti(beMetaId: string, filterCondition: string, sortCondition: string, includeChildData: boolean = true) { - + const entryFilter = { 'isUsePagination': false, 'filterConditions': [], 'sortConditions': [], 'pagination': null }; + if (filterCondition) { + // 统一纠正最后一个过滤条件的Relation + const filters = JSON.parse(filterCondition); + if (filters && filters.length > 0) { + filters[filters.length - 1].Relation = 0; + } + entryFilter.filterConditions = filters; + } + + if (sortCondition) { + entryFilter.sortConditions = JSON.parse(sortCondition); + } + // sfo:SourceFilterOptions + const sourceFilterOptions: SourceFilterOptions = this.buildSourceFilterOptions({ sourceId: beMetaId, entryFilter, includeChildData }); + const outputOptions: OutputOptions = this.buildOutputOptions(); + return this.printService.outputBEDataWithFilter(sourceFilterOptions, outputOptions, 'tab'); } /** * 按照BE取数方式批量打印单据(带维度) @@ -66,7 +125,100 @@ class PrintService { * @param includeChildData 包含子表数据 */ public printMultiWithDimension(beMetaId: string, filterCondition: string, sortCondition: string, dim1: string, dim2: string, billCategoryId?: string, includeChildData: boolean = true) { - + const entryFilter = { 'isUsePagination': false, 'filterConditions': [], 'sortConditions': [], 'pagination': null }; + if (filterCondition) { + // 统一纠正最后一个过滤条件的Relation + const filters = JSON.parse(filterCondition); + if (filters && filters.length > 0) { + filters[filters.length - 1].Relation = 0; + } + entryFilter.filterConditions = filters; + } + + if (sortCondition) { + entryFilter.sortConditions = JSON.parse(sortCondition); + } + const sfo: SourceFilterOptions = this.buildSourceFilterOptions({ sourceId: beMetaId, entryFilter, includeChildData }); + if (typeof dim1 !== 'undefined') { + sfo.FirstDimensionVal = dim1; + } + if (typeof dim2 !== 'undefined') { + sfo.SecondDimensionVal = dim2; + } + if (typeof billCategoryId !== 'undefined') { + sfo.billCategoryId = billCategoryId; + } + const outputOptions: OutputOptions = this.buildOutputOptions(); + return this.printService.outputBEDataWithFilter(sfo, outputOptions, 'tab'); + } + /** + * 构造SourceOptions + * @param options options + */ + private buildSourceOptions(options: { dataIds: string[], sourceId: string, [prop: string]: any; }): SourceOptions { + const outputOptions: SourceOptions = { + DataIds: options.dataIds, + SourceId: options.sourceId, + FirstDimensionVal: options.dim1, + SecondDimensionVal: options.dim2, + RetrieveParam: options.retrieveParam, + FormatId: options.formatId, + billCategoryId: options.billCategoryId, + ServiceUnit: options.serviceUnit, + currentPage: options.currentPage, + pageRowCount: options.pageRowCount, + queryType: options.queryType, + queryServiceId: options.queryServiceId, + queryParam: options.queryParam + }; + return outputOptions; + } + /** + * 构造OutputOptions + * @param options options + */ + private buildOutputOptions(options?: { [prop: string]: any; }): OutputOptions { + const outputOptions: OutputOptions = { + OutputType: options && options.outputType || OutputType.PRINT, + FileType: options && options.fileType || FileType.Html5, + Path: options && options.path, + DeviceId: options && options.deviceId, + printJob: options && options.printJob, + printerName: options && options.printerName, + printSetting: options && options.printSetting, + printType: options && options.printType || PrintType.Form, + }; + return outputOptions; + } + /** + * 构造SourceFilterOptions + * @param options options + */ + private buildSourceFilterOptions(options: { sourceId: string, [prop: string]: any; }): SourceFilterOptions { + const entryFilter = { 'isUsePagination': false, 'filterConditions': [], 'sortConditions': [], 'pagination': null }; + const sourceFilterOptions: SourceFilterOptions & { [prop: string]: any; } = { + SourceId: options.sourceId, + EntityFilter: options.entryFilter || entryFilter, + FirstDimensionVal: options.dim1, + SecondDimensionVal: options.dim2, + FormatId: options.formatId, + ServiceUnit: options.serviceUnit, + billCategoryId: options.billCategoryId, + currentPage: options.currentPage, + pageRowCount: options.pageRowCount, + queryParam: options.queryParam, + queryServiceId: options.queryServiceId, + queryType: options.queryType, + includeChildData: options && options.hasOwnProperty('includeChildData') ? options.includeChildData : true + }; + return sourceFilterOptions; + } + /** + * 展示错误消息 + * @param message 错误消息 + */ + private showWarning(message: string) { + this.formNotifyService.warning(message); } } diff --git a/packages/command-services/lib/providers.ts b/packages/command-services/lib/providers.ts index 7e1952e440..ffcdcdbbab 100644 --- a/packages/command-services/lib/providers.ts +++ b/packages/command-services/lib/providers.ts @@ -51,13 +51,14 @@ import { } from './index'; import { UploadDialogService, DownloadService } from '@gsp-svc/formdoc-upload-vue'; import { FileViewerService } from '@gsp-svc/file-viewer-vue'; +import { CloudPrintService } from '@gsp-svc/cloudprint-vue'; const commandServicesDevkitProviders: StaticProvider[] = [ { provide: QuerystringService, useClass: QuerystringService, deps: [] }, { provide: RuntimeFrameworkService, useClass: RuntimeFrameworkService, deps: [QuerystringService] }, { provide: NavigationHistoryService, useClass: NavigationHistoryService, deps: [] }, { provide: NavigationEventService, useClass: NavigationEventService, deps: [RuntimeFrameworkService, QuerystringService, NavigationHistoryService] }, - + ]; const commandServiceModuleProviders: StaticProvider[] = [ @@ -96,7 +97,7 @@ const commandServiceViewModelProviders: StaticProvider[] = [ { provide: ValidationService, useClass: ValidationService, deps: [ViewModel] }, { provide: GridMiddlewareService, useClass: GridMiddlewareService, deps: [ViewModel] }, { provide: BindingDataService, useClass: BindingDataService, deps: [ViewModel] }, - { provide: BatchEditService, useClass: BatchEditService, deps: [ViewModel, FormNotifyService] }, + { provide: BatchEditService, useClass: BatchEditService, deps: [ViewModel, FormNotifyService, FormLoadingService, DialogService] }, { provide: DialogService, useClass: DialogService, deps: [ViewModel, RenderEngineService] }, { provide: FormAttentionService, useClass: FormAttentionService, deps: [ViewModel] }, { provide: DiscussionGroupService, useClass: DiscussionGroupService, deps: [ViewModel, FormLoadingService, RuntimeFrameworkService] }, @@ -113,14 +114,14 @@ const commandServiceViewModelProviders: StaticProvider[] = [ { provide: DirtyCheckingService, useClass: DirtyCheckingService, deps: [] }, { provide: RenderEngineService, useClass: RenderEngineService, deps: [Injector] }, { provide: TemplateService, useClass: TemplateService, deps: [ViewModel] }, - { provide: PrintService, useClass: PrintService, deps: [] }, + { provide: PrintService, useClass: PrintService, deps: [CloudPrintService, FormNotifyService] }, // 导航相关服务 { provide: NavigationService, useClass: NavigationService, deps: [RuntimeFrameworkService, QuerystringService, ViewModel, Injector, NavigationEventService, NavigationHistoryService, FormNotifyService] }, // 参数解析服务 { provide: ParamService, useClass: ParamService, deps: [QuerystringService, RuntimeFrameworkService] }, { provide: ApplicationParamService, useClass: ApplicationParamService, deps: [ParamService, RuntimeFrameworkService, ViewModel] }, { provide: ContextService, useClass: ContextService, deps: [ViewModel, RenderEngineService] }, - { provide: TranslateService, useClass: TranslateService, deps: [Injector]} + { provide: TranslateService, useClass: TranslateService, deps: [Injector] } ]; export { commandServicesDevkitProviders, commandServiceModuleProviders, commandServiceViewModelProviders }; diff --git a/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json b/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json index 9d748bc10a..0741fe0ee4 100644 --- a/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json +++ b/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json @@ -564,5 +564,19 @@ "id": "b707e9c2-61c7-01d8-bd0e-aac222271602", "code": "PreviewBySubDirName" } + ], + "e353b4e9-e073-4e18-b9f7-ec4cc8ac72b1": [ + { + "id": "abbfb7aa-7a2d-1683-fab4-19e6da2bc45a", + "code": "printSingle" + }, + { + "id": "774fa275-2da1-e927-e8bf-d27d9886a168", + "code": "printMulti" + }, + { + "id": "9891fa58-14de-9753-12b8-415fe185978b", + "code": "printByIds" + } ] } \ No newline at end of file diff --git a/packages/renderer/package.json b/packages/renderer/package.json index febc6c7826..2a7f289c3e 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -45,8 +45,9 @@ "rxjs": "^7.4.0", "@gsp-wf/wf-task-handler-vue": "0.0.1", "@gsp-dip/data-imp-exp-vue": "0.0.1", - "@gsp-svc/formdoc-upload-vue":"1.0.1", - "@gsp-svc/file-viewer-vue":"1.0.1", + "@gsp-svc/formdoc-upload-vue": "1.0.1", + "@gsp-svc/file-viewer-vue": "1.0.1", + "@gsp-svc/cloudprint-vue": "0.0.2", "@gsp-cmp/chgdr-vue": "0.0.1" }, "devDependencies": { diff --git a/packages/renderer/src/composition/use-module-config.ts b/packages/renderer/src/composition/use-module-config.ts index 6ea11c137d..8278e44296 100644 --- a/packages/renderer/src/composition/use-module-config.ts +++ b/packages/renderer/src/composition/use-module-config.ts @@ -27,6 +27,7 @@ import { BifDevkitRootProviders, BifDevkitProviders } from "@edp-bif/runtime-api import { UploadDevkitProviders, UploadDevkitRootProviders } from '@gsp-svc/formdoc-upload-vue'; import { FileViewerServiceProviders, FileViewerDevkitProviders, FileViewerDevkitRootProviders } from '@gsp-svc/file-viewer-vue'; import { i18nModuleProviders } from "../i18n"; +import { CloudPrintServiceProviders } from '@gsp-svc/cloudprint-vue'; import { ChgdrProviders } from '@gsp-cmp/chgdr-vue'; export function useModuleConfig(metadata: Ref, uiProviders: StaticProvider[], render: Ref, parentContainerId: string): ModuleConfig { @@ -74,6 +75,7 @@ export function useModuleConfig(metadata: Ref, uiProviders: StaticProvider[], re ...DataIECommandProviders, ...UploadDevkitProviders, ...FileViewerDevkitProviders, + ...CloudPrintServiceProviders, ...ChgdrProviders ] }; -- Gitee From 4a26c644bcbc7f2e4a658c010c21601f5283075e Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Tue, 23 Sep 2025 11:06:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8C=85=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # pnpm-lock.yaml --- packages/command-services/package.json | 8 ++++---- packages/renderer/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/command-services/package.json b/packages/command-services/package.json index 12526eb8e5..0b302ce475 100644 --- a/packages/command-services/package.json +++ b/packages/command-services/package.json @@ -29,10 +29,10 @@ "vue": "^3.4.37", "vue-router": "^4.3.0", "moment": "2.29.1", - "@gsp-svc/formdoc-upload-vue":"1.0.3", - "@gsp-svc/file-viewer-vue":"1.0.1", - "@gsp-svc/cloudprint-vue":"0.0.2", - "axios":"^1.7.2" + "@gsp-svc/formdoc-upload-vue": "1.0.3", + "@gsp-svc/file-viewer-vue": "1.0.1", + "@gsp-svc/cloudprint-vue": "0.0.3", + "axios": "^1.7.2" }, "devDependencies": { "@babel/cli": "^7.25.7", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 2a7f289c3e..ee11a1ac35 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -47,7 +47,7 @@ "@gsp-dip/data-imp-exp-vue": "0.0.1", "@gsp-svc/formdoc-upload-vue": "1.0.1", "@gsp-svc/file-viewer-vue": "1.0.1", - "@gsp-svc/cloudprint-vue": "0.0.2", + "@gsp-svc/cloudprint-vue": "0.0.3", "@gsp-cmp/chgdr-vue": "0.0.1" }, "devDependencies": { -- Gitee From a9ed67ad75114e931314d0352749708dc00e3c7f Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Tue, 23 Sep 2025 11:36:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=BB=84=E4=BB=B6npm=E5=8C=85=E7=89=88=E6=9C=AC=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # pnpm-lock.yaml --- packages/command-services/package.json | 2 +- packages/renderer/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/command-services/package.json b/packages/command-services/package.json index 0b302ce475..f7bdb9ffad 100644 --- a/packages/command-services/package.json +++ b/packages/command-services/package.json @@ -31,7 +31,7 @@ "moment": "2.29.1", "@gsp-svc/formdoc-upload-vue": "1.0.3", "@gsp-svc/file-viewer-vue": "1.0.1", - "@gsp-svc/cloudprint-vue": "0.0.3", + "@gsp-svc/cloudprint-vue": "0.0.2", "axios": "^1.7.2" }, "devDependencies": { diff --git a/packages/renderer/package.json b/packages/renderer/package.json index ee11a1ac35..2a7f289c3e 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -47,7 +47,7 @@ "@gsp-dip/data-imp-exp-vue": "0.0.1", "@gsp-svc/formdoc-upload-vue": "1.0.1", "@gsp-svc/file-viewer-vue": "1.0.1", - "@gsp-svc/cloudprint-vue": "0.0.3", + "@gsp-svc/cloudprint-vue": "0.0.2", "@gsp-cmp/chgdr-vue": "0.0.1" }, "devDependencies": { -- Gitee From 6aa0e36cd99eda267aeac49ce48859914d19d2ff Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Tue, 23 Sep 2025 16:17:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E9=A1=B5=E5=A4=B4=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/renderer/src/template-transformer/providers.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/renderer/src/template-transformer/providers.ts b/packages/renderer/src/template-transformer/providers.ts index 989c0bc1db..7d0ba8c60c 100644 --- a/packages/renderer/src/template-transformer/providers.ts +++ b/packages/renderer/src/template-transformer/providers.ts @@ -5,10 +5,12 @@ import { HtmlTemplateComponentTemplateTransformer } from "./html-template-compon import { FormMetadataService } from "../service"; import { TemplateTransformerRegistry } from "./template-transformer-registry"; import { TemplateTransformService } from "./template-transform-service"; +import { PageHeaderTemplateTransformer } from "./page-header-template-transformer"; export const htmlTemplateTransformers: StaticProvider[] = [ { provide: TEMPLATE_TRANSFORMERS_TOKEN, useClass: DataGridColumnTemplateTransformer, deps: [FormMetadataService, ViewModel, Injector], multi: true }, { provide: TEMPLATE_TRANSFORMERS_TOKEN, useClass: HtmlTemplateComponentTemplateTransformer, deps: [FormMetadataService, ViewModel], multi: true }, + { provide: TEMPLATE_TRANSFORMERS_TOKEN, useClass: PageHeaderTemplateTransformer, deps: [FormMetadataService, ViewModel], multi: true }, { provide: TemplateTransformerRegistry, useClass: TemplateTransformerRegistry, deps: [TEMPLATE_TRANSFORMERS_TOKEN] }, { provide: TemplateTransformService, useClass: TemplateTransformService, deps: [TemplateTransformerRegistry] }, ]; -- Gitee